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

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

Files:

• Linker/linker.js (modified) (1 diff)
• Linker/pluginMethods.js (copied) (copied from branches/new-dialogs-merge/plugins/Linker/linker.js) (5 diffs)
• PasteText/paste-text.js (modified) (3 diffs)
• SuperClean/pluginMethods.js (copied) (copied from branches/new-dialogs-merge/plugins/SuperClean/super-clean.js) (13 diffs)
• SuperClean/super-clean.js (modified) (6 diffs)

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').style.display = '';
-    this.dialog.getElementById('mailtable').style.display = 'none';
-    this.dialog.getElementById('anchortable').style.display = 'none';
-  }
-  else if(inputs.type=='anchor')
-  {
-    this.dialog.getElementById('urltable').style.display = 'none';
-    this.dialog.getElementById('mailtable').style.display = 'none';
-    this.dialog.getElementById('anchortable').style.display = '';
-  }
-  else
-  {
-    this.dialog.getElementById('urltable').style.display = 'none';
-    this.dialog.getElementById('mailtable').style.display = '';
-    this.dialog.getElementById('anchortable').style.display = 'none';
-  }
-
-  if(inputs.target=='popup')
-  {
-    this.dialog.getElementById('popuptable').style.display = '';
-  }
-  else
-  {
-    this.dialog.getElementById('popuptable').style.display = 'none';
-  }
-  
-  var anchor = this.dialog.getElementById('anchor');
-  for(var i=anchor.length;i>=0;i--) {
-    anchor[i] = null;
-  }
-
-  var html = this.linker.editor.getHTML();  
-  var anchors = new Array();
-
-  var m = html.match(/<a[^>]+name="([^"]+)"/gi);
-  if(m)
-  {
-    for(i=0;i<m.length;i++)
-    {
-        var n = m[i].match(/name="([^"]+)"/i);
-        if(!anchors.contains(n[1])) anchors.push(n[1]);
-    }
-  }
-  m = html.match(/id="([^"]+)"/gi);
-  if(m)
-  {
-    for(i=0;i<m.length;i++)
-    {
-        n = m[i].match(/id="([^"]+)"/i);
-        if(!anchors.contains(n[1])) anchors.push(n[1]);
-    }
-  }
-  
-  for(i=0;i<anchors.length;i++)
-  {
-    var opt = new Option(anchors[i],'#'+anchors[i],false,(inputs.anchor == anchors[i]));
-    anchor[anchor.length] = opt;
-  }
-
-  //if no anchors found completely hide Anchor-Link
-  if(anchor.length==0) {
-    this.dialog.getElementById('anchorfieldset').style.display = "none";
-  }
-  
-  // if we're not editing an existing link, hide the remove link button
-  if (inputs.href == 'http://www.example.com/' && inputs.to == 'alice@example.com') { 
-    this.dialog.getElementById('clear').style.display = "none";
-  }
-  else {
-    this.dialog.getElementById('clear').style.display = "";
-  }
-  // Connect the OK and Cancel buttons
-  var dialog = this.dialog;
-  var lDialog = this;
-  if(ok)
-  {
-    this.dialog.getElementById('ok').onclick = ok;
-  }
-  else
-  {
-    this.dialog.getElementById('ok').onclick = function() {lDialog.hide();};
-  }
-
-  if(cancel)
-  {
-    this.dialog.getElementById('cancel').onclick = cancel;
-  }
-  else
-  {
-    this.dialog.getElementById('cancel').onclick = function() { lDialog.hide()};
-  }
-
-  // Show the dialog
-  this.linker.editor.disableToolbar(['fullscreen','linker']);
-
-  this.dialog.show(inputs);
-
-  // Init the sizes
-  this.dialog.onresize();
-};
-
-Linker.Dialog.prototype.hide = function()
-{
-  this.linker.editor.enableToolbar();
-  return this.dialog.hide();
-};
+}

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

