Changeset 1089

Timestamp:

10/13/08 23:08:47 (5 years ago)

Author:

nicholasbs

Message:

Fixes #1259 (editor can be reactivated by tabbing when modal dialog is open)

Still needs to be tested in IE and Chrome.

Files:

• trunk/XinhaCore.js (modified) (3 diffs)

trunk/XinhaCore.js

@@ -2847 +2847 @@
 Xinha.prototype.activateEditor = function()
 {
+  if (this.currentModal) return;
+
   // We only want ONE editor at a time to be active
   if ( Xinha._currentlyActiveEditor )
@@ -4070 +4072 @@
 Xinha.prototype.updateToolbar = function(noStatus)
 {
-  if (this.suspendUpdateToolbar) return;
+  if (this.suspendUpdateToolbar || Xinha._currentlyActiveEditor != this) return;
   
   var doc = this._doc;
@@ -4846 +4848 @@
   }
 
-  /* If this.currentModal is not null, then there's a modal dialog 
-  /* on screen, and we kill the event. This eliminates the possibility
-  /* of a user 'tabbing' out of a modal dialog and re-activating the editor.
-  /* This fixes the bug reported in ticket #1259
-  /* http://xinha.webfactional.com/ticket/1259 */
-  if (this.currentModal)
-  {
-    return false;
-  }
-
   // update the toolbar state after some time
   if ( editor._timerToolbar )