Changeset 1094 for trunk/modules


Ignore:
Timestamp:
10/15/08 15:39:35 (11 years ago)
Author:
nicholasbs
Message:

Fixes #1307 (toolbar disabled entirely when switching to text mode)

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/modules/Dialogs/XinhaDialog.js

    r1093 r1094  
    321321  { 
    322322    this.editor.deactivateEditor(); 
     323    this.editor.suspendUpdateToolbar = true; 
    323324    this.editor.currentModal = dialog; 
    324325  } 
     
    474475    if (this.modal) 
    475476    { 
     477      this.editor.suspendUpdateToolbar = false; 
    476478      this.editor.currentModal = null; 
    477479      this.editor.activateEditor(); 
     
    550552    this.posBackground({top:0, left:0});  
    551553    this.resizeBackground(Xinha.Dialog.calcFullBgSize()); 
     554    this.editor.suspendUpdateToolbar = true; 
    552555  } 
    553556  ev = Xinha.getEvent(ev); 
    554557   
    555   this.editor.suspendUpdateToolbar = true; 
    556558  var dialog = this; 
    557559 
     
    604606{ 
    605607  var dialog = this; 
    606   this.editor.suspendUpdateToolbar = false; 
     608   
     609  if (!this.modal) 
     610  { 
     611     this.editor.suspendUpdateToolbar = false;  
     612  } 
    607613 
    608614  if (!dialog.dragging)  
     
    631637Xinha.Dialog.prototype.resizeStart = function (ev) { 
    632638  var dialog = this; 
    633   this.editor.suspendUpdateToolbar = true; 
    634639  if (dialog.resizing) 
    635640  { 
     
    639644  if (!this.modal) 
    640645  { 
     646    this.editor.suspendUpdateToolbar = true; 
    641647    this.posBackground({top:0, left:0});  
    642648    this.resizeBackground(Xinha.Dialog.calcFullBgSize()); 
     
    697703  var dialog = this; 
    698704  dialog.resizing = false; 
    699   this.editor.suspendUpdateToolbar = false; 
     705 
     706  if (!this.modal) 
     707  { 
     708    this.editor.suspendUpdateToolbar = false; 
     709  } 
    700710 
    701711  Xinha._removeEvent(document, "mousemove", dialog.mouseMove ); 
Note: See TracChangeset for help on using the changeset viewer.