@@ -1 @@
-/** htmlArea - James' Fork - Linker Plugin **/
-Linker._pluginInfo =
-{
-  name     : "Linker",
-  version  : "1.0",
-  developer: "James Sleeman",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "htmlArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-Xinha.loadStyle('dTree/dtree.css', 'Linker');
-
-Xinha.Config.prototype.Linker =
-{
-  'treeCaption' : document.location.host,
-  'backend' : Xinha.getPluginDir("Linker") + '/scan.php',
-  'backend_data' : null,
-  'files' : null
-};
-
-
-function Linker(editor, args)
-{
-  this.editor  = editor;
-  this.lConfig = editor.config.Linker;
-
-  var linker = this;
-  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'
- editor.config.addToolbarElement("createlink", "createlink", 0);
-}
-
-Linker.prototype._lc = function(string)
-{
-  return Xinha._lc(string, 'Linker');
-};
-
 Linker.prototype._createLink = function(a)
 {
+  if (!this._dialog)
+  {
+    this._dialog = new Linker.Dialog(this);
+  }
+  
   if(!a && this.editor.selectionEmpty(this.editor.getSelection()))
   {       
@@ -106 +59 @@
     else
     {
-
-
       if(a.getAttribute('onclick'))
       {
@@ -291 +242 @@
 };
 
-Linker.prototype.onGenerateOnce = function()
-{
-  this._dialog = new Linker.Dialog(this);
-};
-// Inline Dialog for Linker
-
 Linker.Dialog_dTrees = [ ];
-
 
 Linker.Dialog = function (linker)
@@ -308 +252 @@
 
   this.ready = false;
-  this.files  = false;
-  this.html   = false;
+
   this.dialog = false;
 
@@ -322 +265 @@
   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)
-  {
-    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);
-                            } catch(Error) {
-                                lDialog.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();
-    }
-    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;
+  var files = this.linker.files;
+
+  var html = Linker.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 dialog = this.dialog = new Xinha.Dialog(linker.editor, Linker.html, 'Linker',{width:600,height:400});
   var dTreeName = Xinha.uniq('dTree_');
 

branches/new-dialogs-merge/plugins/PasteText/paste-text.js

@@ -43 +43 @@
 PasteText.prototype.onGenerateOnce = function()
 {
-        this._prepareDialog();
+        var self = PasteText;
+        if (self.loading) return;
+        self.loading = true;
+        Xinha._getback(Xinha.getPluginDir("PasteText") + '/popups/paste_text.html', function(getback) { self.html = getback;});
 };
 
@@ -51 +54 @@
         var editor = this.editor;
 
-        if(!this.html) // retrieve the raw dialog contents
-        {
-                Xinha._getback(Xinha.getPluginDir("PasteText") + '/popups/paste_text.html', function(getback) { self.html = getback; self._prepareDialog(); });
-                return;
-        }
+        var self = this;
 
-        // Now we have everything we need, so we can build the dialog.
-        this.dialog = new Xinha.Dialog(editor, this.html, 'PasteText',{width:350})
+/// Now we have everything we need, so we can build the dialog.
+        this.dialog = new Xinha.Dialog(editor, PasteText.html, 'PasteText',{width:350})
 
         // Connect the OK and Cancel buttons
@@ -88 +87 @@
 
         }
-        this.ready = true;
 };
 
 PasteText.prototype.show = function()
 {
-        if(!this.ready) // if the user is too fast clicking the, we have to make them wait
-        {
-                var self = this;
-                window.setTimeout(function() {self.show();},100);
-                return;
-        }
+        if (!this.dialog) this._prepareDialog();
+
         // here we can pass values to the dialog
         // each property pair consists of the "name" of the input we want to populate, and the value to be set

branches/new-dialogs-merge/plugins/SuperClean/pluginMethods.js

@@ -1 @@
-// Make our right side panel and insert appropriatly
-function SuperClean(editor, args)
-{
-  this.editor = editor;
-  var superclean = this;
-  editor._superclean_on = false;
-  editor.config.registerButton('superclean', this._lc("Clean up HTML"), editor.imgURL('ed_superclean.gif', 'SuperClean'), true, function(e, objname, obj) { superclean._superClean(null, obj); });
-
-  // See if we can find 'killword' and replace it with superclean
-  editor.config.addToolbarElement("superclean", "killword", 0);
-}
-
-SuperClean._pluginInfo =
-{
-  name     : "SuperClean",
-  version  : "1.0",
-  developer: "James Sleeman, Niko Sams",
-  developer_url: "http://www.gogo.co.nz/",
-  c_owner      : "Gogo Internet Services",
-  license      : "htmlArea",
-  sponsor      : "Gogo Internet Services",
-  sponsor_url  : "http://www.gogo.co.nz/"
-};
-
-SuperClean.prototype._lc = function(string) {
-    return Xinha._lc(string, 'SuperClean');
-};
-
-/** superClean combines HTMLTidy, Word Cleaning and font stripping into a single function
- *  it works a bit differently in how it asks for parameters */
-
 SuperClean.prototype._superClean = function(opts, obj)
 {
+  if(this.editor.config.SuperClean.show_dialog && !this._dialog)
+  {
+    this._dialog = new SuperClean.Dialog(this);
+  }
   var superclean = this;
 
@@ -45 +18 @@
 
     if(opts.word_clean) editor._wordClean();
-    var D = editor.getInnerHTML();
+    var D = editor.getEditorContent();
 
     for(var filter in editor.config.SuperClean.filters)
@@ -59 +32 @@
     D = D.replace(/<(font|span)\s*>/gi, '');
 
-    editor.setHTML(D);
+    editor.setEditorContent(D);
 
     if(opts.tidy)
@@ -69 +42 @@
         {
           case 'setHTML':
-            editor.setHTML(response.value);
+            editor.setEditorContent(response.value);
             superclean._dialog.hide();
           break;
@@ -101 +74 @@
   {
     var editor = this.editor;
-    var html = editor.getInnerHTML();
+    var html = editor.getEditorContent();
     for(var filter in editor.config.SuperClean.filters)
     {
@@ -111 +84 @@
     html = html.replace(/<(font|span)\s*>/gi, '');
 
-    editor.setHTML(html);
+    editor.setEditorContent(html);
 
     if(editor.config.SuperClean.filters.tidy)
@@ -120 +93 @@
 };
 
-Xinha.Config.prototype.SuperClean =
-{
-  // set to the URL of a handler for html tidy, this handler
-  //  (see tidy.php for an example) must that a single post variable
-  //  "content" which contains the HTML to tidy, and return javascript like
-  //  editor.setHTML('<strong>Tidied Html</strong>')
-  // it's called through XMLHTTPRequest
-  'tidy_handler': Xinha.getPluginDir("SuperClean") + '/tidy.php',
-
-  //avaliable filters (these are built-in filters)
-  // You can either use
-  //    'filter_name' : "Label/Description String"
-  // or 'filter_name' : {label: "Label", checked: true/false, filterFunction: function(html) { ... return html;} }
-  // filterFunction in the second format above is optional.
-
-  'filters': { 'tidy': Xinha._lc('General tidy up and correction of some problems.', 'SuperClean'),
-               'word_clean': Xinha._lc('Clean bad HTML from Microsoft Word', 'SuperClean'),
-               'remove_faces': Xinha._lc('Remove custom typefaces (font "styles").', 'SuperClean'),
-               'remove_sizes': Xinha._lc('Remove custom font sizes.', 'SuperClean'),
-               'remove_colors': Xinha._lc('Remove custom text colors.', 'SuperClean'),
-               'remove_lang': Xinha._lc('Remove lang attributes.', 'SuperClean'),
-               'remove_fancy_quotes': {label:Xinha._lc('Replace directional quote marks with non-directional quote marks.', 'SuperClean'), checked:false}
-  //additional custom filters (defined in plugins/SuperClean/filters/word.js)
-               //'paragraph': 'remove paragraphs'},
-               //'word': 'exteded Word-Filter' },
-              },
-  //if false all filters are applied, if true a dialog asks what filters should be used
-  'show_dialog': true
-};
-
-SuperClean.filterFunctions = { };
 SuperClean.filterFunctions.remove_colors = function(D)
 {
@@ -199 +141 @@
 SuperClean.filterFunctions.tidy = function(html, editor)
 {
-  Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : html},
-                      function(javascriptResponse) { eval(javascriptResponse) });
-};
-
-
-
-SuperClean.prototype.onGenerateOnce = function()
-{
-  if(this.editor.config.SuperClean.show_dialog && !this._dialog)
-  {
-    this._dialog = new SuperClean.Dialog(this);
-  }
-  if(this.editor.config.tidy_handler)
-  {
-    //for backwards compatibility
-    this.editor.config.SuperClean.tidy_handler = this.editor.config.tidy_handler;
-    this.editor.config.tidy_handler = null;
-  }
-  if(!this.editor.config.SuperClean.tidy_handler && this.editor.config.filters.tidy) {
-    //unset tidy-filter if no tidy_handler
-    this.editor.config.filters.tidy = null;
-  }
-
-  this.loadFilters();
-};
-SuperClean.prototype.loadFilters = function()
-{
-  var sc = this;
-  //load the filter-functions
-  for(var filter in this.editor.config.SuperClean.filters)
-  {
-    if(!SuperClean.filterFunctions[filter])
-    {
-      var filtDetail = this.editor.config.SuperClean.filters[filter];
-      if(typeof filtDetail.filterFunction != 'undefined')
-      {
-        SuperClean.filterFunctions[filter] = filterFunction;
-      }
-      else
-      {
-        Xinha._getback(Xinha.getPluginDir("SuperClean") + '/filters/'+filter+'.js',
-                      function(func) {
-                        eval('SuperClean.filterFunctions.'+filter+'='+func+';');
-                        sc.loadFilters();
-                      });
-      }
-      return;
-    }
-  }
-}
-// Inline Dialog for SuperClean
+  var callback = function(javascriptResponse) 
+  {
+    eval("var response = " + javascriptResponse);
+    switch (response.action)
+    {
+      case 'setHTML':
+        editor.setEditorContent(response.value);
+      break;
+      case 'alert':
+        alert(Xinha._lc(response.value, 'SuperClean'));
+      break;
+    }
+  }
+  Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : html},callback);
+};
 
 
@@ -260 +166 @@
 
   this.ready = false;
