Changeset 160

Timestamp:

05/12/05 11:47:25 (8 years ago)

Author:

gogo

Message:

Fixes to problem shown in ticket:237 that was introduced in changeset:69

This change puts it back so that only one editor is active at any given
time, and that editors must initially be activated by a mouse-down on
the area by the user (in both gecko and IE now).

This may fix some other tickets with similar types of problem
(insertHTML placing text outside of the editor). The problem mostly
came down to focusEditor() not doing work when it should have because of
a misplaced bang, but some other issues needed cleaning up too.

Files:

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

trunk/htmlarea.js

@@ -1503 +1503 @@
   }
 
+  /*
+   * EDITOR ACTIVATION NOTES:
+   *  when a page has multiple Xinha editors, ONLY ONE should be activated at any time (this is mostly to
+   *  work around a bug in Mozilla, but also makes some sense).  No editor should be activated or focused
+   *  automatically until at least one editor has been activated through user action (by mouse-clicking in
+   *  the editor).
+   */
+
   HTMLArea.prototype.editorIsActivated = function() {
     try {
@@ -1513 +1521 @@
   }
 
+  HTMLArea._someEditorHasBeenActivated = false;
+  HTMLArea._currentlyActiveEditor      = false;
   HTMLArea.prototype.activateEditor = function()
   {
-    if (HTMLArea.is_gecko && this._doc.designMode != 'on') {
-      try {
-
+    // We only want ONE editor at a time to be active
+    if(HTMLArea._currentlyActiveEditor)
+    {
+      if(HTMLArea._currentlyActiveEditor == this) return true;
+      HTMLArea._currentlyActiveEditor.deactivateEditor();
+    }
+
+    if (HTMLArea.is_gecko && this._doc.designMode != 'on')
+    {
+      try
+      {
         // cannot set design mode if no display
         if (this._iframe.style.display == 'none')
@@ -1535 +1553 @@
       this._doc.body.contentEditable = true;
     }
+
+    // We need to know that at least one editor on the page has been activated
+    // this is because we will not focus any editor until an editor has been activated
+    HTMLArea._someEditorHasBeenActivated = true;
+    HTMLArea._currentlyActiveEditor      = this;
+
+    var editor = this;
+    this._timerToolbar = setTimeout(function() {
+      editor.updateToolbar();
+      editor._timerToolbar = null;
+    }, 250);
   }
 
@@ -1547 +1576 @@
       this._doc.body.contentEditable = false;
     }
+
+    if(HTMLArea._currentlyActiveEditor != this)
+    {
+      // We just deactivated an editor that wasn't marked as the currentlyActiveEditor
+
+      return; // I think this should really be an error, there shouldn't be a situation where
+              // an editor is deactivated without first being activated.  but it probably won't
+              // hurt anything.
+    }
+    HTMLArea._currentlyActiveEditor = false;
   }
 
@@ -1572 +1611 @@
         }
       }
-      editor.activateEditor();
     }
     catch(e)
@@ -1621 +1659 @@
 
     // if we have multiple editors some bug in Mozilla makes some lose editing ability
-    // so activation is done only when mouse down
-    if(HTMLArea.is_gecko)
-    {
-      HTMLArea._addEvents(
-        editor._iframe.contentWindow,
-        ["mousedown"],
-        function() { editor.activateEditor();  }
-      );
-    }
-    else
-    {
-        // redo it for some obscure reason that IE need it..
-        editor.activateEditor();
-    }
-
-    // seems that focusEditor is redondant with the mouse down event handler
-    // and should be better used
-    // editor.focusEditor();
+    HTMLArea._addEvents
+    (
+      doc,
+      ["mousedown"],
+      function() { editor.activateEditor(); return true; }
+    );
+
+
     // intercept some events; for updating the toolbar & keyboard handlers
     HTMLArea._addEvents
@@ -1656 +1684 @@
       editor._onGenerate();
     }
-
-    // update toolbar (hope this will arrive enough late...)
-    editor._timerToolbar = setTimeout(function() {
-      editor.updateToolbar();
-      editor._timerToolbar = null;
-    }, 250);
   }
 
@@ -1722 +1744 @@
   }
   this._editMode = mode;
-  // this.focusEditor();
 
   for (var i in this.plugins) {
@@ -1750 +1771 @@
     this._doc.close();
     this.activateEditor();
-    // this._doc.body.contentEditable = true;
     return true;
   }
@@ -2068 +2088 @@
       {
         // We don't want to focus the field unless at least one field has been activated.
-        if(!this.editorIsActivated())
+        if(HTMLArea._someEditorHasBeenActivated)
         {
-          this.activateEditor();
-          this._iframe.contentWindow.focus();
-        }
-
+          this.activateEditor(); // Ensure *this* editor is activated
+          this._iframe.contentWindow.focus(); // and focus it
+        }
       } catch (e) {} break;
       case "textmode": try { this._textArea.focus() } catch (e) {} break;