Changeset 1094

Timestamp:

10/15/08 15:39:35 (5 years ago)

Author:

nicholasbs

Message:

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

Files:

• trunk/modules/Dialogs/XinhaDialog.js (modified) (7 diffs)

trunk/modules/Dialogs/XinhaDialog.js

@@ -321 +321 @@
   {
     this.editor.deactivateEditor();
+    this.editor.suspendUpdateToolbar = true;
     this.editor.currentModal = dialog;
   }
@@ -474 +475 @@
     if (this.modal)
     {
+      this.editor.suspendUpdateToolbar = false;
       this.editor.currentModal = null;
       this.editor.activateEditor();
@@ -550 +552 @@
     this.posBackground({top:0, left:0}); 
     this.resizeBackground(Xinha.Dialog.calcFullBgSize());
+    this.editor.suspendUpdateToolbar = true;
   }
   ev = Xinha.getEvent(ev);
   
-  this.editor.suspendUpdateToolbar = true;
   var dialog = this;
 
@@ -604 +606 @@
 {
   var dialog = this;
-  this.editor.suspendUpdateToolbar = false;
+  
+  if (!this.modal)
+  {
+     this.editor.suspendUpdateToolbar = false; 
+  }
 
   if (!dialog.dragging) 
@@ -631 +637 @@
 Xinha.Dialog.prototype.resizeStart = function (ev) {
   var dialog = this;
-  this.editor.suspendUpdateToolbar = true;
   if (dialog.resizing)
   {
@@ -639 +644 @@
   if (!this.modal)
   {
+    this.editor.suspendUpdateToolbar = true;
     this.posBackground({top:0, left:0}); 
     this.resizeBackground(Xinha.Dialog.calcFullBgSize());
@@ -697 +703 @@
   var dialog = this;
   dialog.resizing = false;
-  this.editor.suspendUpdateToolbar = false;
+
+  if (!this.modal)
+  {
+    this.editor.suspendUpdateToolbar = false;
+  }
 
   Xinha._removeEvent(document, "mousemove", dialog.mouseMove );