-  this.files  = false;
-  this.html   = false;
   this.dialog = false;
 
@@ -274 +178 @@
   var SuperClean = this.SuperClean;
 
-  if(this.html == false)
-  {
-    Xinha._getback( Xinha.getPluginDir("SuperClean") + '/dialog.html', function(txt) { lDialog.html = txt; lDialog._prepareDialog(); });
-    return;
-  }
+  var html = window.SuperClean.html;
 
   var htmlFilters = "";
@@ -297 +197 @@
     htmlFilters += "    </div>\n";
   }
-  this.html = this.html.replace('<!--filters-->', htmlFilters);
-
-  var html = this.html;
+  html = html.replace('<!--filters-->', htmlFilters);
+
 
   // Now we have everything we need, so we can build the dialog.
-  var dialog = this.dialog = new Xinha.Dialog(SuperClean.editor, this.html, 'SuperClean',{width:400});
+  var dialog = this.dialog = new Xinha.Dialog(SuperClean.editor, html, 'SuperClean',{width:400});
 
   this.ready = true;
@@ -350 +249 @@
 SuperClean.Dialog.prototype.hide = function()
 {
+  var ret = this.dialog.hide();
   this.SuperClean.editor.enableToolbar();
   this.dialog.getElementById("main").style.display = "";
@@ -356 +256 @@
   this.dialog.getElementById("alert").style.display = "none";
   this.dialog.getElementById("ok").style.display = "";
-  return this.dialog.hide();
-};
+  return ret;
+};

