Changeset 627

Timestamp:

12/30/06 17:18:02 (6 years ago)

Author:

ray

Message:

Plugin Equation (aka ASCIIMath): some updates

Location:

trunk/plugins/Equation

Files:

• ASCIIMathML.js (modified) (1 diff)
• equation.js (modified) (2 diffs)
• example.html (added)
• lang/de.js (modified) (1 diff)
• popups/dialog.html (modified) (2 diffs)
• readme.txt (modified) (1 diff)

trunk/plugins/Equation/ASCIIMathML.js

@@ -33 +33 @@
 var checkForMathML = true;   // check if browser can display MathML
 var notifyIfNoMathML = true; // put note at top of page if no MathML capability
-var mathcolor = "red";       // change it to "" (to inherit) or any other color
-var mathfontfamily = "serif"; // change to "" to inherit (works in IE) 
-                              // or another family (e.g. "arial")
+
+if ( typeof mathcolor == "undefined" )
+{
+        var mathcolor = "red";      // change it to "" (to inherit) or any other color
+}
+if ( typeof mathfontfamily == "undefined" ) 
+{
+        var mathfontfamily = "serif"; // change to "" to inherit (works in IE) or another family (e.g. "arial")
+}
 var displaystyle = true;      // puts limits above and below large operators
-var showasciiformulaonhover = true; // helps students learn ASCIIMath
+
+if ( typeof showasciiformulaonhover == "undefined" ) 
+{
+        var showasciiformulaonhover = true; // helps students learn ASCIIMath
+}
+
 var decimalsign = ".";        // change to "," if you like, beware of `(1,2)`!
 var AMdelimiter1 = "`", AMescape1 = "\\\\`"; // can use other characters

trunk/plugins/Equation/equation.js

@@ -149 +149 @@
         args['editor'] = editor;
         
-        var parent = editor._getFirstAncestor(editor._getSelection(),['span','math']);
+        var parent = editor._getFirstAncestor(editor._getSelection(),['span']);
         if (parent)
         {
@@ -161 +161 @@
 Equation.prototype.insert = function (param)
 {
-        if (param["formula"])
+        if (typeof param["formula"] != "undefined")
         {
-                var formula = param["formula"].replace(/^`?(.*)`?$/m,"`$1`");
+                var formula = (param["formula"] != '') ? param["formula"].replace(/^`?(.*)`?$/m,"`$1`") : '';
 
-                if (param["editedNode"] && (param["editedNode"].tagName.toLowerCase() == 'math'))
+                if (param["editedNode"] && (param["editedNode"].tagName.toLowerCase() == 'span')) 
                 {
-                        var parent = param["editedNode"].parentNode; 
-                        if (parent.tagName.toLowerCase() == 'span')
+                        var span = param["editedNode"]; 
+                        if (formula != '')
                         {
-                                parent.innerHTML = formula;
-                                parent.title = formula;
-                                
+                                span.innerHTML = formula;
+                                span.title = formula;
                         }
                         else
                         {
-                                parent.removeChild(param["editedNode"]);
-                                param["editedNode"] = null;
+                                span.parentNode.removeChild(span);
                         }
+                        
                 }
-                
-                if (param["editedNode"] && (param["editedNode"].tagName.toLowerCase() == 'span')) 
-                {
-                        var span = param["editedNode"]; 
-                                span.innerHTML = formula;
-                                span.title = formula;
-                }
-                else if (!param["editedNode"])
+                else if (!param["editedNode"] && formula != '')
                 {
                         if (!HTMLArea.is_ie)

trunk/plugins/Equation/lang/de.js

@@ -17 +17 @@
   "Input":"Eingabe",
   "Preview":"Vorschau",
-  "Based on ASCIIMathML by": "Basiert auf ASCIIMathML von",
-  "For more information on AsciiMathML visit this page:":"FÃŒr weitere Informationen besuchen Sie bitte diese Seite:"
+  "Based on ASCIIMathML by ": "Basiert auf ASCIIMathML von ",
+  "For more information on AsciiMathML visit this page: ":"FÃŒr weitere Informationen besuchen Sie bitte diese Seite: ",
+  "Attention: Editing the formula in the editor is not possible, please use this dialog!" : "Achtung, Àndern der Formel im Editor ist nicht möglich. Bitte benutzen Sie diesen Dialog!"
 }

trunk/plugins/Equation/popups/dialog.html

@@ -76 +76 @@
         
         var inputField = document.getElementById("inputText"); 
-        if (param["editedNode"] && param["editedNode"].tagName.toLowerCase() == 'math')
+        
+        if (param["editedNode"] && param["editedNode"].tagName.toLowerCase() == 'span')
         {
-                var formula = param["editedNode"].getAttribute("title");
-                inputField.value = formula; 
+                var formula = param["editedNode"].getAttribute("title").replace(/^`*(.*?)`*$/m,"$1");;
+                inputField.value = formula;
                 preview();
-        }
-        else if (param["editedNode"] && param["editedNode"].tagName.toLowerCase() == 'span')
-        {
-                var formula = param["editedNode"].innerHTML.replace(/^`?(.*?)`?$/m,"$1");;
-                inputField.value = formula;
         }
         else inputField.value = '';
@@ -292 +288 @@
   </tr>
   <tr><td colspan="2">
-  Based on ASCIIMathML by <a href="http://www.chapman.edu/~jipsen" target="new">Peter Jipsen</a>, 
+  <span>Based on ASCIIMathML by </span><a href="http://www.chapman.edu/~jipsen" target="new">Peter Jipsen</a>, 
 <a href="http://www.chapman.edu" target="new">Chapman University</a><br />
-  For more information on AsciiMathML visit this page: <a href="http://www1.chapman.edu/~jipsen/mathml/asciimath.html" onclick="window.open(this.href,'_blank','');return false;">http://www1.chapman.edu/~jipsen/mathml/asciimath.html</a></td></tr>
+  <span>For more information on AsciiMathML visit this page: </span><a href="http://www1.chapman.edu/~jipsen/mathml/asciimath.html" onclick="window.open(this.href,'_blank','');return false;">http://www1.chapman.edu/~jipsen/mathml/asciimath.html</a></td></tr>
 </table>
 
 <div id="buttons">
+<span style="color:red">Attention: Editing the formula in the editor is not possible, please use this dialog!</span>
   <button type="submit" name="ok" onclick="return onOK();">OK</button>
   <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>

trunk/plugins/Equation/readme.txt

@@ -10 +10 @@
  The formmulae are stored in their ASCII representation, so you have to include the 
  ASCIIMathML library which can be found in the plugin folder in order render the MathML output in your pages. 
- Example:
-  <script type="text/javascript" src="/xinha/plugins/AsciiMath/ASCIIMathML.js"
+ 
+ Example (also see example.html):
+  var mathcolor = "black"; //  You may change the color of the formulae (default: red)
+  var mathfontfamily = "Arial"; //and the font (default: serif, which is good I think)
+  var showasciiformulaonhover = false; // if true helps students learn ASCIIMath (default:true)
+  <script type="text/javascript" src="/xinha/plugins/AsciiMath/ASCIIMathML.js"></script>
 
- The recommended browser for using this plugin is Mozilla/Firefox.
+  
+ The recommended browser for using this plugin is Mozilla/Firefox. At the moment showing the MathML output
+ inside the editor is not supported in Internet Explorer.
+ 
  
 License information