Changeset 681

Timestamp:

01/22/07 02:09:48 (6 years ago)

Author:

ray

Message:

Ticket #916 TODO: Change plugins to use Xinha object name

Location:

trunk/plugins

Files:

• EnterParagraphs/enter-paragraphs.js (modified) (5 diffs)
• Equation/equation.js (modified) (8 diffs)
• Equation/popups/dialog.html (modified) (1 diff)
• ExtendedFileManager/assets/images.js (modified) (1 diff)
• ExtendedFileManager/assets/manager.js (modified) (5 diffs)
• ExtendedFileManager/assets/popup.js (modified) (2 diffs)
• ExtendedFileManager/backend.php (modified) (1 diff)
• ExtendedFileManager/editor.php (modified) (1 diff)
• ExtendedFileManager/editorFrame.php (modified) (1 diff)
• ExtendedFileManager/extended-file-manager.js (modified) (13 diffs)
• ExtendedFileManager/images.php (modified) (1 diff)
• ExtendedFileManager/manager.php (modified) (1 diff)
• InsertSnippet/insert-snippet.js (modified) (3 diffs)
• InsertSnippet/popups/insertsnippet.html (modified) (4 diffs)
• Linker/linker.js (modified) (1 diff)
• SaveSubmit/save-submit.js (modified) (6 diffs)
• SmartReplace/popups/dialog.html (modified) (1 diff)
• SmartReplace/smart-replace.js (modified) (6 diffs)
• SuperClean/super-clean.js (modified) (8 diffs)
• SuperClean/tidy.php (modified) (1 diff)

trunk/plugins/EnterParagraphs/enter-paragraphs.js

@@ -4 +4 @@
 * @fileoverview By Adam Wright, for The University of Western Australia
 *
-* Distributed under the same terms as HTMLArea itself.
+* Distributed under the same terms as Xinha itself.
 * This notice MUST stay intact for use (see license.txt).
 *
@@ -108 +108 @@
         // gecko (Mozilla/FireFox)
 
-  if (HTMLArea.is_gecko)
+  if (Xinha.is_gecko)
                 {
                 //this.ddt._ddt( "enter-paragraphs.js","23", "EnterParagraphs(): we are gecko. Setting event handler." );
@@ -783 +783 @@
 
                         // FIXME:/CHECKME: When Xinha is switched from WYSIWYG to text mode
-                        // HTMLArea.getHTMLWrapper() will strip out the trailing br. Not sure why.
+                        // Xinha.getHTMLWrapper() will strip out the trailing br. Not sure why.
 
                         // fill.appendChild(editor._doc.createElement('br'));
@@ -964 +964 @@
   // Grab the selection and associated range
 
-  var sel = this.editor._getSelection();
-  var rng = this.editor._createRange(sel);
+  var sel = this.editor.getSelection();
+  var rng = this.editor.createRange(sel);
 
         //this.ddt._ddtDumpNode( "enter-paragraphs.js", "757", "handleEnter(): initial range is: ", rng );
@@ -1082 +1082 @@
   this.editor.updateToolbar();
 
-        HTMLArea._stopEvent(ev);
+        Xinha._stopEvent(ev);
 
         return true;

trunk/plugins/Equation/equation.js

@@ -47 +47 @@
         mathfontfamily = cfg.Equation.mathfontfamily;
         
-        //if (HTMLArea.is_ie) return;
-        if (!HTMLArea.is_ie)
+        //if (Xinha.is_ie) return;
+        if (!Xinha.is_ie)
         {       
                 editor.notifyOn( 'modechange',
@@ -56 +56 @@
                                 }
                         );
-        HTMLArea.prependDom0Event (editor._textArea.form,'submit',function () {self.unParse();self.reParse = true});
+        Xinha.prependDom0Event (editor._textArea.form,'submit',function () {self.unParse();self.reParse = true});
         }
         
         if (typeof  AMprocessNode != "function")
         {
-                HTMLArea._loadback(_editor_url + "plugins/Equation/ASCIIMathML.js", function () { translate(); });
+                Xinha._loadback(_editor_url + "plugins/Equation/ASCIIMathML.js", function () { translate(); });
         }
 }
 