branches/new-dialogs-merge/plugins/SuperClean/super-clean.js

@@ -1 @@
-// Make our right side panel and insert appropriatly
+/** superClean combines HTMLTidy, Word Cleaning and font stripping into a single function
+ *  it works a bit differently in how it asks for parameters */
+
 function SuperClean(editor, args)
 {
@@ -25 +27 @@
 SuperClean.prototype._lc = function(string) {
     return Xinha._lc(string, 'SuperClean');
-};
-
-/** superClean combines HTMLTidy, Word Cleaning and font stripping into a single function
- *  it works a bit differently in how it asks for parameters */
-
-SuperClean.prototype._superClean = function(opts, obj)
-{
-  var superclean = this;
-
-  // Do the clean if we got options
-  var doOK = function()
-  {
-    superclean._dialog.dialog.getElementById("main").style.display = "none";
-    superclean._dialog.dialog.getElementById("waiting").style.display = "";
-    superclean._dialog.dialog.getElementById("buttons").style.display = "none";
-    
-        var opts = superclean._dialog.dialog.getValues();
-    var editor = superclean.editor;
-
-    if(opts.word_clean) editor._wordClean();
-    var D = editor.getInnerHTML();
-
-    for(var filter in editor.config.SuperClean.filters)
-    {
-      if(filter=='tidy' || filter=='word_clean') continue;
-      if(opts[filter])
-      {
-        D = SuperClean.filterFunctions[filter](D, editor);
-      }
-    }
-
-    D = D.replace(/(style|class)="\s*"/gi, '');
-    D = D.replace(/<(font|span)\s*>/gi, '');
-
-    editor.setHTML(D);
-
-    if(opts.tidy)
-    {
-      var callback = function(javascriptResponse) 
-      { 
-        eval("var response = " + javascriptResponse);
-        switch (response.action)
-        {
-          case 'setHTML':
-            editor.setHTML(response.value);
-            superclean._dialog.hide();
-          break;
-          case 'alert':
-            superclean._dialog.dialog.getElementById("buttons").style.display = "";
-            superclean._dialog.dialog.getElementById("ok").style.display = "none";
-            superclean._dialog.dialog.getElementById("waiting").style.display = "none"; 
-            superclean._dialog.dialog.getElementById("alert").style.display = ""; 
-            superclean._dialog.dialog.getElementById("alert").innerHTML = superclean._lc(response.value);
-          break;
-          default: // make the dialog go away if sth goes wrong, who knows...
-           superclean._dialog.hide();
-          break;
-        }
-      }
-      Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : editor.getInnerHTML()},callback);
-    }
-    else
-    {
-      superclean._dialog.hide();
-    }
-    return true;
-  }
-
-  if(this.editor.config.SuperClean.show_dialog)
-  {
-    var inputs = {};
-    this._dialog.show(inputs, doOK);
-  }
-  else
-  {
-    var editor = this.editor;
-    var html = editor.getInnerHTML();
-    for(var filter in editor.config.SuperClean.filters)
-    {
-      if(filter=='tidy') continue; //call tidy last
-      html = SuperClean.filterFunctions[filter](html, editor);
-    }
-
-    html = html.replace(/(style|class)="\s*"/gi, '');
-    html = html.replace(/<(font|span)\s*>/gi, '');
-
-    editor.setHTML(html);
-
-    if(editor.config.SuperClean.filters.tidy)
-    {
-      SuperClean.filterFunctions.tidy(html, editor);
-    }
-  }
 };
 
