Changeset 1089 for trunk


Ignore:
Timestamp:
10/13/08 23:08:47 (10 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.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/XinhaCore.js

    r1088 r1089  
    28472847Xinha.prototype.activateEditor = function() 
    28482848{ 
     2849  if (this.currentModal) return; 
     2850 
    28492851  // We only want ONE editor at a time to be active 
    28502852  if ( Xinha._currentlyActiveEditor ) 
     
    40704072Xinha.prototype.updateToolbar = function(noStatus) 
    40714073{ 
    4072   if (this.suspendUpdateToolbar) return; 
     4074  if (this.suspendUpdateToolbar || Xinha._currentlyActiveEditor != this) return; 
    40734075   
    40744076  var doc = this._doc; 
     
    48464848  } 
    48474849 
    4848   /* If this.currentModal is not null, then there's a modal dialog  
    4849   /* on screen, and we kill the event. This eliminates the possibility 
    4850   /* of a user 'tabbing' out of a modal dialog and re-activating the editor. 
    4851   /* This fixes the bug reported in ticket #1259 
    4852   /* http://xinha.webfactional.com/ticket/1259 */ 
    4853   if (this.currentModal) 
    4854   { 
    4855     return false; 
    4856   } 
    4857  
    48584850  // update the toolbar state after some time 
    48594851  if ( editor._timerToolbar ) 
Note: See TracChangeset for help on using the changeset viewer.