Changeset 1011

Timestamp:

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

Author:

ray

Message:

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

Location:

branches/new-dialogs-merge

Files:

• XinhaCore.js (modified) (1 diff)
• modules/CreateLink/link.js (modified) (2 diffs)
• modules/CreateLink/pluginMethods.js (modified) (1 diff)
• modules/InsertImage/insert_image.js (modified) (2 diffs)
• modules/InsertImage/pluginMethods.js (modified) (2 diffs)
• modules/InsertTable/insert_table.js (modified) (3 diffs)
• modules/InsertTable/pluginMethods.js (modified) (1 diff)
• plugins/Linker/linker.js (modified) (1 diff)
• plugins/Linker/pluginMethods.js (copied) (copied from branches/new-dialogs-merge/plugins/Linker/linker.js) (5 diffs)
• plugins/PasteText/paste-text.js (modified) (3 diffs)
• plugins/SuperClean/pluginMethods.js (copied) (copied from branches/new-dialogs-merge/plugins/SuperClean/super-clean.js) (13 diffs)
• plugins/SuperClean/super-clean.js (modified) (6 diffs)

branches/new-dialogs-merge/XinhaCore.js

@@ -6799 +6799 @@
   scope = (scope) ? scope : window;
   var x,y;
-  if (scope.pageYOffset) // all except Explorer
+  if (typeof scope.pageYOffset != 'undefined') // all except Explorer
   {
     x = scope.pageXOffset;
     y = scope.pageYOffset;
   }
-  else if (scope.document.documentElement && document.documentElement.scrollTop)
+  else if (scope.document.documentElement && typeof document.documentElement.scrollTop != 'undefined')
     // Explorer 6 Strict
   {

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 = 

branches/new-dialogs-merge/plugins/Linker/linker.js

@@ -51 +51 @@
 };
 