-HTMLArea.Config.prototype.Equation =
+Xinha.Config.prototype.Equation =
 {
         "mathcolor" : "red",       // change it to "" (to inherit) or any other color
@@ -85 +85 @@
 Equation.prototype._lc = function(string) 
 {
-    return HTMLArea._lc(string, 'Equation');
+    return Xinha._lc(string, 'Equation');
 };
 Equation.prototype.onGenerate = function() 
@@ -93 +93 @@
 Equation.prototype.onUpdateToolbar = function() 
 {
-        if (!HTMLArea.is_ie && this.reParse) AMprocessNode(this.editor._doc.body, false);
+        if (!Xinha.is_ie && this.reParse) AMprocessNode(this.editor._doc.body, false);
 };
 
@@ -112 +112 @@
 Equation.prototype.parse = function ()
 {
-        if (!HTMLArea.is_ie)
+        if (!Xinha.is_ie)
         {
                 var doc = this.editor._doc;
@@ -149 +149 @@
         args['editor'] = editor;
         
-        var parent = editor._getFirstAncestor(editor._getSelection(),['span']);
+        var parent = editor._getFirstAncestor(editor.getSelection(),['span']);
         if (parent)
         {
@@ -181 +181 @@
                 else if (!param["editedNode"] && formula != '')
                 {
-                        if (!HTMLArea.is_ie)
+                        if (!Xinha.is_ie)
                         {                       
                                 var span = document.createElement('span');
@@ -194 +194 @@
                         }
                 }
-                if (!HTMLArea.is_ie) AMprocessNode(this.editor._doc.body, false);
+                if (!Xinha.is_ie) AMprocessNode(this.editor._doc.body, false);
         }
 }

trunk/plugins/Equation/popups/dialog.html

@@ -38 +38 @@
    window.resizeTo(500, 300);
 var showasciiformulaonhover = false;
-HTMLArea = window.opener.HTMLArea;
+Xinha = window.opener.Xinha;
 
 function i18n(str) {
-  return (HTMLArea._lc(str, 'Equation'));
+  return (Xinha._lc(str, 'Equation'));
 }
 function set (string)

trunk/plugins/ExtendedFileManager/assets/images.js

@@ -10 +10 @@
 
 function i18n(str) {
-    return HTMLArea._lc(str, 'ExtendedFileManager');
+    return Xinha._lc(str, 'ExtendedFileManager');
 }
 

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -20 +20 @@
 //Translation
 function i18n(str) {
-    return HTMLArea._lc(str, 'ExtendedFileManager');
+    return Xinha._lc(str, 'ExtendedFileManager');
 }
 
@@ -50 +50 @@
 if (manager_mode == "link")
 {
-    var offsetForInputs = (HTMLArea.is_ie) ? 155 : 140;
+    var offsetForInputs = (Xinha.is_ie) ? 155 : 140;
 }
 else
 {
-    var offsetForInputs = (HTMLArea.is_ie) ? 220 : 200;
+    var offsetForInputs = (Xinha.is_ie) ? 220 : 200;
 }    
 init = function ()
@@ -100 +100 @@
         // (when the user alters the dimensions in the picker), clean that up
         // so it looks right and we get back to a normal f_url
-        var rd = _resized_dir.replace(HTMLArea.RE_Specials, '\\$1');
-        var rp = _resized_prefix.replace(HTMLArea.RE_Specials, '\\$1');
+        var rd = _resized_dir.replace(Xinha.RE_Specials, '\\$1');
+        var rp = _resized_prefix.replace(Xinha.RE_Specials, '\\$1');
         var dreg = new RegExp('^(.*/)' + rd + '/' + rp + '_([0-9]+)x([0-9]+)_([^/]+)$');
 
@@ -321 +321 @@
         {
           // Yup, need to resize
-          var resized = HTMLArea._geturlcontent(window.opener._editor_url + 'plugins/ExtendedFileManager/' + _backend_url + '&__function=resizer&img=' + encodeURIComponent(document.getElementById('f_url').value) + '&width=' + param.f_width + '&height=' + param.f_height);
+          var resized = Xinha._geturlcontent(window.opener._editor_url + 'plugins/ExtendedFileManager/' + _backend_url + '&__function=resizer&img=' + encodeURIComponent(document.getElementById('f_url').value) + '&width=' + param.f_width + '&height=' + param.f_height);
 
           // alert(resized);
@@ -529 +529 @@
 function resize()
 {
-        var win = HTMLArea.viewportSize(window);
+        var win = Xinha.viewportSize(window);
         document.getElementById('imgManager').style.height = win.y - 150 - offsetForInputs + 'px';
         

trunk/plugins/ExtendedFileManager/assets/popup.js

@@ -24 +24 @@
             var span = spans[i];
             if (span.firstChild && span.firstChild.data) {
-                var txt = HTMLArea._lc(span.firstChild.data, context);
+                var txt = Xinha._lc(span.firstChild.data, context);
                 if (txt)
                     span.firstChild.data = txt;
             }
             if (span.title) {
-                var txt = HTMLArea._lc(span.title, context);
+                var txt = Xinha._lc(span.title, context);
                 if (txt)
                     span.title = txt;
             }
             if (span.alt) {
-                var txt = HTMLArea._lc(span.alt, context);
+                var txt = Xinha._lc(span.alt, context);
                 if (txt)
                     span.alt = txt;
@@ -40 +40 @@
         }
     }
-    document.title = HTMLArea._lc(document.title, context);
+    document.title = Xinha._lc(document.title, context);
 }
 

trunk/plugins/ExtendedFileManager/backend.php

@@ -10 +10 @@
 *
 * (c) DTLink, LLC 2005.
-* Distributed under the same terms as HTMLArea itself.
+* Distributed under the same terms as Xinha itself.
 * This notice MUST stay intact for use (see license.txt).
 *

trunk/plugins/ExtendedFileManager/editor.php

@@ -34 +34 @@
 
         if(window.opener)
-                HTMLArea = window.opener.HTMLArea;
+                Xinha = window.opener.Xinha;
 /*]]>*/
 </script>

trunk/plugins/ExtendedFileManager/editorFrame.php

@@ -31 +31 @@
 
     if(window.top)
-        HTMLArea = window.top.HTMLArea;
+        Xinha = window.top.Xinha;
 
     function i18n(str) {
-        return HTMLArea._lc(str, 'ImageManager');
+        return Xinha._lc(str, 'ImageManager');
     }
 

trunk/plugins/ExtendedFileManager/extended-file-manager.js

@@ -10 +10 @@
 
 /**
- * Installation example for ExtendedFileManager plugin.
+ * For installation details see Readme.txt in the plugin folder
  *
- *
- *      HTMLArea.loadPlugin("ExtendedFileManager");
- *      HTMLArea.onload = function() {
- *      var myeditor = new HTMLArea("textarea_id");
- *      myeditor.registerPlugin(ExtendedFileManager);
- *      myeditor.generate();
- *      };
- *      HTMLArea.init();
- *
- *
- * Then configure the config.inc.php file, that is all.
- */
-
-/**
- * It is pretty simple, this file over rides the HTMLArea.prototype._insertImage
- * function with our own, only difference is the popupDialog url
- * point that to the php script.
  */
 
@@ -43 +26 @@
         cfg.registerButton({
             id        : "linkfile",
-            tooltip   : HTMLArea._lc("Insert File Link",'ExtendedFileManager'),
+            tooltip   : Xinha._lc("Insert File Link",'ExtendedFileManager'),
             image     : _editor_url + 'plugins/ExtendedFileManager/img/ed_linkfile.gif',
             textMode  : false,
@@ -62 +45 @@
 };
 
-HTMLArea.Config.prototype.ExtendedFileManager =
+Xinha.Config.prototype.ExtendedFileManager =
 {
   'use_linker': true,
@@ -75 +58 @@
 // Over ride the _insertImage function in htmlarea.js.
 // Open up the ExtendedFileManger script instead.
-HTMLArea.prototype._insertImage = function(image) {
+Xinha.prototype._insertImage = function(image) {
 
     var editor = this;  // for nested functions
@@ -87 +70 @@
     if (image) {
         outparam = {
-            f_url    : HTMLArea.is_ie ? image.src : image.getAttribute("src"),
+            f_url    : Xinha.is_ie ? image.src : image.getAttribute("src"),
             f_alt    : image.alt,
             f_title  : image.title,
@@ -140 +123 @@
         if (!img) {
                 if ( !param.f_url ) return false;
-            if (HTMLArea.is_ie) {
-                var sel = editor._getSelection();
-                var range = editor._createRange(sel);
+            if (Xinha.is_ie) {
+                var sel = editor.getSelection();
+                var range = editor.createRange(sel);
                 editor._doc.execCommand("insertimage", false, param.f_url);
                 img = range.parentElement();
@@ -205 +188 @@
 };
 
-HTMLArea.prototype._linkFile = function(link) {
+Xinha.prototype._linkFile = function(link) {
 
     var editor = this;
@@ -219 +202 @@
     }
     if (!link) {
-        var sel = editor._getSelection();
-        var range = editor._createRange(sel);
+        var sel = editor.getSelection();
+        var range = editor.createRange(sel);
         var compare = 0;
-        if (HTMLArea.is_ie) {
+        if (Xinha.is_ie) {
             if ( sel.type == "Control" )
                 compare = range.length;
@@ -231 +214 @@
         }
         if (compare == 0) {
-            alert(HTMLArea._lc("You must select some text before making a new link.", 'ExtendedFileManager'));
+            alert(Xinha._lc("You must select some text before making a new link.", 'ExtendedFileManager'));
             return;
         }
@@ -243 +226 @@
     } else
         outparam = {
-            f_href   : HTMLArea.is_ie ? link.href : link.getAttribute("href"),
+            f_href   : Xinha.is_ie ? link.href : link.getAttribute("href"),
             f_title  : link.title,
             f_target : link.target,
@@ -277 +260 @@
             editor._doc.execCommand("createlink", false, param.f_href);
             a = editor.getParentElement();
-            var sel = editor._getSelection();
-            var range = editor._createRange(sel);
-            if (!HTMLArea.is_ie) {
+            var sel = editor.getSelection();
+            var range = editor.createRange(sel);
+            if (!Xinha.is_ie) {
                 a = range.startContainer;
                 if (!/^a$/i.test(a.tagName)) {
@@ -339 +322 @@
         var colorstring = '';
         for (var i = 0; i < colors.length; i++) {
-            colorstring += HTMLArea._colorToRgb(colors[i]);
+            colorstring += Xinha._colorToRgb(colors[i]);
             if (i + 1 < colors.length)
                 colorstring += " ";
@@ -346 +329 @@
     }
 
-    return HTMLArea._colorToRgb(color);
+    return Xinha._colorToRgb(color);
 }

trunk/plugins/ExtendedFileManager/images.php

@@ -264 +264 @@
 
         if(window.top)
-                HTMLArea = window.top.HTMLArea;
+                Xinha = window.top.Xinha;
 
         function hideMessage()

trunk/plugins/ExtendedFileManager/manager.php

@@ -86 +86 @@
 
         if(window.opener)
-                HTMLArea = window.opener.HTMLArea;
+                Xinha = window.opener.Xinha;
                 
         var thumbdir = "<?php echo $IMConfig['thumbnail_dir']; ?>";

trunk/plugins/InsertSnippet/insert-snippet.js

@@ -34 +34 @@
         }
     }
-    HTMLArea._getback(backend,function (getback) {eval(getback); self.snippets = snippets;});
+    Xinha._getback(backend,function (getback) {eval(getback); self.snippets = snippets;});
 }
 
@@ -56 +56 @@
 
 InsertSnippet.prototype._lc = function(string) {
-    return HTMLArea._lc(string, 'InsertSnippet');
+    return Xinha._lc(string, 'InsertSnippet');
 };
 
@@ -71 +71 @@
 };
 
-HTMLArea.Config.prototype.InsertSnippet =
+Xinha.Config.prototype.InsertSnippet =
 {
   'snippets' : _editor_url+"plugins/InsertSnippet/demosnippets.js", // purely demo purposes, you should change this

trunk/plugins/InsertSnippet/popups/insertsnippet.html

@@ -22 +22 @@
         var snippets = config.snippets;
         
-        if ( config.pageStyle && !HTMLArea.is_ie)
+        if ( config.pageStyle && !Xinha.is_ie)
     {
                 var style = document.createElement("style");
@@ -55 +55 @@
                 if (config.InsertSnippet.showInsertVariable)
                 {
-                        insertAsVariable = ' | <a href="javascript:onOK('+i+','+'\'variable\''+')">'+HTMLArea._lc("Variable","InsertSnippet")+'</a>';
+                        insertAsVariable = ' | <a href="javascript:onOK('+i+','+'\'variable\''+')">'+Xinha._lc("Variable","InsertSnippet")+'</a>';
                 }
                 var new_cell = trow.insertCell(0);
-                new_cell.innerHTML = snippet_name +': '+HTMLArea._lc("Insert as","InsertSnippet")+' <a href="javascript:onOK('+i+','+'\'html\''+')">HTML</a>'+insertAsVariable + ' (<a id="show_preview'+i+'" href="javascript:preview(\'show\','+i+')">'+HTMLArea._lc("Show preview","InsertSnippet")+'</a>)<div id="preview'+i+'" style="display:none">'+snippets[i]['HTML']+'</div>'; 
+                new_cell.innerHTML = snippet_name +': '+Xinha._lc("Insert as","InsertSnippet")+' <a href="javascript:onOK('+i+','+'\'html\''+')">HTML</a>'+insertAsVariable + ' (<a id="show_preview'+i+'" href="javascript:preview(\'show\','+i+')">'+Xinha._lc("Show preview","InsertSnippet")+'</a>)<div id="preview'+i+'" style="display:none">'+snippets[i]['HTML']+'</div>'; 
                 new_cell.id = 'cell' + i;
                         
@@ -72 +72 @@
                 case 'show':
                         document.getElementById('preview'+i).style.display = 'block';
-                        show_preview_link.innerHTML = HTMLArea._lc("Hide preview","InsertSnippet");
+                        show_preview_link.innerHTML = Xinha._lc("Hide preview","InsertSnippet");
                         show_preview_link.href = "javascript:preview('hide','"+i+"');";
                         
@@ -78 +78 @@
                 case 'hide':
                         document.getElementById('preview'+i).style.display = 'none';
-                        show_preview_link.innerHTML = HTMLArea._lc("Show preview","InsertSnippet");
+                        show_preview_link.innerHTML = Xinha._lc("Show preview","InsertSnippet");
                         show_preview_link.href = "javascript:preview('show','"+i+"');";
                 break;

trunk/plugins/Linker/linker.js

@@ -52 +52 @@
 Linker.prototype._createLink = function(a)
 {
-  if(!a && this.editor._selectionEmpty(this.editor.getSelection()))
+  if(!a && this.editor.selectionEmpty(this.editor.getSelection()))
   {       
     alert(this._lc("You must select some text before making a new link."));

trunk/plugins/SaveSubmit/save-submit.js

@@ -30 +30 @@
 
 SaveSubmit.prototype._lc = function(string) {
-    return HTMLArea._lc(string, 'SaveSubmit');
+    return Xinha._lc(string, 'SaveSubmit');
 }
 
@@ -47 +47 @@
         var self = this;
         var doc = this.editordoc = this.editor._iframe.contentWindow.document;
-        HTMLArea._addEvents(doc, ["mouseup","keyup","keypress","keydown"],
+        Xinha._addEvents(doc, ["mouseup","keyup","keypress","keydown"],
                             function (event) {
-                            return self.onEvent(HTMLArea.is_ie ? self.editor._iframe.contentWindow.event : event);
+                            return self.onEvent(Xinha.is_ie ? self.editor._iframe.contentWindow.event : event);
                             });
 }
@@ -55 +55 @@
 SaveSubmit.prototype.onEvent = function(ev) {
 
-        var keyEvent = (HTMLArea.is_ie && ev.type == "keydown") || (!HTMLArea.is_ie && ev.type == "keypress");
+        var keyEvent = (Xinha.is_ie && ev.type == "keydown") || (!Xinha.is_ie && ev.type == "keypress");
 
-        if (keyEvent && ev.ctrlKey && String.fromCharCode(HTMLArea.is_ie ? ev.keyCode : ev.charCode).toLowerCase() == 's') {
+        if (keyEvent && ev.ctrlKey && String.fromCharCode(Xinha.is_ie ? ev.keyCode : ev.charCode).toLowerCase() == 's') {
                         this.save(this.editor);
         }
@@ -111 +111 @@
         }
 
-        HTMLArea._postback(editor._textArea.form.action, content, function(getback) {
+        Xinha._postback(editor._textArea.form.action, content, function(getback) {
 
                 if (getback) {
@@ -128 +128 @@
   if ( !document.getElementById("message_sub_" + textarea.name)) { return ; }
   var elt = document.getElementById("message_sub_" + textarea.name);
-  elt.innerHTML = HTMLArea._lc(string, 'SaveSubmit');
+  elt.innerHTML = Xinha._lc(string, 'SaveSubmit');
 }
 
@@ -147 +147 @@
         loading_message.style.width    = htmlarea.offsetWidth +'px' ;//(this.editor._iframe.offsetWidth != 0) ? this.editor._iframe.offsetWidth +'px' : this.editor._initial_ta_size.w;
 
-        loading_message.style.left     = HTMLArea.findPosX(htmlarea) +  'px';
-        loading_message.style.top      = (HTMLArea.findPosY(htmlarea) + parseInt(htmlarea.offsetHeight) / 2) - 50 +  'px';
+        loading_message.style.left     = Xinha.findPosX(htmlarea) +  'px';
+        loading_message.style.top      = (Xinha.findPosY(htmlarea) + parseInt(htmlarea.offsetHeight) / 2) - 50 +  'px';
 
         var loading_main = document.createElement("div");

trunk/plugins/SmartReplace/popups/dialog.html

@@ -12 +12 @@
    window.resizeTo(350, 200);
 
-HTMLArea = window.opener.HTMLArea;
+Xinha = window.opener.Xinha;
 
 function i18n(str) {
-  return (HTMLArea._lc(str, 'SmartReplace'));
+  return (Xinha._lc(str, 'SmartReplace'));
 }
 

trunk/plugins/SmartReplace/smart-replace.js

@@ -35 +35 @@
 
 SmartReplace.prototype._lc = function(string) {
-    return HTMLArea._lc(string, 'SmartReplace');
+    return Xinha._lc(string, 'SmartReplace');
 };
 
-HTMLArea.Config.prototype.SmartReplace =
+Xinha.Config.prototype.SmartReplace =
 {
         'defaultActive' : true,
@@ -65 +65 @@
         
         var self = this;
-        HTMLArea._addEvents(
+        Xinha._addEvents(
         self.editor._doc,
         [ "keypress"],
         function (event)
         {
-          return self.keyEvent(HTMLArea.is_ie ? self.editor._iframe.contentWindow.event : event);
+          return self.keyEvent(Xinha.is_ie ? self.editor._iframe.contentWindow.event : event);
         });
     
@@ -103 +103 @@
         if ( !this.active) return true;
         var editor = this.editor;
-        var charCode =  HTMLArea.is_ie ? ev.keyCode : ev.charCode;
+        var charCode =  Xinha.is_ie ? ev.keyCode : ev.charCode;
         
         var key = String.fromCharCode(charCode);
@@ -113 +113 @@
         if ( key == '"' || key == "'")
         {
-                HTMLArea._stopEvent(ev);
+                Xinha._stopEvent(ev);
                 return this.smartQuotes(key);
         }
@@ -134 +134 @@
         var editor = this.editor;
                 
-        var sel = editor._getSelection();
-        
-        if (HTMLArea.is_ie)
-        {
-                var r = editor._createRange(sel);
+        var sel = editor.getSelection();
+        
+        if (Xinha.is_ie)
+        {
+                var r = editor.createRange(sel);
                 if (r.text !== '')
                 {
@@ -180 +180 @@
 {
         var editor = this.editor;
-        var sel = this.editor._getSelection();
-        if (HTMLArea.is_ie)
-        {
-                var r = this.editor._createRange(sel);
+        var sel = this.editor.getSelection();
+        if (Xinha.is_ie)
+        {
+                var r = this.editor.createRange(sel);
                 r.moveStart('character', -2);
                 

trunk/plugins/SuperClean/super-clean.js

@@ -24 +24 @@
 
 SuperClean.prototype._lc = function(string) {
-    return HTMLArea._lc(string, 'SuperClean');
+    return Xinha._lc(string, 'SuperClean');
 };
 
@@ -59 +59 @@
     if(opts.tidy)
     {
-      HTMLArea._postback(editor.config.SuperClean.tidy_handler, {'content' : editor.getInnerHTML()},
+      Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : editor.getInnerHTML()},
                          function(javascriptResponse) { eval(javascriptResponse) });
     }
@@ -92 +92 @@
 };
 
-HTMLArea.Config.prototype.SuperClean =
+Xinha.Config.prototype.SuperClean =
 {
   // set to the URL of a handler for html tidy, this handler
@@ -107 +107 @@
   // filterFunction in the second format above is optional.
 
-  'filters': { 'tidy': HTMLArea._lc('General tidy up and correction of some problems.', 'SuperClean'),
-               'word_clean': HTMLArea._lc('Clean bad HTML from Microsoft Word', 'SuperClean'),
-               'remove_faces': HTMLArea._lc('Remove custom typefaces (font "styles").', 'SuperClean'),
-               'remove_sizes': HTMLArea._lc('Remove custom font sizes.', 'SuperClean'),
-               'remove_colors': HTMLArea._lc('Remove custom text colors.', 'SuperClean'),
-               'remove_lang': HTMLArea._lc('Remove lang attributes.', 'SuperClean'),
-               'remove_fancy_quotes': {label:HTMLArea._lc('Replace directional quote marks with non-directional quote marks.', 'SuperClean'), checked:false}
+  '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'},
@@ -171 +171 @@
 SuperClean.filterFunctions.tidy = function(html, editor)
 {
-  HTMLArea._postback(editor.config.SuperClean.tidy_handler, {'content' : html},
+  Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : html},
                       function(javascriptResponse) { eval(javascriptResponse) });
 };
@@ -207 +207 @@
       else
       {
-        HTMLArea._getback(_editor_url + 'plugins/SuperClean/filters/'+filter+'.js',
+        Xinha._getback(_editor_url + 'plugins/SuperClean/filters/'+filter+'.js',
                       function(func) {
                         eval('SuperClean.filterFunctions.'+filter+'='+func+';');
@@ -244 +244 @@
   if(this.html == false)
   {
-    HTMLArea._getback(_editor_url + 'plugins/SuperClean/dialog.html', function(txt) { lDialog.html = txt; lDialog._prepareDialog(); });
+    Xinha._getback(_editor_url + 'plugins/SuperClean/dialog.html', function(txt) { lDialog.html = txt; lDialog._prepareDialog(); });
     return;
   }
@@ -270 +270 @@
 
   // Now we have everything we need, so we can build the dialog.
-  var dialog = this.dialog = new HTMLArea.Dialog(SuperClean.editor, this.html, 'SuperClean');
+  var dialog = this.dialog = new Xinha.Dialog(SuperClean.editor, this.html, 'SuperClean');
 
   this.ready = true;

trunk/plugins/SuperClean/tidy.php

@@ -1 +1 @@
 <?php
-  /** This PHP file is intended for use with XMLHTTPRequest from an HTMLArea
-   * it requrns javascript to set the htmlarea html with tidied html that is
+  /** This PHP file is intended for use with XMLHTTPRequest from Xinha
+   * it requrns javascript to set the Xinha html with tidied html that is
    * submitted in a $_POST parameter called 'content'
    */