Changeset 942

Timestamp:

01/26/08 00:07:41 (5 years ago)

Author:

ray

Message:

• #1137 [Equation] FF3 fixes & improved way of avoiding formula changes in editor
  
• #1136 FF3 Linux select boxes in toolbar are too small
  

Location:

trunk

Files:

• Xinha.css (modified) (1 diff)
• plugins/Equation/equation.js (modified) (5 diffs)
• plugins/Equation/popups/dialog.html (modified) (1 diff)
• plugins/Equation/readme.txt (modified) (2 diffs)

trunk/Xinha.css

@@ -71 +71 @@
 .htmlarea .toolbar select:hover,
 .htmlarea .toolbar select:active { 
-  margin-top: 2px;
-  margin-bottom: 1px;
-  color: ButtonText;
-  height: 17px;
+
+  color: ButtonText;
+  height: 22px;
 }
 

trunk/plugins/Equation/equation.js

@@ -74 +74 @@
 Equation._pluginInfo = {
         name          : "ASCIIMathML Formula Editor",
-        version       : "2.2 (2007-08-17)",
+        version       : "2.3 (2008-01-26)",
         developer     : "Raimund Meyer",
-        developer_url : "http://rheinaufCMS.de",
+        developer_url : "http://xinha.raimundmeyer.de",
         c_owner       : "",
-        sponsor       : "Rheinauf",
-        sponsor_url   : "http://rheinaufCMS.de",
+        sponsor       : "",
+        sponsor_url   : "",
         license       : "GNU/LGPL"
 };
@@ -99 +99 @@
                 this.reParse = false;
         }
+};
+// avoid changing the formula in the editor
+Equation.prototype.onKeyPress = function(ev)
+{
         if (!Xinha.is_ie)
         {
+                e = this.editor;
                 var span = e._getFirstAncestor(e.getSelection(),['span']);
                 if ( span && span.className == "AM" )
                 {
-                        e.selectNodeContents(span);
-                }
-        }
-};
-
+                        if (
+                                ev.keyCode == 8 || // delete
+                                ev.keyCode == 46 ||// backspace
+                                ev.charCode            // all character keys
+                        ) 
+                        { // stop event
+                                Xinha._stopEvent(ev);
+                                return true; 
+                        }
+                }
+        }
+        return false;
+}
 Equation.prototype.onModeChange = function( args )
 {
@@ -133 +146 @@
                         var node = spans[i];
                         if (node.className != 'AM') continue;
+                        if (node.innerHTML.indexOf(this.editor.cc) != -1) // avoid problems with source code position auxiliary character
+                        {
+                                node.innerHTML = node.innerHTML.replace(this.editor.cc,'');
+                                node.parentNode.insertBefore(doc.createTextNode(this.editor.cc), node);
+                        }
                         node.title = node.innerHTML;
-                        AMprocessNode(node, false);
+                        // FF3 strict source document policy: 
+                        // the span is taken from the editor document, processed in the plugin document, and put back in the editor
+                        var clone = node.cloneNode(true);
+                        try {
+                                document.adoptNode(clone);
+                        } catch (e) {}
+                        AMprocessNode(clone, false);
+                        try {
+                                doc.adoptNode(clone);
+                        } catch (e) {}
+                        node.parentNode.replaceChild(clone, node);
                 }
         }
@@ -167 +195 @@
                 args["editedNode"] = parent;
         }
-        editor._popupDialog("plugin://Equation/dialog", function(params) {
+        Dialog(_editor_url + "plugins/Equation/popups/dialog.html", function(params) {
                                 self.insert(params);
                         }, args);
@@ -207 +235 @@
                         }
                 }
-                if (!Xinha.is_ie) AMprocessNode(this.editor._doc.body, false);
-        }
-}
+
+                if (!Xinha.is_ie) this.parse();//AMprocessNode(this.editor._doc.body, false);
+        }
+}

trunk/plugins/Equation/popups/dialog.html

@@ -80 +80 @@
         mathfontfamily = cfg.Equation.mathfontfamily;
         
+        translate();
         var inputField = document.getElementById("inputText"); 
         

trunk/plugins/Equation/readme.txt

@@ -9 +9 @@
 Usage
  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. 
+ ASCIIMathML library which can be found in the plugin folder in order to render the MathML output in your pages. 
  
  Example (also see example.html):
@@ -17 +17 @@
   <script type="text/javascript" src="/xinha/plugins/AsciiMath/ASCIIMathML.js"></script>
 
-  
  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.