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

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/CreateLink

Files:

• link.js (modified) (2 diffs)
• 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;