Changeset 55

Timestamp:

04/02/05 04:43:23 (5 years ago)

Author:

gogo

Message:

Fix for #100 - improves onsubmit handling

Files:

• trunk/htmlarea.js (modified) (4 diffs)

trunk/htmlarea.js

@@ -582 +582 @@
         this._htmlArea.appendChild(toolbar);
 }
-        
-        
+
+
 HTMLArea.prototype._setConfig = function(config) {
         this.config = config;
@@ -1043 +1043 @@
     // update original textarea.
     var f = textarea.form;
-    if (typeof f.__msh_prevOnSubmit == "undefined") f.__msh_prevOnSubmit = [];
-    if (typeof f.onsubmit == "function")
-    {
-      var funcref = f.onsubmit;
-      f.__msh_prevOnSubmit.push(funcref);
-    }
-    f.onsubmit = function()
-    {
-      editor._textArea.value = editor.outwardHtml(editor.getHTML());
-      var a = this.__msh_prevOnSubmit;
-      // call previous submit methods if they were there.
-      var allOK = true;
-      for (var i = a.length; --i >= 0;)
-      {
-        if(a[i]() == false)
+    if (typeof f.__msh_prevOnSubmit == "undefined")
+    {
+      f.__msh_prevOnSubmit = [];
+      if (typeof f.onsubmit == "function")
+      {
+        var funcref = f.onsubmit;
+        f.__msh_prevOnSubmit.push(funcref);
+        f.onsubmit = null;
+      }
+
+      f.onsubmit = function()
+      {
+        var a = this.__msh_prevOnSubmit;
+        // call previous submit methods if they were there.
+        var allOK = true;
+        for (var i = a.length; --i >= 0;)
         {
-          allOK = false;
-          break;
-        }
-      }
-      return allOK;
-    };
-    if (typeof f.onreset == "function") {
-      var funcref = f.onreset;
-      if (typeof f.__msh_prevOnReset == "undefined") {
-        f.__msh_prevOnReset = [];
-      }
-      f.__msh_prevOnReset.push(funcref);
-    }
-    f.onreset = function() {
-      editor.setHTML(editor._textArea.value);
-      editor.updateToolbar();
-      var a = this.__msh_prevOnReset;
-      // call previous reset methods if they were there.
-      if (typeof a != "undefined")
-      {
+          // We want the handler to be a member of the form, not the array, so that "this" will work correctly
+          this.__msh_tempEventHandler = a[i];
+          if(this.__msh_tempEventHandler() == false)
+          {
+            allOK = false;
+            break;
+          }
+        }
+        return allOK;
+      }
+    }
+    f.__msh_prevOnSubmit.push(function() {editor._textArea.value = editor.outwardHtml(editor.getHTML());});
+
+    if (typeof f.__msh_prevOnReset == "undefined")
+    {
+      f.__msh_prevOnReset = [];
+      if (typeof f.onreset == "function")
+      {
+        var funcref = f.onreset;
+        f.__msh_prevOnReset.push(funcref);
+        f.onreset = null;
+      }
+
+      f.onreset = function()
+      {
+        var a = this.__msh_prevOnReset;
+        // call previous submit methods if they were there.
         var allOK = true;
         for (var i = a.length; --i >= 0;)
@@ -1090 +1098 @@
         return allOK;
       }
-    };
+    }
+    f.__msh_prevOnReset.push(function() {editor.setHTML(editor._textArea.value); editor.updateToolbar();});
   }
 
@@ -1379 +1388 @@
       else
       {
-
         this._doc.designMode = 'on';
       }