Changeset 1011 for branches/new-dialogs-merge/modules/InsertTable

Timestamp:

06/07/08 09:08:53 (4 years ago)

Author:

ray

Message:

update to new dialog plugins: separation of code into several files to reduce loading time

Location:

branches/new-dialogs-merge/modules/InsertTable

Files:

• insert_table.js (modified) (3 diffs)
• pluginMethods.js (modified) (1 diff)

branches/new-dialogs-merge/modules/InsertTable/insert_table.js

@@ -37 +37 @@
         var self = this;
 
-   editor.config.btnList.inserttable[3] = function() { self.show(); }
+        editor.config.btnList.inserttable[3] = function() { self.show(); }
 }
 
@@ -47 +47 @@
 InsertTable.prototype.onGenerateOnce = function()
 {
-        this.prepareDialog();
-        this.loadScripts();
+        InsertTable.loadAssets();
 };
-
-InsertTable.prototype.loadScripts = function()
+InsertTable.loadAssets = function()
 {
-  var self = this;
-  if(!this.methodsReady)
-        {
-                Xinha._getback(_editor_url + 'modules/InsertTable/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
-                return;
-        }
+        var self = InsertTable;
+        if (self.loading) return;
+        self.loading = true;
+        Xinha._getback(_editor_url + 'modules/InsertTable/dialog.html', function(getback) { self.html = getback; self.dialogReady = true; });
+        Xinha._getback(_editor_url + 'modules/InsertTable/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
 };
 
 InsertTable.prototype.onUpdateToolbar = function()
 { 
-  if (!(this.dialogReady && this.methodsReady))
+  if (!(InsertTable.dialogReady && InsertTable.methodsReady))
         {
           this.editor._toolbarObjects.inserttable.state("enabled", false);
         }
+        else this.onUpdateToolbar = null;
 };
 
@@ -74 +72 @@
         var editor = this.editor;
 
-        if(!this.html) // retrieve the raw dialog contents
-        {
-                Xinha._getback(_editor_url + 'modules/InsertTable/dialog.html', function(getback) { self.html = getback; self.prepareDialog(); });
-                return;
-        }
-
-        // Now we have everything we need, so we can build the dialog.
-                
-        var dialog = this.dialog = new Xinha.Dialog(editor, this.html, 'Xinha',{width:400})
+        var dialog = this.dialog = new Xinha.Dialog(editor, InsertTable.html, 'Xinha',{width:400})
         // Connect the OK and Cancel buttons
         dialog.getElementById('ok').onclick = function() {self.apply();}

branches/new-dialogs-merge/modules/InsertTable/pluginMethods.js

@@ -1 +1 @@
 InsertTable.prototype.show = function(image)
 {
-        var editor = this.editor;
+  if (!this.dialog) this.prepareDialog();
+
+  var editor = this.editor;
 
   var values =