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

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

Files:

• CreateLink/link.js (modified) (2 diffs)
• CreateLink/pluginMethods.js (modified) (1 diff)
• InsertImage/insert_image.js (modified) (2 diffs)
• InsertImage/pluginMethods.js (modified) (2 diffs)
• InsertTable/insert_table.js (modified) (3 diffs)
• InsertTable/pluginMethods.js (modified) (1 diff)

branches/new-dialogs-merge/modules/CreateLink/link.js

@@ -50 +50 @@
 CreateLink.prototype.onGenerateOnce = function()
 {
-        this.prepareDialog();
-        this.loadScripts();
+  CreateLink.loadAssets();
 };
 
-CreateLink.prototype.loadScripts = function()
+CreateLink.loadAssets = function()
 {
-  var self = this;
-  if(!this.methodsReady)
-        {
-                Xinha._getback(_editor_url + 'modules/CreateLink/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
-                return;
-        }
-};
+        var self = CreateLink;
+        if (self.loading) return;
+        self.loading = true;
+        Xinha._getback(_editor_url + 'modules/CreateLink/dialog.html', function(getback) { self.html = getback; self.dialogReady = true; });
+        Xinha._getback(_editor_url + 'modules/CreateLink/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
+}
 
 CreateLink.prototype.onUpdateToolbar = function()
 { 
-  if (!(this.dialogReady && this.methodsReady))
+        if (!(CreateLink.dialogReady && CreateLink.methodsReady))
         {
-          this.editor._toolbarObjects.createlink.state("enabled", false);
+                this.editor._toolbarObjects.createlink.state("enabled", false);
         }
+        else this.onUpdateToolbar = null;
 };
 
@@ -77 +76 @@
         var editor = this.editor;
 
-        if(!this.html) // retrieve the raw dialog contents
-        {
-                Xinha._getback(_editor_url + 'modules/CreateLink/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, CreateLink.html, 'Xinha',{width:400})
         // Connect the OK and Cancel buttons
         dialog.getElementById('ok').onclick = function() {self.apply();}

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

@@ -2 +2 @@
 CreateLink.prototype.show = function(a)
 {
+  if (!this.dialog)
+  {
+    this.prepareDialog();
+  } 
         var editor = this.editor;
         this.a = a;

branches/new-dialogs-merge/modules/InsertImage/insert_image.js

@@ -46 +46 @@
 InsertImage.prototype.onGenerateOnce = function()
 {
-        this.prepareDialog();
-        this.loadScripts();
+        InsertImage.loadAssets();
 };
 
-InsertImage.prototype.loadScripts = function()
+InsertImage.loadAssets = function()
 {
-  var self = this;
-  if(!this.methodsReady)
-        {
-                Xinha._getback(_editor_url + 'modules/InsertImage/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
-                return;
-        }
+        var self = InsertImage;
+        if (self.loading) return;
+        self.loading = true;
+        Xinha._getback(_editor_url + 'modules/InsertImage/dialog.html', function(getback) { self.html = getback; self.dialogReady = true; });
+        Xinha._getback(_editor_url + 'modules/InsertImage/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
 };
-
 InsertImage.prototype.onUpdateToolbar = function()
 { 
-  if (!(this.dialogReady && this.methodsReady))
+  if (!(InsertImage.dialogReady && InsertImage.methodsReady))
         {
           this.editor._toolbarObjects.insertimage.state("enabled", false);
         }
+  else this.onUpdateToolbar = null;
 };
 
@@ -73 +71 @@
         var editor = this.editor;
 
-        if(!this.html) // retrieve the raw dialog contents
-        {
-                Xinha._getback(_editor_url + 'modules/InsertImage/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:410})
+        var dialog = this.dialog = new Xinha.Dialog(editor, InsertImage.html, 'Xinha',{width:410})
         // Connect the OK and Cancel buttons
         dialog.getElementById('ok').onclick = function() {self.apply();}

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

@@ -1 +1 @@
 InsertImage.prototype.show = function(image)
 {
-        var editor = this.editor;
+        if (!this.dialog) this.prepareDialog();
+  
+  var editor = this.editor;
         if ( typeof image == "undefined" )
   {
@@ -60 +62 @@
 InsertImage.prototype.apply = function()
 {
-
   var param = this.dialog.hide();
   if (!param.f_url)

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 =