Changeset 1018


Ignore:
Timestamp:
08/14/08 20:39:26 (6 years ago)
Author:
nicholasbs
Message:

Fix for ticket #1259

Location:
branches/new-dialogs
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/new-dialogs/XinhaCore.js

    r1011 r1018  
    47184718    } 
    47194719  } 
     4720 
     4721  /* If this.currentModal is not null, then there's a modal dialog  
     4722  /* on screen, and we kill the event. This eliminates the possibility 
     4723  /* of a user 'tabbing' out of a modal dialog and re-activating the editor. 
     4724  /* This fixes the bug reported in ticket #1259 
     4725  /* http://xinha.webfactional.com/ticket/1259 */ 
     4726  if (this.currentModal) 
     4727  { 
     4728    return false; 
     4729  } 
     4730 
    47204731  // update the toolbar state after some time 
    47214732  if ( editor._timerToolbar ) 
  • branches/new-dialogs/modules/Dialogs/XinhaDialog.js

    r1017 r1018  
    297297  } 
    298298  
    299   if ( modal ) this.editor.deactivateEditor(); 
     299  if ( modal ) 
     300  { 
     301    this.editor.deactivateEditor(); 
     302    this.editor.currentModal = dialog; 
     303  } 
    300304 
    301305  // unfortunately we have to hide the editor (iframe/caret bug) 
     
    435439    { 
    436440      this.editor.activateEditor(); 
     441      this.editor.currentModal = null; 
    437442    } 
    438443  } 
Note: See TracChangeset for help on using the changeset viewer.