Changeset 3

Timestamp:

02/13/05 07:38:04 (8 years ago)

Author:

gogo

Message:

Speed enhancements.

Location:

trunk/plugins/Linker

Files:

• dTree/dtree.js (modified) (3 diffs)
• linker.js (modified) (11 diffs)

trunk/plugins/Linker/dTree/dtree.js

@@ -162 +162 @@
 
 dTree.prototype.toString = function() {
-
+  this.setCS_All();
   var str = '<div class="dtree">\n';
 
@@ -205 +205 @@
       cn._ai = n;
 
-      this.setCS(cn);
+      // this.setCS(cn);
 
       if (!cn.target && this.config.target) cn.target = this.config.target;
@@ -359 +359 @@
 };
 
-
+dTree.prototype.setCS_All = function()
+{
+  var ids = { }; // ID => { _hc: haschildren, _ls_is: lastsibling}
+
+  for(var n = 0; n < this.aNodes.length; n++)
+  {
+    var node = this.aNodes[n];
+    if(!ids[node.pid])
+    {
+      ids[node.pid] = { _hc: true, _ls_is: node.id };
+    }
+    else
+    {
+      ids[node.pid]._hc    = true;
+      ids[node.pid]._ls_is = node.id;
+    }
+
+    if(!ids[node.id])
+    {
+      ids[node.id] = { _hc: false, _ls_is: null }
+    }
+  }
+
+  for(var n = 0; n < this.aNodes.length; n++)
+  {
+    var node = this.aNodes[n];
+    node._ls = ids[node.pid]._ls_is == node.id ? true : false;
+    node._hc = ids[node.id]._hc;
+  }
+}
 
 // Returns the selected node

trunk/plugins/Linker/linker.js

@@ -19 +19 @@
 }
 
+
 function Linker(editor, args)
 {
@@ -25 +26 @@
 
   var linker = this;
-  editor.config.registerButton(
-                               'linker', 'Insert/Modify Hyperlink', [_editor_url + "images/ed_buttons_main.gif",6,1], false,
-                                function(e, objname, obj) { linker._createLink(linker._getSelectedAnchor()); }
-                               );
-
-  // See if we can find 'insertlink' and replace it with superclean
+  if(editor.config.btnList.createlink)
+  {
+    editor.config.btnList.createlink[3]
+      =  function(e, objname, obj) { linker._createLink(linker._getSelectedAnchor()); };
+  }
+  else
+  {
+    editor.config.registerButton(
+                                 'createlink', 'Insert/Modify Hyperlink', [_editor_url + "images/ed_buttons_main.gif",6,1], false,
+                                 function(e, objname, obj) { linker._createLink(linker._getSelectedAnchor()); }
+                                 );
+  }
+
+  // See if we can find 'createlink'
   var t = editor.config.toolbar;
   var done = false;
@@ -39 +48 @@
       if(t[i][x] == 'createlink')
       {
-        t[i][x] = 'linker';
         done = true;
       }
@@ -47 +55 @@
   if(!done)
   {
-    t[t.length-1].push('linker');
+    t[t.length-1].push('createlink');
   }
 }
@@ -53 +61 @@
 Linker.prototype._createLink = function(a)
 {
-
-  if(!this._dialog)
-  {
-    this._dialog = new Linker.Dialog(this);
-  }
 
   var inputs =
@@ -246 +249 @@
 }
 
-
+Linker.prototype.onGenerate = function()
+{
+  this._dialog = new Linker.Dialog(this);
+}
 // Inline Dialog for Linker
 
@@ -260 +266 @@
 
   this.ready = false;
+  this.files  = false;
+  this.html   = false;
+  this.dialog = false;
 
   // load the dTree script
-  if(typeof dTree == 'undefined')
-  {
-    HTMLArea._loadback(_editor_url + 'plugins/Linker/dTree/dtree.js',
-                       function() {lDialog._prepareDialog(); lDialog.ready = true; }
-                      );
-  }
-  else
-  {
-    lDialog._prepareDialog();
-    lDialog.ready = true;
-  }
+  this._prepareDialog();
+
 }
 
 Linker.Dialog.prototype._prepareDialog = function()
 {
-
   var lDialog = this;
   var linker = this.linker;
-  var html = HTMLArea._geturlcontent(_editor_url + 'plugins/Linker/dialog.html');
-  var dialog = this.dialog = new HTMLArea.Dialog(linker.editor, html, 'Linker');
-
-  // Make a dtree
-  var files = HTMLArea._geturlcontent(linker.lConfig.backend);
-
-  files = eval(files);
-
+
+  // We load some stuff up int he background, recalling this function
+  // when they have loaded.  This is to keep the editor responsive while
+  // we prepare the dialog.
+  if(typeof dTree == 'undefined')
+  {
+    HTMLArea._loadback(_editor_url + 'plugins/Linker/dTree/dtree.js',
+                       function() {lDialog._prepareDialog(); }
+                      );
+    return;
+  }
+
+  if(this.files == false)
+  {
+    HTMLArea._getback(linker.lConfig.backend, function(txt) { lDialog.files = eval(txt); lDialog._prepareDialog(); });
+    return;
+  }
+  var files = this.files;
+
+  if(this.html == false)
+  {
+    HTMLArea._getback(_editor_url + 'plugins/Linker/dialog.html', function(txt) { lDialog.html = txt; lDialog._prepareDialog(); });
+    return;
+  }
+  var html = this.html;
+
+  // Now we have everything we need, so we can build the dialog.
+  var dialog = this.dialog = new HTMLArea.Dialog(linker.editor, this.html, 'Linker');
   var dTreeName = HTMLArea.uniq('dTree_');
 
@@ -298 +317 @@
   // Put it in
   var ddTree = this.dialog.getElementById('dTree');
-  ddTree.innerHTML = this.dTree.toString();
+  //ddTree.innerHTML = this.dTree.toString();
+  ddTree.innerHTML = '';
   ddTree.style.position = 'absolute';
   ddTree.style.left = 1 + 'px';
   ddTree.style.top =  0 + 'px';
   ddTree.style.overflow = 'auto';
+  this.ddTree = ddTree;
+  this.dTree._linker_premade = this.dTree.toString();
 
   var options = this.dialog.getElementById('options');
@@ -318 +340 @@
     }
 
-
+  this.ready = true;
 }
 
@@ -348 +370 @@
 Linker.Dialog.prototype.show = function(inputs, ok, cancel)
 {
-
   if(!this.ready)
   {
@@ -354 +375 @@
     window.setTimeout(function() {lDialog.show(inputs,ok,cancel);},100);
     return;
+  }
+
+  if(this.ddTree.innerHTML == '')
+  {
+    this.ddTree.innerHTML = this.dTree._linker_premade;
   }