Changeset 1018 for branches/new-dialogs

Timestamp:

08/14/08 15:39:26 (4 years ago)

Author:

nicholasbs

Message:

Fix for ticket #1259

Location:

branches/new-dialogs

Files:

• XinhaCore.js (modified) (1 diff)
• modules/Dialogs/XinhaDialog.js (modified) (2 diffs)

branches/new-dialogs/XinhaCore.js

@@ -4718 +4718 @@
     }
   }
+
+  /* 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 )

branches/new-dialogs/modules/Dialogs/XinhaDialog.js

@@ -297 +297 @@
   }
  
-  if ( modal ) this.editor.deactivateEditor();
+  if ( modal )
+  {
+    this.editor.deactivateEditor();
+    this.editor.currentModal = dialog;
+  }
 
   // unfortunately we have to hide the editor (iframe/caret bug)
@@ -435 +439 @@
     {
       this.editor.activateEditor();
+      this.editor.currentModal = null;
     }
   }