-Linker.prototype._createLink = function(a)
-{
-  if(!a && this.editor.selectionEmpty(this.editor.getSelection()))
-  {       
-    alert(this._lc("You must select some text before making a new link."));
-    return false;
-  }
-
-  var inputs =
-  {
-    type:     'url',
-    href:     'http://www.example.com/',
-    target:   '',
-    p_width:  '',
-    p_height: '',
-    p_options: ['menubar=no','toolbar=yes','location=no','status=no','scrollbars=yes','resizeable=yes'],
-    to:       'alice@example.com',
-    subject:  '',
-    body:     '',
-    anchor:   ''
-  };
-
-  if(a && a.tagName.toLowerCase() == 'a')
-  {
-    var href =this.editor.fixRelativeLinks(a.getAttribute('href'));
-    var m = href.match(/^mailto:(.*@[^?&]*)(\?(.*))?$/);
-    var anchor = href.match(/^#(.*)$/);
-
-    if(m)
-    {
-      // Mailto
-      inputs.type = 'mailto';
-      inputs.to = m[1];
-      if(m[3])
-      {
-        var args  = m[3].split('&');
-        for(var x = 0; x<args.length; x++)
-        {
-          var j = args[x].match(/(subject|body)=(.*)/);
-          if(j)
-          {
-            inputs[j[1]] = decodeURIComponent(j[2]);
-          }
-        }
-      }
-    }
-    else if (anchor)
-    {
-      //Anchor-Link
-      inputs.type = 'anchor';
-      inputs.anchor = anchor[1];
-      
-    }
-    else
-    {
-
-
-      if(a.getAttribute('onclick'))
-      {
-        var m = a.getAttribute('onclick').match(/window\.open\(\s*this\.href\s*,\s*'([a-z0-9_]*)'\s*,\s*'([a-z0-9_=,]*)'\s*\)/i);
-
-        // Popup Window
-        inputs.href   = href ? href : '';
-        inputs.target = 'popup';
-        inputs.p_name = m[1];
-        inputs.p_options = [ ];
-
-
-        var args = m[2].split(',');
-        for(var x = 0; x < args.length; x++)
-        {
-          var i = args[x].match(/(width|height)=([0-9]+)/);
-          if(i)
-          {
-            inputs['p_' + i[1]] = parseInt(i[2]);
-          }
-          else
-          {
-            inputs.p_options.push(args[x]);
-          }
-        }
-      }
-      else
-      {
-        // Normal
-        inputs.href   = href;
-        inputs.target = a.target;
-      }
-    }
-  }
-
-  var linker = this;
-
-  // If we are not editing a link, then we need to insert links now using execCommand
-  // because for some reason IE is losing the selection between now and when doOK is
-  // complete.  I guess because we are defocusing the iframe when we click stuff in the
-  // linker dialog.
-
-  this.a = a; // Why doesn't a get into the closure below, but if I set it as a property then it's fine?
-
-  var doOK = function()
-  {
-    //if(linker.a) alert(linker.a.tagName);
-    var a = linker.a;
-
-    var values = linker._dialog.hide();
-    var atr =
-    {
-      href: '',
-      target:'',
-      title:'',
-      onclick:''
-    };
-
-    if(values.type == 'url')
-    {
-     if(values.href)
-     {
-       atr.href = values.href;
-       atr.target = values.target;
-       if(values.target == 'popup')
-       {
-
-         if(values.p_width)
-         {
-           values.p_options.push('width=' + values.p_width);
-         }
-         if(values.p_height)
-         {
-           values.p_options.push('height=' + values.p_height);
-         }
-         atr.onclick = 'if(window.parent && window.parent.Xinha){return false}window.open(this.href, \'' + (values.p_name.replace(/[^a-z0-9_]/i, '_')) + '\', \'' + values.p_options.join(',') + '\');return false;';
-       }
-     }
-    }
-    else if(values.type == 'anchor')
-    {
-      if(values.anchor)
-      {
-        atr.href = values.anchor.value;
-      }
-    }
-    else
-    {
-      if(values.to)
-      {
-        atr.href = 'mailto:' + values.to;
-        if(values.subject) atr.href += '?subject=' + encodeURIComponent(values.subject);
-        if(values.body)    atr.href += (values.subject ? '&' : '?') + 'body=' + encodeURIComponent(values.body);
-      }
-    }
-
-    if(a && a.tagName.toLowerCase() == 'a')
-    {
-      if(!atr.href)
-      {
-        if(confirm(linker._dialog._lc('Are you sure you wish to remove this link?')))
-        {
-          var p = a.parentNode;
-          while(a.hasChildNodes())
-          {
-            p.insertBefore(a.removeChild(a.childNodes[0]), a);
-          }
-          p.removeChild(a);
-          linker.editor.updateToolbar();
-          return;
-        }
-      }
-      else
-      {
-        // Update the link
-        for(var i in atr)
-        {
-          a.setAttribute(i, atr[i]);
-        }
-        
-        // If we change a mailto link in IE for some hitherto unknown
-        // reason it sets the innerHTML of the link to be the 
-        // href of the link.  Stupid IE.
-        if(Xinha.is_ie)
-        {
-          if(/mailto:([^?<>]*)(\?[^<]*)?$/i.test(a.innerHTML))
-          {
-            a.innerHTML = RegExp.$1;
-          }
-        }
-      }
-    }
-    else
-    {
-      if(!atr.href) return true;
-
-      // Insert a link, we let the browser do this, we figure it knows best
-      var tmp = Xinha.uniq('http://www.example.com/Link');
-      linker.editor._doc.execCommand('createlink', false, tmp);
-
-      // Fix them up
-      var anchors = linker.editor._doc.getElementsByTagName('a');
-      for(var i = 0; i < anchors.length; i++)
-      {
-        var anchor = anchors[i];
-        if(anchor.href == tmp)
-        {
-          // Found one.
-          if (!a) a = anchor;
-          for(var j in atr)
-          {
-            anchor.setAttribute(j, atr[j]);
-          }
-        }
-      }
-    }
-    linker.editor.selectNodeContents(a);
-    linker.editor.updateToolbar();
-  };
-
-  this._dialog.show(inputs, doOK);
-
-};
-
-Linker.prototype._getSelectedAnchor = function()
-{
-  var sel  = this.editor.getSelection();
-  var rng  = this.editor.createRange(sel);
-  var a    = this.editor.activeElement(sel);
-  if(a != null && a.tagName.toLowerCase() == 'a')
-  {
-    return a;
-  }
-  else
-  {
-    a = this.editor._getFirstAncestor(sel, 'a');
-    if(a != null)
-    {
-      return a;
-    }
-  }
-  return null;
-};
 
 Linker.prototype.onGenerateOnce = function()
 {
-  this._dialog = new Linker.Dialog(this);
+  Linker.loadAssets();
+  this.loadFiles();
 };
-// Inline Dialog for Linker
+
+Linker.prototype.onUpdateToolbar = function()
+{ 
+  if (typeof dTree == 'undefined' || !Linker.methodsReady || !Linker.html || !this.files)
+  {
+    this.editor._toolbarObjects.createlink.state("enabled", false);
+  }
+  else this.onUpdateToolbar = null;
+};
 
 Linker.Dialog_dTrees = [ ];
 
+Linker.loadAssets = function()
+{
+  var self = Linker;
+  if (self.loading) return;
+  self.loading = true;
+  Xinha._getback(Xinha.getPluginDir("Linker") + '/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
+  Xinha._loadback( Xinha.getPluginDir("Linker") + '/dTree/dtree.js', function() {Linker.dTreeReady = true; } );
+  Xinha._getback( Xinha.getPluginDir("Linker") + '/dialog.html', function(getback) { self.html = getback; } );
+}
 
-Linker.Dialog = function (linker)
+Linker.prototype.loadFiles = function()
 {
-  var  lDialog = this;
-  this.Dialog_nxtid = 0;
-  this.linker = linker;
-  this.id = { }; // This will be filled below with a replace, nifty
-
-  this.ready = false;
-  this.files  = false;
-  this.html   = false;
-  this.dialog = false;
-
-  // load the dTree script
-  this._prepareDialog();
-
-};
-
-Linker.Dialog.prototype._prepareDialog = function()
-{
-  var lDialog = this;
-  var linker = this.linker;
-
-  // 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')
-  {
-    this.linker.editor.setLoadingMessage('Loading Tree script');
-    Xinha._loadback(Xinha.getPluginDir("Linker") + '/dTree/dtree.js',
-                       function() {lDialog._prepareDialog(); }
-                      );
-    return;
-  }
-
-  if(this.files === false)
-  {
+    var linker = this;
     if(linker.lConfig.backend)
     {
         //get files from backend
-        this.linker.editor.setLoadingMessage('Loading files from backend');
         Xinha._postback(linker.lConfig.backend,
                           linker.lConfig.backend_data,
                           function(txt) {
                             try {
-                                lDialog.files = eval(txt);
+                                linker.files = eval(txt);
                             } catch(Error) {
-                                lDialog.files = [ {url:'',title:Error.toString()} ];
+                                linker.files = [ {url:'',title:Error.toString()} ];
                             }
-                            lDialog._prepareDialog(); });
+                            });
     }
     else if(linker.lConfig.files != null)
     {
         //get files from plugin-config
-        lDialog.files = linker.lConfig.files;
-        lDialog._prepareDialog();
+        linker.files = linker.lConfig.files;
     }
-    return;
-  }
-  var files = this.files;
-
-  if(this.html == false)
-  {
-    Xinha._getback(Xinha.getPluginDir("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 Xinha.Dialog(linker.editor, this.html, 'Linker',{width:600,height:400});
-  var dTreeName = Xinha.uniq('dTree_');
-
-  this.dTree = new dTree(dTreeName, Xinha.getPluginDir("Linker") + '/dTree/');
-  eval(dTreeName + ' = this.dTree');
-
-  this.dTree.add(this.Dialog_nxtid++, -1, linker.lConfig.treeCaption , null, linker.lConfig.treeCaption);
-  this.makeNodes(files, 0);
-
-  // Put it in
-  var ddTree = this.dialog.getElementById('dTree');
-  //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';
-  ddTree.style.height = '300px';
-  if ( Xinha.is_ie )
-  {
-    ddTree.style.styleFloat = "left";
-  }
-  else
-  {
-    ddTree.style.cssFloat = "left";
-  }
-  ddTree.style.backgroundColor = 'white';
-  this.ddTree = ddTree;
-  
-  this.dTree._linker_premade = this.dTree.toString();
-
-  var options = this.dialog.getElementById('options');
-  //options.style.position = 'absolute';
-  //options.style.top      = 0   + 'px';
-  //options.style.right    = 0   + 'px';
-  options.style.width    = 320 + 'px';
-  options.style.overflow = 'auto';
-
-  // Hookup the resizer
-  this.dialog.rootElem.style.paddingBottom ="0";
-  this.dialog.onresize = function()
-    {
-      var h = parseInt(dialog.height) - dialog.getElementById('h1').offsetHeight;
-      var w = parseInt(dialog.width)  - 330 ;
-
-      // An error is thrown with IE when trying to set a negative width or a negative height
-      // But perhaps a width / height of 0 is not the minimum required we need to set
-      if (w<0) w = 0;
-      if (h<0) h = 0;
-      //options.style.height =
-      lDialog.ddTree.style.height = h + 'px';
-      lDialog.ddTree.style.width  = w + 'px';
-    }
-  this.ready = true;
-  ddTree = null;
-  Xinha.freeLater(lDialog, 'ddTree');
-  options = null;
-};
-
-Linker.Dialog.prototype.makeNodes = function(files, parent)
-{
-  for(var i = 0; i < files.length; i++)
-  {
-    if(typeof files[i] == 'string')
-    {
-      this.dTree.add(Linker.nxtid++, parent,
-                     files[i].replace(/^.*\//, ''),
-                     'javascript:document.getElementsByName(\'' + this.dialog.id.href + '\')[0].value=decodeURIComponent(\'' + encodeURIComponent(files[i]) + '\');document.getElementsByName(\'' + this.dialog.id.type + '\')[0].click();document.getElementsByName(\'' + this.dialog.id.href + '\')[0].focus();void(0);',
-                     files[i]);
-    }
-    else if(typeof files[i]=="object" && files[i] && typeof files[i].length==="number") // there seems to be a strange bug in IE that requires this complicated check, see #1197
-    {
-      var id = this.Dialog_nxtid++;
-      this.dTree.add(id, parent, files[i][0].replace(/^.*\//, ''), null, files[i][0]);
-      this.makeNodes(files[i][1], id);
-    }
-    else if(typeof files[i] == 'object')
-    {
-      if(files[i].children) {
-        var id = this.Dialog_nxtid++;
-      } else {
-        var id = Linker.nxtid++;
-      }
-
-      if(files[i].title) var title = files[i].title;
-      else if(files[i].url) var title = files[i].url.replace(/^.*\//, '');
-      else var title = "no title defined";
-      if(files[i].url) var link = 'javascript:document.getElementsByName(\'' + this.dialog.id.href + '\')[0].value=decodeURIComponent(\'' + encodeURIComponent(files[i].url) + '\');document.getElementsByName(\'' + this.dialog.id.type + '\')[0].click();document.getElementsByName(\'' + this.dialog.id.href + '\')[0].focus();void(0);';
-      else var link = '';
-      
-      this.dTree.add(id, parent, title, link, title);
-      if(files[i].children) {
-        this.makeNodes(files[i].children, id);
-      }
-    }
-  }
-};
-
-Linker.Dialog.prototype._lc = Linker.prototype._lc;
-
-Linker.Dialog.prototype.show = function(inputs, ok, cancel)
-{
-  if(!this.ready)
-  {
-    var lDialog = this;
-    window.setTimeout(function() {lDialog.show(inputs,ok,cancel);},100);
-    return;
-  }
-
-  if(this.ddTree.innerHTML == '')
-  {
-    this.ddTree.innerHTML = this.dTree._linker_premade;
-  }
-
-  if(inputs.type=='url')
-  {
-    this.dialog.getElementById('urltable').sty