Changeset 161

Timestamp:

05/12/05 12:05:21 (8 years ago)

Author:

gogo

Message:

When an editor is not active, the toolbar should not be used. This
change disables the toolbar until the editor is activated (and disables
again when it is deactivated).

This should solve many problems like #202

Files:

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

trunk/htmlarea.js

@@ -1560 +1560 @@
 
     var editor = this;
-    this._timerToolbar = setTimeout(function() {
-      editor.updateToolbar();
-      editor._timerToolbar = null;
-    }, 250);
+    this.enableToolbar();
   }
 
   HTMLArea.prototype.deactivateEditor = function()
   {
+    // If the editor isn't active then the user shouldn't use the toolbar
+    this.disableToolbar();
+
     if (HTMLArea.is_gecko && this._doc.designMode != 'off')
     {
@@ -1585 +1585 @@
               // hurt anything.
     }
+
     HTMLArea._currentlyActiveEditor = false;
   }
@@ -1590 +1591 @@
   HTMLArea.prototype.initIframe = function()
   {
+    this.disableToolbar();
     var doc = null;
     var editor = this;
@@ -2138 +2140 @@
 HTMLArea.prototype.disableToolbar = function(except)
 {
+  if(this._timerToolbar) clearTimeout(this._timerToolbar);
   if(typeof except == 'undefined')
   {