Changeset 874

Timestamp:

08/06/07 16:00:51 (6 years ago)

Author:

ray

Message:

• added new hook 'onBeforeUnload' for firePluginEvent()
  
• Equation plugin: preserve formula on reload in Mozilla
  
• Equation plugin: updated ASCIIMathML.js
  

Location:

trunk

Files:

• XinhaCore.js (modified) (1 diff)
• plugins/Equation/ASCIIMathML.js (modified) (7 diffs)
• plugins/Equation/equation.js (modified) (3 diffs)
• plugins/Equation/popups/dialog.html (modified) (1 diff)

trunk/XinhaCore.js

@@ -2326 +2326 @@
     function()
     {
+      editor.firePluginEvent('onBeforeUnload');
       textarea.value = editor.outwardHtml(editor.getHTML());
       if (!Xinha.is_ie)

trunk/plugins/Equation/ASCIIMathML.js

@@ -10 +10 @@
 This is a convenient and inexpensive solution for authoring MathML.
 
-Version 1.4.7 Aug 7, 2005, (c) Peter Jipsen http://www.chapman.edu/~jipsen
+Version 1.4.7 Dec 15, 2005, (c) Peter Jipsen http://www.chapman.edu/~jipsen
 Latest version at http://www.chapman.edu/~jipsen/mathml/ASCIIMathML.js
 For changes see http://www.chapman.edu/~jipsen/mathml/asciimathchanges.txt
 If you use it on a webpage, please send the URL to jipsen@chapman.edu
 
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU Lesser General Public License as published by
- the Free Software Foundation; either version 2.1 of the License, or (at
- your option) any later version.
-
- This program is distributed in the hope that it will be useful, 
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License (at http://www.gnu.org/licenses/lgpl.html) 
- for more details.
- 
- NOTE: I have changed the license from GPL to LGPL according to a permission 
- from the author (see http://xinha.gogo.co.nz/punbb/viewtopic.php?pid=4150#p4150)
- Raimund Meyer 11-29-2006
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or (at
+your option) any later version.
+
+This program is distributed in the hope that it will be useful, 
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+General Public License (at http://www.gnu.org/copyleft/gpl.html) 
+for more details.
 */
 
 var checkForMathML = true;   // check if browser can display MathML
 var notifyIfNoMathML = true; // put note at top of page if no MathML capability
-
+var alertIfNoMathML = false;  // show alert box if no MathML capability
 if ( typeof mathcolor == "undefined" )
 {
@@ -194 +190 @@
 {input:"-lt", tag:"mo", output:"\u227A", tex:null, ttype:CONST},
 {input:">-",  tag:"mo", output:"\u227B", tex:"succ", ttype:CONST},
+{input:"-<=", tag:"mo", output:"\u2AAF", tex:"preceq", ttype:CONST},
+{input:">-=", tag:"mo", output:"\u2AB0", tex:"succeq", ttype:CONST},
 {input:"in",  tag:"mo", output:"\u2208", tex:null, ttype:CONST},
 {input:"!in", tag:"mo", output:"\u2209", tex:"notin", ttype:CONST},
@@ -449 +447 @@
     tagst = (("A">st || st>"Z") && ("a">st || st>"z")?"mo":"mi");
   }
-  if (st=="-" && AMpreviousSymbol==INFIX)
+  if (st=="-" && AMpreviousSymbol==INFIX) {
+    AMcurrentSymbol = INFIX;  //trick "/" into recognizing "-" on second parse
     return {input:st, tag:tagst, output:st, ttype:UNARY, func:true};
+  }
   return {input:st, tag:tagst, output:st, ttype:CONST};
 }
@@ -540 +540 @@
       if (typeof symbol.func == "boolean" && symbol.func) { // functions hack
         st = str.charAt(0);
-        if (st=="^" || st=="_" || st=="/" || st=="|") {
+        if (st=="^" || st=="_" || st=="/" || st=="|" || st==",") {
           return [AMcreateMmlNode(symbol.tag,
                     document.createTextNode(symbol.output)),str];
@@ -617 +617 @@
     if (result[0].lastChild!=null)
       st = result[0].lastChild.firstChild.nodeValue;
-//alert(result[0].lastChild+"***"+st);
     if (st == "|") { // its an absolute value subterm
       node = AMcreateMmlNode("mo",document.createTextNode(symbol.output));
@@ -778 +777 @@
   node.appendChild(AMparseExpr(str.replace(/^\s+/g,""),false)[0]);
   node = AMcreateMmlNode("math",node);
-  if (showasciiformulaonhover) node.setAttribute("title",str);
+  if (showasciiformulaonhover)                      //fixed by djhsu so newline
+    node.setAttribute("title",str.replace(/\s+/g," "));//does not show in Gecko
   if (mathfontfamily != "" && (isIE || mathfontfamily != "serif")) {
     var fnode = AMcreateElementXHTML("font");
@@ -839 +839 @@
           checkForMathML = false;
           var nd = AMisMathMLavailable();
-          AMnoMathML = nd != null
+          AMnoMathML = nd != null;
           if (AMnoMathML && notifyIfNoMathML) 
-            AMbody.insertBefore(nd,AMbody.childNodes[0]);
+            if (alertIfNoMathML)
+              alert("To view the ASCIIMathML notation use Internet Explorer 6 +\nMathPlayer (free from www.dessci.com)\n\
+                or Firefox/Mozilla/Netscape");
+            else AMbody.insertBefore(nd,AMbody.childNodes[0]);
         }
         if (!AMnoMathML) {

trunk/plugins/Equation/equation.js

@@ -56 +56 @@
                                 }
                         );
-        this.onBeforeSubmit = function () {debugger;self.unParse();self.reParse = true};
+        this.onBeforeSubmit = this.onBeforeUnload = function () {self.unParse();self.reParse = true};
         }
         
@@ -74 +74 @@
 Equation._pluginInfo = {
         name          : "ASCIIMathML Formula Editor",
-        version       : "2.0",
+        version       : "2.1 (2007-08-06)",
         developer     : "Raimund Meyer",
         developer_url : "http://rheinaufCMS.de",
@@ -95 +95 @@
         if (!Xinha.is_ie && this.reParse) AMprocessNode(this.editor._doc.body, false);
 };
+
 
 Equation.prototype.onModeChange = function( args )

trunk/plugins/Equation/popups/dialog.html

@@ -38 +38 @@
    window.resizeTo(500, 300);
 var showasciiformulaonhover = false;
-Xinha = window.opener.Xinha;
+if (typeof Xinha == "undefined")
+        Xinha = window.opener.Xinha;
 
 function i18n(str) {