@@ -147 +56 @@
               },
   //if false all filters are applied, if true a dialog asks what filters should be used
-  'show_dialog': true
+  'show_dialog': false
 };
 
 SuperClean.filterFunctions = { };
-SuperClean.filterFunctions.remove_colors = function(D)
-{
-  D = D.replace(/color="?[^" >]*"?/gi, '');
-  // { (stops jedit's fold breaking)
-  D = D.replace(/([^-])color:[^;}"']+;?/gi, '$1');
-  return(D);
-};
-SuperClean.filterFunctions.remove_sizes = function(D)
-{
-  D = D.replace(/size="?[^" >]*"?/gi, '');
-  // { (stops jedit's fold breaking)
-  D = D.replace(/font-size:[^;}"']+;?/gi, '');
-  return(D);
-};
-SuperClean.filterFunctions.remove_faces = function(D)
-{
-  D = D.replace(/face="?[^" >]*"?/gi, '');
-  // { (stops jedit's fold breaking)
-  D = D.replace(/font-family:[^;}"']+;?/gi, '');
-  return(D);
-};
-SuperClean.filterFunctions.remove_lang = function(D)
-{
-  D = D.replace(/lang="?[^" >]*"?/gi, '');
-  return(D);
-};
-SuperClean.filterFunctions.word_clean = function(html, editor)
-{
-  editor.setHTML(html);
-  editor._wordClean();
-  return editor.getInnerHTML();
-};
-
-SuperClean.filterFunctions.remove_fancy_quotes = function(D)
-{
-  D = D.replace(new RegExp(String.fromCharCode(8216),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8217),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8218),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8219),"g"),"'");
-  D = D.replace(new RegExp(String.fromCharCode(8220),"g"),"\"");
-  D = D.replace(new RegExp(String.fromCharCode(8221),"g"),"\"");
-  D = D.replace(new RegExp(String.fromCharCode(8222),"g"),"\"");
-  D = D.replace(new RegExp(String.fromCharCode(8223),"g"),"\"");
-  return D;
-};
-
-SuperClean.filterFunctions.tidy = function(html, editor)
-{
-  Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : html},
-                      function(javascriptResponse) { eval(javascriptResponse) });
-};
-
 
 
 SuperClean.prototype.onGenerateOnce = function()
 {
-  if(this.editor.config.SuperClean.show_dialog && !this._dialog)
-  {
-    this._dialog = new SuperClean.Dialog(this);
-  }
+
   if(this.editor.config.tidy_handler)
   {
@@ -221 +75 @@
     this.editor.config.filters.tidy = null;
   }
-
+  SuperClean.loadAssets();
   this.loadFilters();
 };
+
+SuperClean.prototype.onUpdateToolbar = function()
+{ 
+  if (!(SuperClean.methodsReady && SuperClean.html))
+  {
+    this.editor._toolbarObjects.superclean.state("enabled", false);
+  }
+  else this.onUpdateToolbar = null;
+};
+
+SuperClean.loadAssets = function()
+{
+  var self = SuperClean;
+  if (self.loading) return;
+  self.loading = true;
+  Xinha._getback(Xinha.getPluginDir("SuperClean") + '/pluginMethods.js', function(getback) { eval(getback); self.methodsReady = true; });
+  Xinha._getback( Xinha.getPluginDir("SuperClean") + '/dialog.html', function(getback) { self.html = getback; } );
+};
+
 SuperClean.prototype.loadFilters = function()
 {
@@ -230 +103 @@
   for(var filter in this.editor.config.SuperClean.filters)
   {
+    if (/^(remove_colors|remove_sizes|remove_faces|remove_lang|word_clean|remove_fancy_quotes|tidy)$/.test(filter)) continue; //skip built-in functions
+    
     if(!SuperClean.filterFunctions[filter])
     {
@@ -248 +123 @@
     }
   }
-}
-// Inline Dialog for SuperClean
-
-
-SuperClean.Dialog = function (SuperClean)
-{
-  var  lDialog = this;
-  this.Dialog_nxtid = 0;
-  this.SuperClean = SuperClean;
-  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();
-
 };
-
-SuperClean.Dialog.prototype._prepareDialog = function()
-{
-  var lDialog = this;
-  var SuperClean = this.SuperClean;
-
-  if(this.html == false)
-  {
-    Xinha._getback( Xinha.getPluginDir("SuperClean") + '/dialog.html', function(txt) { lDialog.html = txt; lDialog._prepareDialog(); });
-    return;
-  }
-
-  var htmlFilters = "";
-  for(var filter in this.SuperClean.editor.config.SuperClean.filters)
-  {
-    htmlFilters += "    <div>\n";
-    var filtDetail = this.SuperClean.editor.config.SuperClean.filters[filter];
-    if(typeof filtDetail.label == 'undefined')
-    {
-      htmlFilters += "        <input type=\"checkbox\" name=\"["+filter+"]\" id=\"["+filter+"]\" checked />\n";
-      htmlFilters += "        <label for=\"["+filter+"]\">"+this.SuperClean.editor.config.SuperClean.filters[filter]+"</label>\n";
-    }
-    else
-    {
-      htmlFilters += "        <input type=\"checkbox\" name=\"["+filter+"]\" id=\"["+filter+"]\" " + (filtDetail.checked ? "checked" : "") + " />\n";
-      htmlFilters += "        <label for=\"["+filter+"]\">"+filtDetail.label+"</label>\n";
-    }
-    htmlFilters += "    </div>\n";
-  }
-  this.html = this.html.replace('<!--filters-->', htmlFilters);
-
-  var html = this.html;
-
-  // Now we have everything we need, so we can build the dialog.
-  var dialog = this.dialog = new Xinha.Dialog(SuperClean.editor, this.html, 'SuperClean',{width:400});
-
-  this.ready = true;
-};
-
-SuperClean.Dialog.prototype._lc = SuperClean.prototype._lc;
-
-SuperClean.Dialog.prototype.show = function(inputs, ok, cancel)
-{
-  if(!this.ready)
-  {
-    var lDialog = this;
-    window.setTimeout(function() {lDialog.show(inputs,ok,cancel);},100);
-    return;
-  }
-
-  // Connect the OK and Cancel buttons
-  var dialog = this.dialog;
-  var lDialog = this;
-  if(ok)
-  {
-    this.dialog.getElementById('ok').onclick = ok;
-  }
-  else
-  {
-    this.dialog.getElementById('ok').onclick = function() {lDialog.hide();};
-  }
-
-  if(cancel)
-  {
-    this.dialog.getElementById('cancel').onclick = cancel;
-  }
-  else
-  {
-    this.dialog.getElementById('cancel').onclick = function() { lDialog.hide()};
-  }
-
-  // Show the dialog
-  this.SuperClean.editor.disableToolbar(['fullscreen','SuperClean']);
-
-  this.dialog.show(inputs);
-
-  // Init the sizes
-  this.dialog.onresize();
-};
-
-SuperClean.Dialog.prototype.hide = function()
-{
-  this.SuperClean.editor.enableToolbar();
-  this.dialog.getElementById("main").style.display = "";
-  this.dialog.getElementById("buttons").style.display = "";
-  this.dialog.getElementById("waiting").style.display = "none";
-  this.dialog.getElementById("alert").style.display = "none";
-  this.dialog.getElementById("ok").style.display = "";
-  return this.dialog.hide();
-};