Changeset 1044

Timestamp:

10/02/08 17:07:26 (5 years ago)

Author:

douglas

Message:

FIXED Ticket #1176 Merging new dialogs branch back to trunk.

Location:

trunk

Files:

• Xinha.css (modified) (6 diffs)
• XinhaCore.js (modified) (18 diffs)
• modules/ColorPicker/ColorPicker.js (modified) (1 diff)
• modules/CreateLink/dialog.html (added)
• modules/CreateLink/link.js (modified) (4 diffs)
• modules/CreateLink/pluginMethods.js (added)
• modules/Dialogs/XinhaDialog.js (added)
• modules/Dialogs/inline-dialog.js (deleted)
• modules/Gecko/Gecko.js (modified) (3 diffs)
• modules/InlineStyler (added)
• modules/InlineStyler/InlineStyler.js (added)
• modules/InsertImage/dialog.html (added)
• modules/InsertImage/insert_image.js (modified) (3 diffs)
• modules/InsertImage/pluginMethods.js (added)
• modules/InsertTable/dialog.html (added)
• modules/InsertTable/insert_table.js (modified) (2 diffs)
• modules/InsertTable/pluginMethods.js (added)
• modules/InternetExplorer/InternetExplorer.js (modified) (5 diffs)
• modules/Opera/Opera.js (modified) (2 diffs)
• modules/WebKit/WebKit.js (modified) (3 diffs)
• plugins/Abbreviation/abbreviation.js (modified) (2 diffs)
• plugins/Abbreviation/dialog.html (added)
• plugins/Abbreviation/popups (deleted)
• plugins/BackgroundImage/background-image.js (modified) (1 diff)
• plugins/BackgroundImage/dialog.html (added)
• plugins/BackgroundImage/popups (deleted)
• plugins/CharacterMap/CharacterMap.css (modified) (1 diff)
• plugins/CharacterMap/character-map.js (modified) (3 diffs)
• plugins/InsertAnchor/dialog.html (added)
• plugins/InsertAnchor/insert-anchor.js (modified) (5 diffs)
• plugins/Linker/linker.js (modified) (1 diff)
• plugins/Linker/pluginMethods.js (added)
• plugins/PasteText/lang/de.js (modified) (1 diff)
• plugins/PasteText/paste-text.js (modified) (3 diffs)
• plugins/PasteText/popups/paste_text.html (modified) (1 diff)
• plugins/SmartReplace/dialog.html (modified) (1 diff)
• plugins/SmartReplace/smart-replace.js (modified) (7 diffs)
• plugins/Stylist/stylist.js (modified) (6 diffs)
• plugins/SuperClean/dialog.html (modified) (1 diff)
• plugins/SuperClean/lang/de.js (modified) (1 diff)
• plugins/SuperClean/pluginMethods.js (added)
• plugins/SuperClean/super-clean.js (modified) (6 diffs)
• plugins/TableOperations/popups/dialogMergeCells.html (added)
• plugins/TableOperations/popups/dialogRowCell.html (added)
• plugins/TableOperations/popups/dialogTable.html (added)
• plugins/TableOperations/table-operations.js (modified) (20 diffs)
• plugins/UnFormat/dialog.html (added)
• plugins/UnFormat/popups (deleted)
• plugins/UnFormat/un-format.js (modified) (3 diffs)

trunk/Xinha.css

@@ -114 +114 @@
 .dialog {
   color: ButtonText;
-  background: ButtonFace;
-}
-
+  background: ButtonFace; 
+  border: 1px outset; 
+  border-color: WindowFrame;
+}
+div.dialog {
+  padding-bottom:10px;
+}
+.xinha_dialog_background {
+  filter: alpha(opacity=0);
+  -moz-opacity: 0;
+  opacity: 0;
+  border:none;
+}
+.xinha_dialog_background.modal.greyout {
+  background-color:#666;
+  filter: alpha(opacity=70) !IMPORTANT;
+  -moz-opacity: 0.7;
+  opacity: 0.7;
+}
+.xinha_dialog_background.modal {
+  filter: alpha(opacity=0) !IMPORTANT;
+  -moz-opacity: 0;
+  opacity: 0;
+  border:none;
+}
+body.xinha_dialog_background.modal.greyout {
+  filter: alpha(opacity=100) !IMPORTANT;
+}
+body.xinha_dialog_background.modal {
+  filter: alpha(opacity=0);
+}
 .dialog .content { padding: 2px; }
 
@@ -127 +155 @@
 .dialog .title, .dialog h1
 {
-  background: #008;
-  color: #ff8;
+  background: ActiveCaption;
+  color: CaptionText;
   border-bottom: 1px solid #000;
   padding: 1px 0px 2px 5px;
@@ -134 +162 @@
   font-weight: bold;
   cursor: default;
-}
-.dialog h1 { margin:0px;}
+  letter-spacing: 0.01em;
+}
+.dialog h1 { margin:0;}
 .dialog .title .button {
   float: right;
@@ -148 +177 @@
 
 .dialog button {
-  width: 5em;
+  width: 5.5em;
   padding: 0px;
 }
-
+.dialog .closeButton {
+  padding: 0px;
+  cursor: default;
+  border: 1px solid;
+  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
+  height : 11px;
+  width : 11px;
+  vertical-align : top;
+  position : absolute;
+  top : 3px;
+  right : 2px;
+  background-color: ButtonFace;
+  color: ButtonText;
+  font-size: 13px;
+  font-family: Tahoma,Verdana,sans-serif;
+  text-align:center;
+  letter-spacing:0;
+  overflow:hidden;
+}
 .dialog .buttonColor {
   width :1em;
@@ -179 +226 @@
 .dialog .label { text-align: right; width: 6em; }
 .dialog .value input { width: 100%; }
-.dialog .buttons { text-align: right; padding: 2px 4px 0px 4px; }
 
 .dialog legend { font-weight: bold; }
 .dialog fieldset table { margin: 2px 0px; }
-
+ 
+.dialog  .buttons {
+
+      padding: 1em; 
+      text-align: center;
+}
+.dialog .resizeHandle {
+    -moz-appearance : resizer;
+    width: 12px;
+    height: 12px;
+    border-bottom: 2px solid #000;
+    border-right: 2px solid #000;
+    cursor : nw-resize;
+}
 .popupwin {
   padding: 0px;
@@ -229 +288 @@
 
 .htmlarea .panel h1 {
-  background: ButtonFace;
-  border: 1px solid;
-  border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight;
-  margin:   0px;
-  padding:  0px;
-  font-size:100%;
-  font-weight:bold;
-  padding: 2px;
   clear:left;
-  
-}
-
-.htmlarea .panel { overflow:hidden; }
+  font-size:0.9em;
+}
+
+.htmlarea .panel { 
+  overflow:hidden; 
+  background-color:white;
+  padding-bottom:0 !IMPORTANT;
+  border: none !IMPORTANT;
+}
 .htmlarea .panels.left  .panel { border-right:none; border-left:none; }
 .htmlarea .panels.left  h1     { border-right:none;  }

trunk/XinhaCore.js

@@ -977 +977 @@
     "Formatted": "pre"
   };
+  
+  this.dialogOptions =
+  { 
+    'centered' : true, //true: dialog is shown in the center the screen, false dialog is shown near the clicked toolbar button
+    'greyout':true, //true: when showing modal dialogs, the page behind the dialoge is greyed-out
+    'closeOnEscape':true
+  };
+
   /** ??
    * Default: <code>{}</code>
@@ -1782 +1790 @@
         function(ev)
         {
-          ev = Xinha.is_ie ? window.event : ev;
-          editor.btnClickEvent = ev;
+          ev = ev || window.event;
+          editor.btnClickEvent = {clientX : ev.clientX, clientY : ev.clientY};
           if ( obj.enabled )
           {
@@ -2100 +2108 @@
   }
 
-  if ( typeof Xinha.Dialog == 'undefined' &&  !Xinha._loadback( _editor_url + 'modules/Dialogs/inline-dialog.js' , this.generate, this ) )
+  if ( typeof Xinha.Dialog == 'undefined' &&  !Xinha._loadback( _editor_url + 'modules/Dialogs/XinhaDialog.js' , this.generate, this ) )
   {    
     return false;
@@ -2259 +2267 @@
   fw.table.appendChild(fw.tbody);
 
-  var xinha = this._framework.table;
+  var xinha = fw.table;
   this._htmlArea = xinha;
   Xinha.freeLater(this, '_htmlArea');
@@ -2265 +2273 @@
 
     // create the toolbar and put in the area
-  this._framework.tb_cell.appendChild( this._createToolbar() );
+  fw.tb_cell.appendChild( this._createToolbar() );
 
     // create the IFRAME & add to container
@@ -2271 +2279 @@
   iframe.src = this.popupURL(editor.config.URIs.blank);
   iframe.id = "XinhaIFrame_" + this._textArea.id;
-  this._framework.ed_cell.appendChild(iframe);
+  fw.ed_cell.appendChild(iframe);
   this._iframe = iframe;
   this._iframe.className = 'xinha_iframe';
@@ -2278 +2286 @@
     // creates & appends the status bar
   var statusbar = this._createStatusBar();
-  this._framework.sb_cell.appendChild(statusbar);
+  fw.sb_cell.appendChild(statusbar);
 
   // insert Xinha before the textarea.
@@ -2287 +2295 @@
   // extract the textarea and insert it into the xinha framework
   Xinha.removeFromParent(textarea);
-  this._framework.ed_cell.appendChild(textarea);
+  fw.ed_cell.appendChild(textarea);
 
   // if another editor is activated while this one is in text mode, toolbar is disabled   
@@ -2469 +2477 @@
   this._risizing = true;
   
+  var framework = this._framework;
+  
   this.notifyOf('before_resize', {width:width, height:height});
   this.firePluginEvent('onBeforeResize', width, height);
@@ -2580 +2590 @@
 //  }
 
-  this._framework.tb_cell.colSpan = col_span;
-  this._framework.tp_cell.colSpan = col_span;
-  this._framework.bp_cell.colSpan = col_span;
-  this._framework.sb_cell.colSpan = col_span;
+  framework.tb_cell.colSpan = col_span;
+  framework.tp_cell.colSpan = col_span;
+  framework.bp_cell.colSpan = col_span;
+  framework.sb_cell.colSpan = col_span;
 
   // Put in the panel rows, top panel goes above editor row
-  if ( !this._framework.tp_row.childNodes.length )
-  {
-    Xinha.removeFromParent(this._framework.tp_row);
+  if ( !framework.tp_row.childNodes.length )
+  {
+    Xinha.removeFromParent(framework.tp_row);
   }
   else
   {
-    if ( !Xinha.hasParentNode(this._framework.tp_row) )
-    {
-      this._framework.tbody.insertBefore(this._framework.tp_row, this._framework.ler_row);
+    if ( !Xinha.hasParentNode(framework.tp_row) )
+    {
+      framework.tbody.insertBefore(framework.tp_row, framework.ler_row);
     }
   }
 
   // bp goes after the editor
-  if ( !this._framework.bp_row.childNodes.length )
-  {
-    Xinha.removeFromParent(this._framework.bp_row);
+  if ( !framework.bp_row.childNodes.length )
+  {
+    Xinha.removeFromParent(framework.bp_row);
   }
   else
   {
-    if ( !Xinha.hasParentNode(this._framework.bp_row) )
-    {
-      this._framework.tbody.insertBefore(this._framework.bp_row, this._framework.ler_row.nextSibling);
+    if ( !Xinha.hasParentNode(framework.bp_row) )
+    {
+      framework.tbody.insertBefore(framework.bp_row, framework.ler_row.nextSibling);
     }
   }
@@ -2614 +2624 @@
   if ( !this.config.statusBar )
   {
-    Xinha.removeFromParent(this._framework.sb_row);
+    Xinha.removeFromParent(framework.sb_row);
   }
   else
   {
-    if ( !Xinha.hasParentNode(this._framework.sb_row) )
-    {
-      this._framework.table.appendChild(this._framework.sb_row);
+    if ( !Xinha.hasParentNode(framework.sb_row) )
+    {
+      framework.table.appendChild(framework.sb_row);
     }
   }
 
   // Size and set colspans, link up the framework
-  this._framework.lp_cell.style.width  = this.config.panel_dimensions.left;
-  this._framework.rp_cell.style.width  = this.config.panel_dimensions.right;
-  this._framework.tp_cell.style.height = this.config.panel_dimensions.top;
-  this._framework.bp_cell.style.height = this.config.panel_dimensions.bottom;
-  this._framework.tb_cell.style.height = this._toolBar.offsetHeight + 'px';
-  this._framework.sb_cell.style.height = this._statusBar.offsetHeight + 'px';
+  framework.lp_cell.style.width  = this.config.panel_dimensions.left;
+  framework.rp_cell.style.width  = this.config.panel_dimensions.right;
+  framework.tp_cell.style.height = this.config.panel_dimensions.top;
+  framework.bp_cell.style.height = this.config.panel_dimensions.bottom;
+  framework.tb_cell.style.height = this._toolBar.offsetHeight + 'px';
+  framework.sb_cell.style.height = this._statusBar.offsetHeight + 'px';
 
   var edcellheight = height - this._toolBar.offsetHeight - this._statusBar.offsetHeight;
@@ -3944 +3954 @@
 Xinha.prototype.updateToolbar = function(noStatus)
 {
+  if (this.suspendUpdateToolbar) return;
+  
   var doc = this._doc;
   var text = (this._editMode == "textmode");
@@ -4714 +4726 @@
     }
   }
+
+  /* If this.currentModal is not null, then there's a modal dialog 
+  /* on screen, and we kill the event. This eliminates the possibility
+  /* of a user 'tabbing' out of a modal dialog and re-activating the editor.
+  /* This fixes the bug reported in ticket #1259
+  /* http://xinha.webfactional.com/ticket/1259 */
+  if (this.currentModal)
+  {
+    return false;
+  }
+
   // update the toolbar state after some time
   if ( editor._timerToolbar )
@@ -4719 +4742 @@
     clearTimeout(editor._timerToolbar);
   }
+  if (!this.suspendUpdateToolbar)
+  {
   editor._timerToolbar = setTimeout(
     function()
@@ -4726 +4751 @@
     },
     250);
+  }
 };
 
@@ -5485 +5511 @@
 };
 
+Xinha.getEvent = function(ev)
+{
+  return ev || window.event;
+}
 /**
  * Prepares an element to receive more than one DOM-0 event handler
@@ -6179 +6209 @@
         s += prop + ' = ' + o[prop] + '\n';
       }
-
     }
     if (s) 
@@ -6789 +6818 @@
   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
   {

trunk/modules/ColorPicker/ColorPicker.js

@@ -372 +372 @@
           this.table.style.position = 'fixed';
         }
-        top+=e.offsetTop - e.scrollTop;
-        left+=e.offsetLeft - e.scrollLeft;
+        top += e.offsetTop - e.scrollTop;
+        left += e.offsetLeft - e.scrollLeft;
 
         e = e.offsetParent;

trunk/modules/CreateLink/link.js

@@ -1 @@
-
   /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
     --  Xinha (is not htmlArea) - http://xinha.org
@@ -16 +15 @@
     --  which provides the functionality to insert a hyperlink in the editor.
     --
-    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
+    --  The file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
     --
     --
@@ -24 +23 @@
     --  $LastChangedBy:ray $
     --------------------------------------------------------------------------*/
+
+function CreateLink(editor) {
+        this.editor = editor;
+        var cfg = editor.config;
+        var self = this;
+
+   editor.config.btnList.createlink[3] = function() { self.show(self._getSelectedAnchor()); }
+}
+
 CreateLink._pluginInfo = {
   name          : "CreateLink",
   origin        : "Xinha Core",
-  version       : "$LastChangedRevision:990 $".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
+  version       : "$LastChangedRevision$".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
   developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL:http://svn.xinha.webfactional.com/trunk/modules/CreateLink/link.js $".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
+  developer_url : "$HeadURL$".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
   sponsor       : "",
   sponsor_url   : "",
@@ -35 +43 @@
 };
 
-function CreateLink(editor) {
-}                                                       
+CreateLink.prototype._lc = function(string) {
+        return Xinha._lc(string, 'Xinha');
+};
 
-Xinha.prototype._createLink = function(link)
+
+CreateLink.prototype.onGenerateOnce = function()
 {
-  var editor = this;
-  var outparam = null;
-  if ( typeof link == "undefined" )
-  {
-    link = this.getParentElement();
-    if ( link )
-    {
-      while (link && !/^a$/i.test(link.tagName))
-      {
-        link = link.parentNode;
-      }
-    }
-  }
-  if ( !link )
-  {
-    var sel = editor.getSelection();
-    var range = editor.createRange(sel);
-    var compare = 0;
-    if ( Xinha.is_ie )
-    {
-      if ( sel.type == "Control" )
-      {
-        compare = range.length;
-      }
-      else
-      {
-        compare = range.compareEndPoints("StartToEnd", range);
-      }
-    }
-    else
-    {
-      compare = range.compareBoundaryPoints(range.START_TO_END, range);
-    }
-    if ( compare === 0 )
-    {
-      alert(Xinha._lc("You need to select some text before creating a link"));
-      return;
-    }
-    outparam =
-    {
-      f_href : '',
-      f_title : '',
-      f_target : '',
-      f_usetarget : editor.config.makeLinkShowsTarget
-    };
-  }
-  else
-  {
-    outparam =
-    {
-      f_href   : Xinha.is_ie ? editor.stripBaseURL(link.href) : link.getAttribute("href"),
-      f_title  : link.title,
-      f_target : link.target,
-      f_usetarget : editor.config.makeLinkShowsTarget
-    };
-  }
-  Dialog(
-    editor.config.URIs.link,
-    function(param)
-    {
-      if ( !param )
-      {
-        return false;
-      }
-      var a = link;
-      if ( !a )
-      {
-        try
-        {
-          var tmp = Xinha.uniq('http://www.example.com/Link');
-          editor._doc.execCommand('createlink', false, tmp);
+  CreateLink.loadAssets();
+};
 
-          // Fix them up
-          var anchors = 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;
-              anchor.href =  param.f_href;
-              if (param.f_target) anchor.target =  param.f_target;
-              if (param.f_title)  anchor.title =  param.f_title;
-            }
-          }
-        } catch(ex) {}
-      }
-      else
-      {
-        var href = param.f_href.trim();
-        editor.selectNodeContents(a);
-        if ( href === '' )
-        {
-          editor._doc.execCommand("unlink", false, null);
-          editor.updateToolbar();
-          return false;
-        }
-        else
-        {
-          a.href = href;
-        }
-      }
-      if ( ! ( a && a.tagName.toLowerCase() == 'a' ) )
-      {
-        return false;
-      }
-      a.target = param.f_target.trim();
-      a.title = param.f_title.trim();
-      editor.selectNodeContents(a);
-      editor.updateToolbar();
-    },
-    outparam);
+CreateLink.loadAssets = function()
+{
+        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 (!(CreateLink.dialogReady && CreateLink.methodsReady))
+        {
+                this.editor._toolbarObjects.createlink.state("enabled", false);
+        }
+        else this.onUpdateToolbar = null;
 };
+
+CreateLink.prototype.prepareDialog = function()
+{
+        var self = this;
+        var editor = this.editor;
+
+        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();}
+
+        dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+
+        if (!editor.config.makeLinkShowsTarget)
+        {
+                dialog.getElementById("f_target_label").style.visibility = "hidden";
+                dialog.getElementById("f_target").style.visibility = "hidden";
+                dialog.getElementById("f_other_target").style.visibility = "hidden";
+        }
+
+        dialog.getElementById('f_target').onchange= function() 
+        {
+                var f = dialog.getElementById("f_other_target");
+                if (this.value == "_other") {
+                        f.style.visibility = "visible";
+                        f.select();
+                        f.focus();
+                } else f.style.visibility = "hidden";
+        };
+
+        
+        this.dialogReady = true;
+};

trunk/modules/Gecko/Gecko.js

@@ -576 +576 @@
 Xinha.prototype.restoreSelection = function(savedSelection)
 {
+  try 
+  {
   var sel = this.getSelection();
   sel.removeAllRanges();
   sel.addRange(savedSelection);
+  }
+  catch (e) {}
 }
 /**
@@ -585 +589 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   var sel = this.getSelection();
   range = this._doc.createRange();
@@ -609 +613 @@
   {
     range.selectNodeContents(node);
-    //(collapsed) && range.collapse(pos);
   }
   sel.removeAllRanges();
   sel.addRange(range);
+  if (typeof collapseToStart != "undefined")
+  {
+    if (collapseToStart)
+    {
+      sel.collapse(range.startContainer, range.startOffset);
+    } else
+    {
+      sel.collapse(range.endContainer, range.endOffset);
+    }
+  }
 };
   

trunk/modules/InsertImage/insert_image.js

@@ -1 @@
-
   /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
     --  Xinha (is not htmlArea) - http://xinha.org
@@ -8 +7 @@
     --  Copyright (c) 2005-2008 Xinha Developer Team and contributors
     --
-    --  This is the standard implementation of the Xinha.prototype._insertImage method,
-    --  which provides the functionality to insert an image in the editor.
+    --  This is the Xinha standard implementation of an image insertion plugin
     --
-    --  The file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
+    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
     --
     --
-    --  $HeadURL:http://svn.xinha.webfactional.com/trunk/modules/InsertImage/insert_image.js $
-    --  $LastChangedDate:2008-04-12 23:02:13 +0200 (Sa, 12 Apr 2008) $
-    --  $LastChangedRevision:992 $
-    --  $LastChangedBy:ray $
+    --  $HeadURL$
+    --  $LastChangedDate$
+    --  $LastChangedRevision$
+    --  $LastChangedBy$
     --------------------------------------------------------------------------*/
+  
 InsertImage._pluginInfo = {
   name          : "InsertImage",
   origin        : "Xinha Core",
-  version       : "$LastChangedRevision:992 $".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
+  version       : "$LastChangedRevision$".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
   developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL:http://svn.xinha.webfactional.com/trunk/modules/InsertImage/insert_image.js $".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
+  developer_url : "$HeadURL$".replace(/^[^:]*:\s*(.*)\s*\$$/, '$1'),
   sponsor       : "",
   sponsor_url   : "",
@@ -31 +30 @@
 
 function InsertImage(editor) {
-}                                      
+        this.editor = editor;
+        var cfg = editor.config;
+        var self = this;
 
-// Called when the user clicks on "InsertImage" button.  If an image is already
-// there, it will just modify it's properties.
-Xinha.prototype._insertImage = function(image)
-{
-  var editor = this;  // for nested functions
-  var outparam;
-  if ( typeof image == "undefined" )
-  {
-    image = this.getParentElement();
-    if ( image && image.tagName.toLowerCase() != 'img' )
-    {
-      image = null;
-    }
+   editor.config.btnList.insertimage[3] = function() { self.show(); }
   }
   
-  var base;
-  if ( typeof editor.config.baseHref != 'undefined' && editor.config.baseHref !== null ) {
-    base = editor.config.baseHref;
+InsertImage.prototype._lc = function(string) {
+        return Xinha._lc(string, 'Xinha');
+};
+
+InsertImage.prototype.onGenerateOnce = function()
+{
+        InsertImage.loadAssets();
+};
+
+InsertImage.loadAssets = function()
+{
+        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 (!(InsertImage.dialogReady && InsertImage.methodsReady))
+        {
+          this.editor._toolbarObjects.insertimage.state("enabled", false);
   }
-  else {
-    var bdir = window.location.toString().split("/");
-    bdir.pop();
-    base = bdir.join("/");
-  }
+  else this.onUpdateToolbar = null;
+};
   
-  if ( image )
+InsertImage.prototype.prepareDialog = function()
   {
-    function getSpecifiedAttribute(element,attribute)
-    {
-      var a = element.attributes;
-      for (var i=0;i<a.length;i++)
-      {
-        if (a[i].nodeName == attribute && a[i].specified)
-        {
-          return a[i].value;
-        }
-      }
-      return '';
-  }
-  /* if you want to understand why the above function is required, uncomment the two lines below and launch InsertImage in both Mozilla & IE with an image selected that hath neither value set and compare the results
-  alert(image.vspace +' '+ image.getAttribute('vspace') + ' ' + image.getAttribute('vspace',2) + ' ' + getSpecifiedAttribute(image,'vspace') );
-    alert(image.hspace +' '+ image.getAttribute('hspace') + ' ' + image.getAttribute('hspace',2) + ' ' + getSpecifiedAttribute(image,'hspace') );
-  */
-  outparam =
-    {
-      f_base   : base,
-      f_url    : this.stripBaseURL(image.getAttribute('src',2)), // the second parameter makes IE return the value as it is set, as opposed to an "interpolated" (as MSDN calls it) value
-      f_alt    : image.alt,
-      f_border : image.border,
-      f_align  : image.align,
-      f_vert   : getSpecifiedAttribute(image,'vspace'),
-      f_horiz  : getSpecifiedAttribute(image,'hspace'),
-      f_width  : image.width,
-      f_height : image.height
-    };
-  }
-  else{
-    outparam =
-    {
-      f_base   : base,
-      f_url    : ""      
-    };
-  }
+        var self = this;
+        var editor = this.editor;
   
-  Dialog(
-    editor.config.URIs.insert_image,
-    function(param)
-    {
-      // user must have pressed Cancel
-      if ( !param )
-      {
+        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();}
+
+        dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+
+        dialog.getElementById('preview').onclick = function() { 
+          var f_url = dialog.getElementById("f_url");
+          var url = f_url.value;
+          var base = dialog.getElementById("f_base").value;
+          if (!url) {
+            alert(dialog._lc("You must enter the URL"));
+            f_url.focus();
         return false;
       }
-      var img = image;
-      if ( !img )
+          dialog.getElementById('ipreview').src = Xinha._resolveRelativeUrl(base, url);
+          return false;
+        }
+        this.dialog.onresize = function ()
       {
-        if ( Xinha.is_ie )
-        {
-          var sel = editor.getSelection();
-          var range = editor.createRange(sel);
-          editor._doc.execCommand("insertimage", false, param.f_url);
-          img = range.parentElement();
-          // wonder if this works...
-          if ( img.tagName.toLowerCase() != "img" )
-          {
-            img = img.previousSibling;
+                
+                
+                var newHeightForPreview = 
+                parseInt(this.height,10) 
+                - this.getElementById('h1').offsetHeight 
+                - this.getElementById('buttons').offsetHeight
+                - this.getElementById('inputs').offsetHeight 
+                - parseInt(this.rootElem.style.paddingBottom,10); // we have a padding at the bottom, gotta take this into acount
+                
+                
+                this.getElementById("ipreview").style.height = ((newHeightForPreview > 0) ? newHeightForPreview : 0) + "px"; // no-go beyond 0
+                
+                this.getElementById("ipreview").style.width = this.width - 2   + 'px'; // and the width
+
           }
-        }
-        else
-        {
-          img = document.createElement('img');
-          img.src = param.f_url;
-          editor.insertNodeAtSelection(img);
-          if ( !img.tagName )
-          {
-            // if the cursor is at the beginning of the document
-            img = range.startContainer.firstChild;
-          }
-        }
-      }
-      else
-      {
-        img.src = param.f_url;
-      }
-
-      for ( var field in param )
-      {
-        var value = param[field];
-        switch (field)
-        {
-          case "f_alt":
-            if (value)
-              img.alt = value;
-            else
-              img.removeAttribute("alt");
-            break;
-          case "f_border":
-            if (value)
-              img.border = parseInt(value || "0");
-            else
-              img.removeAttribute("border");
-            break;
-          case "f_align":
-            if (value)
-              img.align = value;
-            else
-              img.removeAttribute("align");
-            break;
-          case "f_vert":
-            if (value != "")
-              img.vspace = parseInt(value || "0");
-            else
-              img.removeAttribute("vspace");
-            break;
-          case "f_horiz":
-            if (value != "")
-              img.hspace = parseInt(value || "0");
-            else
-              img.removeAttribute("hspace");
-            break;
-          case "f_width":
-            if (value)
-              img.width = parseInt(value || "0");
-            else
-              img.removeAttribute("width");
-            break;
-          case "f_height":
-            if (value)
-              img.height = parseInt(value || "0");
-            else
-              img.removeAttribute("height");
-            break;
-        }
-      }
-    },
-    outparam);
+        this.dialogReady = true;
 };

trunk/modules/InsertTable/insert_table.js

@@ -13 +13 @@
     --      This copyright notice MUST stay intact for use.
     --
-    --  This is the standard implementation of the Xinha.prototype._insertTable method,
-    --  which provides the functionality to insert an image in the editor.
+    --  This is the Xinha standard implementation of a table insertion plugin
     --
-    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
+    --  The file is loaded by the Xinha Core when no alternative method (plugin) is loaded.
     --
     --
@@ -36 +35 @@
 
 function InsertTable(editor) {
-}                                      
+        this.editor = editor;
+        var cfg = editor.config;
+        var self = this;
 
-Xinha.prototype._insertTable = function()
+        editor.config.btnList.inserttable[3] = function() { self.show(); }
+      }
+
+InsertTable.prototype._lc = function(string) {
+        return Xinha._lc(string, 'Xinha');
+};
+
+
+InsertTable.prototype.onGenerateOnce = function()
 {
-  var sel = this.getSelection();
-  var range = this.createRange(sel);
-  var editor = this;    // for nested functions
-  Dialog(
-    editor.config.URIs.insert_table,
-    function(param)
-    {
-      // user must have pressed Cancel
-      if ( !param )
-      {
-        return false;
-      }
-      var doc = editor._doc;
-      // create the table element
-      var table = doc.createElement("table");
-      // assign the given arguments
+        InsertTable.loadAssets();
+};
+InsertTable.loadAssets = function()
+{
+        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; });
+};
 
-      for ( var field in param )
-      {
-        var value = param[field];
-        if ( !value )
-        {
-          continue;
-        }
-        switch (field)
-        {
-          case "f_width":
-            table.style.width = value + param.f_unit;
-          break;
-          case "f_align":
-            table.align = value;
-          break;
-          case "f_border":
-            table.border = parseInt(value, 10);
-          break;
-          case "f_spacing":
-            table.cellSpacing = parseInt(value, 10);
-          break;
-          case "f_padding":
-            table.cellPadding = parseInt(value, 10);
-          break;
-        }
-      }
-      var cellwidth = 0;
-      if ( param.f_fixed )
-      {
-        cellwidth = Math.floor(100 / parseInt(param.f_cols, 10));
-      }
-      var tbody = doc.createElement("tbody");
-      table.appendChild(tbody);
-      for ( var i = 0; i < param.f_rows; ++i )
-      {
-        var tr = doc.createElement("tr");
-        tbody.appendChild(tr);
-        for ( var j = 0; j < param.f_cols; ++j )
-        {
-          var td = doc.createElement("td");
-          // @todo : check if this line doesnt stop us to use pixel width in cells
-          if (cellwidth)
-          {
-            td.style.width = cellwidth + "%";
-          }
-          tr.appendChild(td);
-          // Browsers like to see something inside the cell (&nbsp;).
-          td.appendChild(doc.createTextNode('\u00a0'));
-        }
-      }
-      if ( Xinha.is_ie )
-      {
-        range.pasteHTML(table.outerHTML);
-      }
-      else
-      {
-        // insert the table
-        editor.insertNodeAtSelection(table);
-      }
-      return true;
-    },
-    null
-  );
+InsertTable.prototype.onUpdateToolbar = function()
+{ 
+  if (!(InsertTable.dialogReady && InsertTable.methodsReady))
+        {
+          this.editor._toolbarObjects.inserttable.state("enabled", false);
+        }
+        else this.onUpdateToolbar = null;
 };
+
+InsertTable.prototype.prepareDialog = function()
+{
+        var self = this;
+        var editor = this.editor;
+
+        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();}
+        dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+  
+        this.borderColorPicker = new Xinha.colorPicker.InputBinding(dialog.getElementById('border_color'));
+
+        this.dialog.onresize = function ()
+        {
+                this.getElementById("layout_fieldset").style.width =(this.width / 2) + 50 + 'px';
+    this.getElementById("spacing_fieldset").style.width =(this.width / 2) - 120 + 'px'; 
+        }
+
+        this.dialogReady = true;
+};

trunk/modules/InternetExplorer/InternetExplorer.js

@@ -147 +147 @@
    html = html.replace(/(<script|<!--)/i,"&nbsp;$1");
    
+   // We've got a workaround for certain issues with saving and restoring
+   // selections that may cause us to fill in junk span tags.  We'll clean
+   // those here
+   html = html.replace(/<span[^>]+id="__InsertSpan_Workaround_[a-z]+".*?>([\s\S]*?)<\/span>/i,"$1");
+   
    return html;
 }
@@ -154 +159 @@
    // remove space added before first script on the page
    html = html.replace(/&nbsp;(\s*)(<script|<!--)/i,"$1$2");
+
+   // We've got a workaround for certain issues with saving and restoring
+   // selections that may cause us to fill in junk span tags.  We'll clean
+   // those here
+   html = html.replace(/<span[^>]+id="__InsertSpan_Workaround_[a-z]+".*?>([\s\S]*?)<\/span>/i,"$1");
    
    return html;
@@ -441 +451 @@
 Xinha.prototype.restoreSelection = function(savedSelection)
 {
+  // In order to prevent triggering the IE bug mentioned below, we will try to
+  // optimize by not restoring the selection if it happens to match the current
+  // selection.
+  var range = this.createRange(this.getSelection());
+
+  // We can't compare two selections that come from different documents, so we
+  // must make sure they're from the same document.
+  var findDoc = function(el)
+  {
+    for (var root=el; root; root=root.parentNode)
+    {
+      if (root.tagName.toLowerCase() == 'html')
+      {
+        return root.parentNode;
+      }
+    }
+    return null;
+  }
+
+  if (findDoc(savedSelection.parentElement()) == findDoc(range.parentElement()))
+  {
+    if ((0 == range.compareEndPoints('StartToStart',savedSelection)) &&
+        (0 == range.compareEndPoints('EndToEnd',savedSelection)))
+    {
+      // The selection hasn't moved, no need to restore.
+      return;
+    }
+  }
+
   try { savedSelection.select() } catch (e) {};
+  range = this.createRange(this.getSelection());
+  if (range.parentElement() != savedSelection.parentElement())
+  {
+    // IE has a problem with selections at the end of text nodes that
+    // immediately precede block nodes. Example markup:
+    // <div>Text Node<p>Text in Block</p></div>
+    //               ^
+    // The problem occurs when the cursor is after the 'e' in Node.
+
+    var solution = editor.config.selectWorkaround || 'InsertSpan';
+    switch (solution)
+    {
+      case 'SimulateClick':
+        // Try to get the bounding box of the selection and then simulate a
+        // mouse click in the upper right corner to return the cursor to the
+        // correct location.
+
+        // No code yet, fall through to InsertSpan
+      case 'InsertSpan':
+        // This workaround inserts an empty span element so that we are no
+        // longer trying to select a text node,
+        var parentDoc = findDoc(savedSelection.parentElement());
+
+        // A function used to generate a unique ID for our temporary span.
+        var randLetters = function(count)
+        {
+          // Build a list of 26 letters.
+          var Letters = '';
+          for (var index = 0; index<26; ++index)
+          {
+            Letters += String.fromCharCode('a'.charCodeAt(0) + index);
+          }
+
+          var result = '';
+          for (var index=0; index<count; ++index)
+          {
+            result += Letters.substr(Math.floor(Math.random()*Letters.length + 1), 1);
+          }
+          return result;
+        }
+
+        // We'll try to find a unique ID to use for finding our element.
+        var keyLength = 1;
+        var tempId = '__InsertSpan_Workaround_' + randLetters(keyLength);
+        while (parentDoc.getElementById(tempId))
+        {
+          // Each time there's a collision, we'll increase our key length by
+          // one, making the chances of a collision exponentially more rare.
+          keyLength += 1;
+          tempId = '__InsertSpan_Workaround_' + randLetters(keyLength);
+        }
+
+        // Now that we have a uniquely identifiable element, we'll stick it and
+        // and use it to orient our selection.
+        savedSelection.pasteHTML('<span id="' + tempId + '"></span>');
+        var tempSpan = parentDoc.getElementById(tempId);
+        savedSelection.moveToElementText(tempSpan);
+        savedSelection.select();
+        break;
+      case 'JustificationHack':
+        // Setting the justification on an element causes IE to alter the
+        // markup so that the selection we want to make is possible.
+        // Unfortunately, this can force block elements to be kicked out of
+        // their containing element, so it is not recommended.
+
+        // Set a non-valid character and use it to anchor our selection.
+        var magicString = String.fromCharCode(1);
+        savedSelection.pasteHTML(magicString);
+        savedSelection.findText(magicString,-1);
+        savedSelection.select();
+
+        // I don't know how to find out if there's an existing justification on
+        // this element.  Hopefully, you're doing all of your styling outside,
+        // so I'll just clear.  I already told you this was a hack.
+        savedSelection.execCommand('JustifyNone');
+        savedSelection.pasteHTML('');
+        break;
+      case 'VisiblePrompt':
+      default:
+        // This method will insert a little box character to hold our selection
+        // in the desired spot.  We're depending on the user to see this ugly
+        // box and delete it themselves.
+        var magicString = String.fromCharCode(1);
+        savedSelection.pasteHTML(magicString);
+        savedSelection.findText(magicString,-1);
+        savedSelection.select();
+    }
+  }
 }
 
@@ -449 +576 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   // Tables and Images get selected as "objects" rather than the text contents
   if ( collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img|input|select|textarea/) )
@@ -467 +594 @@
   {
     range = this._doc.body.createTextRange();
+    if (3 == node.nodeType)
+    {
+      // Special handling for text nodes, since moveToElementText fails when
+      // attempting to select a text node
+
+      // Since the TextRange has a quite limited API, our strategy here is to
+      // select (where possible) neighboring nodes, and then move our ranges
+      // endpoints to be just inside of neighboring selections.
+      if (node.parentNode)
+      {
+        range.moveToElementText(node.parentNode);
+      } else
+      {
+        range.moveToElementText(this._doc.body);
+      }
+      var trimmingRange = this._doc.body.createTextRange();
+
+      // In rare situations (mostly html that's been monkeyed about with by
+      // javascript, but that's what we're doing) there can be two adjacent
+      // text nodes.  Since we won't be able to handle these, we'll have to
+      // hack an offset by 'move'ing the number of characters they contain.
+      var texthackOffset = 0;
+      var borderElement=node.previousSibling;
+      for (; borderElement && (1 != borderElement.nodeType); borderElement = borderElement.previousSibling)
+      {
+        if (3 == borderElement.nodeType)
+        {
+          // IE doesn't count '\r' as a character, so we have to adjust the offset.
+          texthackOffset += borderElement.nodeValue.length-borderElement.nodeValue.split('\r').length-1;
+        }
+      }
+      if (borderElement && (1 == borderElement.nodeType))
+      {
+        trimmingRange.moveToElementText(borderElement);
+        range.setEndPoint('StartToEnd', trimmingRange);
+      }
+      if (texthackOffset)
+      {
+        // We now need to move the selection forward the number of characters
+        // in all text nodes in between our text node and our ranges starting
+        // border.
+        range.moveStart('character',texthackOffset);
+      }
+
+      // Youpi!  Now we get to repeat this trimming on the right side.
+      texthackOffset = 0;
+      borderElement=node.nextSibling;
+      for (; borderElement && (1 != borderElement.nodeType); borderElement = borderElement.nextSibling)
+      {
+        if (3 == borderElement.nodeType)
+        {
+          // IE doesn't count '\r' as a character, so we have to adjust the offset.
+          texthackOffset += borderElement.nodeValue.length-borderElement.nodeValue.split('\r').length-1;
+          if (!borderElement.nextSibling)
+          {
+            // When a text node is the last child, IE adds an extra selection
+            // "placeholder" for the newline character.  We need to adjust for
+            // this character as well.
+            texthackOffset += 1;
+          }
+        }
+      }
+      if (borderElement && (1 == borderElement.nodeType))
+      {
+        trimmingRange.moveToElementText(borderElement);
+        range.setEndPoint('EndToStart', trimmingRange);
+      }
+      if (texthackOffset)
+      {
+        // We now need to move the selection backward the number of characters
+        // in all text nodes in between our text node and our ranges ending
+        // border.
+        range.moveEnd('character',-texthackOffset);
+      }
+      if (!node.nextSibling)
+      {
+        // Above we performed a slight adjustment to the offset if the text
+        // node contains a selectable "newline".  We need to do the same if the
+        // node we are trying to select contains a newline.
+        range.moveEnd('character',-1);
+      }
+    }
+    else
+    {
     range.moveToElementText(node);
-    //(collapsed) && range.collapse(pos);
+    }
+  }
+  if (typeof collapseToStart != "undefined")
+  {
+    range.collapse(collapseToStart);
+    if (!collapseToStart)
+    {
+      range.moveStart('character',-1);
+      range.moveEnd('character',-1);
+    }
   }
   range.select();

trunk/modules/Opera/Opera.js

@@ -576 +576 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   var sel = this.getSelection();
   range = this._doc.createRange();
@@ -595 +595 @@
   {
     range.selectNodeContents(node);
-    //(collapsed) && range.collapse(pos);
   }
   sel.removeAllRanges();
   sel.addRange(range);
+  if (typeof collapseToStart != "undefined")
+  {
+    if (collapseToStart)
+    {
+      sel.collapse(range.startContainer, range.startOffset);
+    } else
+    {
+      sel.collapse(range.endContainer, range.endOffset);
+    }
+  }
 };
   

trunk/modules/WebKit/WebKit.js

@@ -574 +574 @@
  *
  * @param node DomNode 
- * @param pos  Set to a numeric position inside the node to collapse the cursor here if possible. 
- */
- 
-Xinha.prototype.selectNodeContents = function(node, pos)
+ * @param collapseToStart A boolean that, when supplied, says to collapse the selection. True collapses to the start, and false to the end.
+ */
+ 
+Xinha.prototype.selectNodeContents = function(node, collapseToStart)
 {
   this.focusEditor();
   this.forceRedraw();
   var range;
-  var collapsed = typeof pos == "undefined" ? true : false;
+  var collapsed = typeof collapseToStart == "undefined" ? true : false;
   var sel = this.getSelection();
   range = this._doc.createRange();
@@ -593 +593 @@
   {
     range.selectNodeContents(node);
-    //(collapsed) && range.collapse(pos);
   }
   sel.removeAllRanges();
   sel.addRange(range);
+  if (typeof collapseToStart != "undefined")
+  {
+    if (collapseToStart)
+    {
+      sel.collapse(range.startContainer, range.startOffset);
+    } else
+    {
+      sel.collapse(range.endContainer, range.endOffset);
+    }
+  }
 };
   
@@ -685 +694 @@
 Xinha.prototype.isKeyEvent = function(event)
 {
-  return event.type == "keypress";
+  return event.type == "keydown";
 }
 

trunk/plugins/Abbreviation/abbreviation.js

@@ -15 +15 @@
   cfg.registerButton({
     id       : "abbreviation",
-    tooltip  : this._lc("Abbreviation"),
+    tooltip  : Xinha._lc("Abbreviation", "Abbreviation"),
     image    : editor.imgURL("ed_abbreviation.gif", "Abbreviation"),
     textMode : false,
     action   : function(editor) {
-                 self.buttonPress(editor);
+                 self.show();
                }
-  })
+  });
   cfg.addToolbarElement("abbreviation", "inserthorizontalrule", 1);
 }
@@ -36 +36 @@
 };
 
-Abbreviation.prototype._lc = function(string) {
-    return Xinha._lc(string, 'Abbreviation');
+// Fills in the text field if the acronym is either known (i.e., in the [lang].js file)
+// or if we're editing an existing abbreviation.
+Abbreviation.prototype.fillText = function() {
+  var editor = this.editor;
+  var text = this.html.toUpperCase();
+  var abbr = Xinha.getPluginDir(this.constructor.name) + "/abbr/" + _editor_lang + ".js";
+  var abbrData = Xinha._geturlcontent(abbr);
+
+  if (abbrData) {
+    eval('abbrObj = ' + abbrData);
+    if (abbrObj != "") {
+      var dest = this.dialog.getElementById("title");
+      dest.value = this.title || "";
+      for (var i in abbrObj) {
+        same = (i.toUpperCase()==text);
+        if (same)
+          dest.value = abbrObj[i];
+      }
+    }
+  }
+}
+
+Abbreviation.prototype.onGenerateOnce = function(editor) {
+  this.editor.addEditorStylesheet(Xinha.getPluginDir('Abbreviation') + '/abbreviation.css');
+  this.methodsReady = true; //remove this?
+  var self = Abbreviation;
+  Xinha._getback(Xinha.getPluginDir('Abbreviation') + '/dialog.html', function(getback) { self.html = getback; self.dialogReady = true; });
 };
 
-Abbreviation.prototype.onGenerate = function() {
-  this.editor.addEditorStylesheet(Xinha.getPluginDir('Abbreviation') + '/abbreviation.css');
-};
+Abbreviation.prototype.OnUpdateToolbar = function(editor) {
+  if (!(Abbreviation.dialogReady && Abbreviation.methodsReady))
+  {
+    this.editor._toolbarObjects.Abbreviation.state("enabled", false);
+  }
+  else this.onUpdateToolbar = null;
+}
 
-Abbreviation.prototype.buttonPress = function(editor, context, updatecontextclass) {
-  var outparam = null;
-  var html = editor.getSelectedHTML();
+Abbreviation.prototype.prepareDialog = function(html) {
+  var self = this;
+  var editor = this.editor;
+  var dialog = this.dialog = new Xinha.Dialog(editor, Abbreviation.html, 'Xinha', {width: 260, height:140});
+
+  dialog.getElementById('ok').onclick = function() { self.apply(); };
+  dialog.getElementById('delete').onclick = function() { self.ondelete(); };
+  dialog.getElementById('cancel').onclick = function() { self.dialog.hide(); };
+  
+  this.dialogReady = true;
+}
+
+Abbreviation.prototype.show = function(editor) {
+  var editor = this.editor;
+  this.html = editor.getSelectedHTML();
+  if (!this.dialog) this.prepareDialog();
+  var self = this;
+  var doc = editor._doc;
   var sel  = editor._getSelection();
   var range  = editor._createRange(sel);
   var abbr = editor._activeElement(sel);
+  
   if(!(abbr != null && abbr.tagName.toLowerCase() == "abbr")) {
     abbr = editor._getFirstAncestor(sel, 'abbr');
   }
-  if (abbr != null && abbr.tagName.toLowerCase() == "abbr")
-    outparam = { title : abbr.title,
-                 text : abbr.innerHTML};
-  else
-    outparam = { title : '',
-                 text : html};
+  this.abbr = abbr;
+  
+  if (abbr) this.title = abbr.title;
+  this.fillText();
 
-  editor._popupDialog( "plugin://Abbreviation/abbreviation", function( param ) {
-    if ( param ) {
-      var title = param["title"];
-      if (title == "" || title == null) {
-        if (abbr) {
-          var child = abbr.innerHTML;
-          abbr.parentNode.removeChild(abbr);
-          editor.insertHTML(child);
+  this.dialog.getElementById("inputs").onsubmit = function() {
+    self.apply();
+    return false;
+  }
+
+  this.dialog.show();
+  this.dialog.getElementById("title").select();
+}
+
+Abbreviation.prototype.apply = function() {
+  var editor = this.editor;
+  var doc = editor._doc;
+  var abbr = this.abbr;
+  var html = this.html;
+  var param = this.dialog.hide();
+
+  if ( param ) {
+    var title = param["title"];
+    if (title == "" || title == null) {
+      if (abbr) {
+        var child = abbr.innerHTML;
+        abbr.parentNode.removeChild(abbr);
+        editor.insertHTML(child); // FIX: This doesn't work in Safari 3 
+      }
+      return;
+    }
+    try {
+      if (!abbr) {
+        abbr = doc.createElement("abbr");
+        abbr.title = title;
+        abbr.innerHTML = html;
+        if (Xinha.is_ie) {
+          range.pasteHTML(abbr.outerHTML);
+        } else {
+          editor.insertNodeAtSelection(abbr);
         }
-        return;
+      } else {
+        abbr.title = title;
       }
-      try {
-        var doc = editor._doc;
-        if (!abbr) {
-          abbr = doc.createElement("abbr");
-          abbr.title = title;
-          abbr.innerHTML = html;
-          if (Xinha.is_ie) {
-            range.pasteHTML(abbr.outerHTML);
-          } else {
-            editor.insertNodeAtSelection(abbr);
-          }
-        } else {
-          abbr.title = title;
-        }
-      }
-      catch (e) { }
     }
-  }, outparam);
-};
+    catch (e) { }
+  }
+}
+
+
+Abbreviation.prototype.ondelete = function() {
+  this.dialog.getElementById('title').value = "";
+  this.apply();
+}

trunk/plugins/BackgroundImage/background-image.js

@@ -9 +9 @@
 function BackgroundImage(editor) {
   this.editor = editor;
-        var cfg = editor.config;
-        var self = this;
+  var cfg = editor.config;
+  var self = this;
   cfg.registerButton({
-                id       : "bgImage",
-                tooltip  : this._lc("Set page background image"),
-                image    : editor.imgURL("ed_bgimage.gif", "BackgroundImage"),
-                textMode : false,
-                action   : function(editor) {
-                                self.buttonPress(editor);
-                           }
-            })
-        cfg.addToolbarElement("bgImage", "inserthorizontalrule", 1);
+    id       : "bgImage",
+    tooltip  : Xinha._lc("Set page background image",  'BackgroundImage'),
+    image    : editor.imgURL("ed_bgimage.gif", "BackgroundImage"),
+    textMode : false,
+    action   : function(editor) {
+      self.show();
+    }
+  })
+  cfg.addToolbarElement("bgImage", "inserthorizontalrule", 1);
 }
 
 BackgroundImage._pluginInfo = {
-        name          : "BackgroundImage",
-        version       : "1.0",
-        developer     : "Udo Schmal",
-        developer_url : "http://www.schaffrath-neuemedien.de/",
-        c_owner       : "Udo Schmal & Schaffrath NeueMedien",
-        sponsor       : "L.N.Schaffrath NeueMedien",
-        sponsor_url   : "http://www.schaffrath-neuemedien.de.de/",
-        license       : "htmlArea"
+  name          : "BackgroundImage",
+  version       : "1.0",
+  developer     : "Udo Schmal",
+  developer_url : "http://www.schaffrath-neuemedien.de/",
+  c_owner       : "Udo Schmal & Schaffrath NeueMedien",
+  sponsor       : "L.N.Schaffrath NeueMedien",
+  sponsor_url   : "http://www.schaffrath-neuemedien.de.de/",
+  license       : "htmlArea"
 };
 
-BackgroundImage.prototype._lc = function(string) {
-    return Xinha._lc(string, 'BackgroundImage');
+BackgroundImage.prototype.onGenerateOnce = function(editor){
+  // Load assets
+  var self = BackgroundImage;
+  if (self.loading) return;
+
+  // A list of jpgs that are expected to be in ./backgrounds with thumbnails.
+  var backgrounds = {blufur:'',palecnvs:'', ppplcnvs:'', ylwsand:''};
+
+  self.loading = true;
+  self.methodsReady = true;
+
+  // When we get back from loading the dialog, we'll process our image template to handle as many images as specified.
+  Xinha._getback(_editor_url + 'plugins/BackgroundImage/dialog.html', function(getback) {
+
+    // Replace the template line with one line per image.
+    self.html = getback.replace(/<template>(.*?)<\/template>/ig, function(fullString, template) {
+      var replacement = '';
+
+      for (bg in backgrounds)
+      {
+        var thumbURL = _editor_url + 'plugins/BackgroundImage/backgrounds/thumbnails/' + bg + '.jpg';
+        var imageURL = _editor_url + 'plugins/BackgroundImage/backgrounds/' + bg + '.jpg';
+        replacement += template.replace(/%thumbnail%/,thumbURL).replace(/%image%/,imageURL);
+      }
+      return replacement;
+    });
+    self.dialogReady = true;
+  });
+}
+
+BackgroundImage.prototype.onUpdateToolbar = function(editor){
+  // Keep our toolbar image greyed until we're fully loaded.
+  if (!(BackgroundImage.dialogReady && BackgroundImage.methodsReady))
+  {
+    this.editor._toolbarObjects.BackgroundImage.state("enabled", false);
+  }
+  else this.onUpdateToolbar = null;
+
+}
+
+BackgroundImage.prototype.prepareDialog = function(editor){
+  var self = this;
+  var editor = this.editor;
+
+  var dialog = this.dialog = new Xinha.Dialog(editor, BackgroundImage.html, 'Xinha',{width:400})
+  //
+  // Hookup the buttons with our actions
+  dialog.getElementById('set').onclick = function() {self.apply();}
+  dialog.getElementById('delete').onclick = function() {self.deleteBg();}
+  dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+  
+  this.dialogReady = true;
+}
+
+BackgroundImage.prototype.show = function(editor){
+ if (!this.dialog) this.prepareDialog();
+
+  var editor = this.editor;
+
+  // After clearing the background property, it returns the current URL, and so
+  // we need to check the extension to find out if it really has a background.
+  if (editor._doc.body.background.split('.').pop() in {jpg:'', gif:'', png:'', jpeg:'', tiff:''})
+  {
+    var background = editor._doc.body.background;
+  }
+  else
+  {
+    var background = '';
+  }
+  var values = 
+  {
+    "background"      : background
+  }
+
+  // now calling the show method of the Xinha.Dialog object to set the values and show the actual dialog
+  this.dialog.show(values);
+}
+
+BackgroundImage.prototype.deleteBg = function(){
+  var editor = this.editor;
+  this.dialog.hide();
+
+  if (Xinha.is_ie)
+    editor.focusEditor();
+
+    editor._doc.body.background = "";
+}
+
+BackgroundImage.prototype.apply = function(){
+  var editor = this.editor;
+  var doc = editor._doc;
+  
+  // selection is only restored on dialog.hide()
+  var param = this.dialog.hide();
+  // assign the given arguments
+  
+  if (Xinha.is_ie)
+    editor.focusEditor();
+
+  doc.body.background = param.background;
 };
-
-BackgroundImage.prototype.buttonPress = function(editor) {
-                //var doc = this.editor._doc;
-    editor._popupDialog( "plugin://BackgroundImage/bgimage", function( bgImage ) {
-        if(bgImage) {
-                                        if(Xinha.is_ie) editor.focusEditor();
-                                        if(bgImage=="*") {
-                                                editor._doc.body.background = "";
-                                        } else {
-                                          editor._doc.body.background = bgImage;
-                                        }
-                                }       
-    }, null);
-};

trunk/plugins/CharacterMap/CharacterMap.css

@@ -1 @@
-.CharacterMap { }
+.CharacterMap { 
+background-color:white;
+}
 .CharacterMap a.entity {
   font-size:12px;

trunk/plugins/CharacterMap/character-map.js

@@ -14 +14 @@
       image    : editor.imgURL( 'ed_charmap.gif', 'CharacterMap' ),
       textMode : false,
-      action   : function( editor ) { self.buttonPress( editor ); }
+      action   : function() { self.show(); }
     }
   );
   cfg.addToolbarElement('insertcharacter', 'createlink', -1);
 
-  if ( cfg.CharacterMap.mode == 'panel' )
-  {
-    editor._CharacterMap = editor.addPanel( 'right' );
-    Xinha._addClass( editor._CharacterMap, 'CharacterMap' );
-
-    editor.notifyOn( 'modechange',
-      function( e, args )
-      {
-        if ( args.mode == 'text' ) editor.hidePanel( editor._CharacterMap );
-      }
-    );
-
-    var entites =
-    [
-      'Ÿ', 'š', '@', '"', '¡', '¢', '£', '¤', '¥', '¦',
-      '§', '¨', '©', 'ª', '«', '¬', '¯', '°', '±', '²',
-      '³', '´', 'µ', '¶', '·', '¸', '¹', 'º', '»', '¼',
-      '½', '¾', '¿', '×', 'Ø', '÷', 'ø', 'ƒ', 'ˆ',
-      '˜', '–', '—', '‘', '’', '‚', '“', '”', '„',
-      '†', '‡', '•', '…', '‰', '‹', '›', '€', '™',
-      'À', 'Á', 'Â', 'Ã', 'Ä', 'Å', 'Æ', 'Ç', 'È',
-      'É', 'Ê', 'Ë', 'Ì', 'Í', 'Î', 'Ï', 'Ð', 'Ñ',
-      'Ò', 'Ó', 'Ô', 'Õ', 'Ö', '®', '×', 'Ù', 'Ú',
-      'Û', 'Ü', 'Ý', 'Þ', 'ß', 'à', 'á', 'â', 'ã',
-      'ä', 'å', 'æ', 'ç', 'è', 'é', 'ê', 'ë', 'ì',
-      'í', 'î', 'ï', 'ð', 'ñ', 'ò', 'ó', 'ô', 'õ',
-      'ö', '÷', 'ø', 'ù', 'ú', 'û', 'ü', 'ý', 'þ',
-      'ÿ', 'Œ', 'œ', 'Š'
-    ];
-
-    for ( var i=0; i<entites.length; i++ )
-      this.addEntity( entites[i], i );
-
-    editor.hidePanel( editor._CharacterMap );
-  }
 }
 
@@ -76 +41 @@
 CharacterMap._isActive = false;
 
-CharacterMap.prototype.buttonPress = function( editor )
-{
-  var cfg = editor.config;
-  if ( cfg.CharacterMap.mode == 'panel' )
-  {
-    if ( this._isActive )
-    {
-      this._isActive = false;
-      editor.hidePanel( editor._CharacterMap );
-    }
-    else
-    {
-      this._isActive = true;
-      editor.showPanel( editor._CharacterMap );
-    }
-  }
-  else
-  {
-    editor._popupDialog( "plugin://CharacterMap/select_character", function( entity )
-    {
-      if ( !entity ) return false;
-      if ( Xinha.is_ie ) editor.focusEditor();
-      editor.insertHTML( entity );
-    }, null);
-  }
-};
 
 CharacterMap.prototype.addEntity = function ( entite, pos )
@@ -120 +59 @@
     return false;
   };
-  editor._CharacterMap.appendChild( a );
+  this.dialog.main.appendChild( a );
   a = null;
 };
+
+CharacterMap.prototype.onGenerateOnce = function()
+{
+        this._prepareDialog();
+};
+
+CharacterMap.prototype._prepareDialog = function()
+{
+        var self = this;
+        var editor = this.editor;
+
+        var html = '<h1><l10n>Insert special character</l10n></h1>';
+
+        // Now we have everything we need, so we can build the dialog.
+        this.dialog = new Xinha.Dialog(editor, html, 'CharacterMap',{width:300},{modal:false});
+        Xinha._addClass( this.dialog.rootElem, 'CharacterMap' );
+
+        if (editor.config.CharacterMap.mode == 'panel') this.dialog.attachToPanel('right');
+        
+        var entites =
+        [
+        '&Yuml;', '&scaron;', '&#064;', '&quot;', '&iexcl;', '&cent;', '&pound;', '&curren;', '&yen;', '&brvbar;',
+        '&sect;', '&uml;', '&copy;', '&ordf;', '&laquo;', '&not;', '&macr;', '&deg;', '&plusmn;', '&sup2;',
+        '&sup3;', '&acute;', '&micro;', '&para;', '&middot;', '&cedil;', '&sup1;', '&ordm;', '&raquo;', '&frac14;',
+        '&frac12;', '&frac34;', '&iquest;', '&times;', '&Oslash;', '&divide;', '&oslash;', '&fnof;', '&circ;',
+        '&tilde;', '&ndash;', '&mdash;', '&lsquo;', '&rsquo;', '&sbquo;', '&ldquo;', '&rdquo;', '&bdquo;',
+        '&dagger;', '&Dagger;', '&bull;', '&hellip;', '&permil;', '&lsaquo;', '&rsaquo;', '&euro;', '&trade;',
+        '&Agrave;', '&Aacute;', '&Acirc;', '&Atilde;', '&Auml;', '&Aring;', '&AElig;', '&Ccedil;', '&Egrave;',
+        '&Eacute;', '&Ecirc;', '&Euml;', '&Igrave;', '&Iacute;', '&Icirc;', '&Iuml;', '&ETH;', '&Ntilde;',
+        '&Ograve;', '&Oacute;', '&Ocirc;', '&Otilde;', '&Ouml;', '&reg;', '&times;', '&Ugrave;', '&Uacute;',
+        '&Ucirc;', '&Uuml;', '&Yacute;', '&THORN;', '&szlig;', '&agrave;', '&aacute;', '&acirc;', '&atilde;',
+        '&auml;', '&aring;', '&aelig;', '&ccedil;', '&egrave;', '&eacute;', '&ecirc;', '&euml;', '&igrave;',
+        '&iacute;', '&icirc;', '&iuml;', '&eth;', '&ntilde;', '&ograve;', '&oacute;', '&ocirc;', '&otilde;',
+        '&ouml;', '&divide;', '&oslash;', '&ugrave;', '&uacute;', '&ucirc;', '&uuml;', '&yacute;', '&thorn;',
+        '&yuml;', '&OElig;', '&oelig;', '&Scaron;'
+        ];
+
+        for ( var i=0; i<entites.length; i++ )
+        {
+          this.addEntity( entites[i], i );
+        }
+        
+        this.ready = true;
+        //this.hide();
+};
+
+CharacterMap.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;
+        }
+        this.dialog.toggle();
+};
+CharacterMap.prototype.hide = function()
+{
+        this.dialog.hide();
+};
+

trunk/plugins/InsertAnchor/insert-anchor.js

@@ -12 +12 @@
   image    : editor.imgURL("insert-anchor.gif", "InsertAnchor"),
   textMode : false,
-  action   : function(editor) {
-               self.buttonPress(editor);
+  action   : function() {
+               self.show();
              }
   });
@@ -50 +50 @@
         return html;
 }
+InsertAnchor.prototype.onGenerateOnce = function()
+{
+        this._prepareDialog();
+};
+InsertAnchor.prototype._prepareDialog = function()
+{
+  var self = this;
+  var editor = this.editor;
 
-InsertAnchor.prototype.buttonPress = function(editor) {
-  var outparam = null;
-  var html = editor.getSelectedHTML();
-  var sel  = editor._getSelection();
-  var range  = editor._createRange(sel);
+  if(!this.html)
+  {
+    Xinha._getback(Xinha.getPluginDir("InsertAnchor") + '/dialog.html', function(getback) { self.html = getback; self._prepareDialog(); });
+    return;
+  }
+  
+  // Now we have everything we need, so we can build the dialog.
+  this.dialog = new Xinha.Dialog(editor, this.html, 'InsertAnchor',{width:400});
+  
+  this.dialog.getElementById('ok').onclick = function() {self.apply();}
+
+        this.dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+        
+  this.ready = true;
+};
+
+InsertAnchor.prototype.show = function()
+{
+        if(!this.ready) // if the user is too fast clicking the, we have to make them wait
+        {
   var self = this;
-  var  a = editor._activeElement(sel);
-  if(!(a != null && a.tagName.toLowerCase() == 'a')) {
-    a = editor._getFirstAncestor(sel, 'a'); 
+                window.setTimeout(function() {self.show();},100);
+                return;
   }
-  if (a != null && a.tagName.toLowerCase() == 'a')
-    outparam = { name : a.id };
+        var editor = this.editor;
+        this.selectedHTML = editor.getSelectedHTML();
+        var sel  = editor.getSelection();
+  var range  = editor.createRange(sel);
+  this.a = editor.activeElement(sel);
+  
+  if(!(this.a != null && this.a.tagName.toLowerCase() == 'a'))
+  {
+    this.a = editor._getFirstAncestor(sel, 'a'); 
+  }
+  
+  if (this.a != null && this.a.tagName.toLowerCase() == 'a')
+  {
+    inputs = { name : this.a.id };
+  }
   else
-    outparam = { name : '' };
+  {
+    inputs = { name : '' };
+  } 
 
-  editor._popupDialog( "plugin://InsertAnchor/insert_anchor", function( param ) {
-    if ( param ) {
-      var anchor = param["name"];
-      if (anchor == "" || anchor == null) {
-        if (a) {
+        this.dialog.show(inputs);
+
+        this.dialog.getElementById("name").focus();
+};
+
+InsertAnchor.prototype.apply = function ()
+{
+        var editor = this.editor;
+        var param = this.dialog.hide();
+        var anchor = param['name'];
+        var a = this.a;
+        var self = this;
+        if (anchor == "" || anchor == null)
+        {
+                if (a) 
+                {
           var child = self.outwardHtml(a.innerHTML);
           a.parentNode.removeChild(a);
@@ -76 +124 @@
         }
         return;
-      } 
-      try {
+        }
+        try 
+        {
         var doc = editor._doc;
-        if (!a) {
-//          editor.surroundHTML('<a id="' + anchor + '" name="' + anchor + '" title="' + anchor + '" class="anchor">', '</a>');
+                if (!a)
+                {
           a = doc.createElement("a");
           a.id = anchor;
@@ -87 +136 @@
           a.className = "anchor";
           a.innerHTML = self.placeholderImg;
+                        var html = editor.getSelectedHTML();
                   if (html) a.innerHTML += html;
-          if (Xinha.is_ie) {
+                        if (Xinha.is_ie) 
+                        {
             range.pasteHTML(a.outerHTML);
-          } else {
+                }
+                        else 
+                        {
             editor.insertNodeAtSelection(a);
           }
-        } else {
+                }
+                else 
+                {
           a.id = anchor;
           a.name = anchor;
@@ -101 +156 @@
       }
       catch (e) { }
+
     }
-  }, outparam);
-};

trunk/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.top && window.top.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 (atr.href) atr.href = atr.href.trim();
-
-    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')
-  {
-    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
-      Xinha._postback(linker.lConfig.backend,
-                      linker.lConfig.backend_data, 
+        //get 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');
-  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.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.onresize = function()
-    {
-      var h = parseInt(dialog.height) - dialog.getElementById('h1').offsetHeight;
-      var w = parseInt(dialog.width)  - 322 ;
-      // 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 = ddTree.style.height = h + 'px';
-      ddTree.style.width  = w + 'px';
-    }
-
-  this.ready = true;
-};
-
-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();
-};
+}

trunk/plugins/PasteText/lang/de.js

@@ -2 +2 @@
 // LANG: "de", ENCODING: UTF-8
 {
-  "Paste as Plain Text": "unformatierten Text einfÃŒgen"
+  "Paste as Plain Text": "unformatierten Text einfÃŒgen",
+        "Insert text in new paragraph" : "Neue AbsÀtze eifÌgen"
 };

trunk/plugins/PasteText/paste-text.js

@@ -8 +8 @@
         var cfg = editor.config;
         var self = this;
-        
+
         cfg.registerButton({
-                id       : "pastetext",
-                tooltip  : this._lc("Paste as Plain Text"),
-                image    : editor.imgURL("ed_paste_text.gif", "PasteText"),
-                textMode : false,
-                action   : function(editor) {
-                             self.buttonPress(editor);
-                           }
-            });
+                id       : "pastetext",
+                tooltip  : this._lc("Paste as Plain Text"),
+                image    : editor.imgURL("ed_paste_text.gif", "PasteText"),
+                textMode : false,
+                action   : function() { self.show(); }
+        });
 
         cfg.addToolbarElement("pastetext", ["paste", "killword"], 1);
@@ -34 +32 @@
 
 PasteText.prototype._lc = function(string) {
-    return Xinha._lc(string, 'PasteText');
+        return Xinha._lc(string, 'PasteText');
 };
 
@@ -43 +41 @@
 }
 
-PasteText.prototype.buttonPress = function(editor) {
+PasteText.prototype.onGenerateOnce = function()
+{
+        var self = PasteText;
+        if (self.loading) return;
+        self.loading = true;
+        Xinha._getback(Xinha.getPluginDir("PasteText") + '/popups/paste_text.html', function(getback) { self.html = getback;});
+};
 
+PasteText.prototype._prepareDialog = function()
+{
+        var self = this;
         var editor = this.editor;
-        var outparam = editor.config.PasteText; 
-        var action = function( ret ) {
-                var html = ret.text;
-                var insertParagraphs = ret.insertParagraphs;
-                html = html.replace(/</g, "&lt;");
-                html = html.replace(/>/g, "&gt;");
-                if ( ret.insertParagraphs)
-                {
-                        html = html.replace(/\t/g,"&nbsp;&nbsp;&nbsp;&nbsp;");
-                        html = html.replace(/\n/g,"</p><p>");
-                        html="<p>" + html + "</p>";
-                        if (Xinha.is_ie)
-                        {
-                                editor.insertHTML(html);
-                        }
-                        else
-                        {
-                                editor.execCommand("inserthtml",false,html);
-                        }
+
+        var self = this;
+
+/// 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
+        this.dialog.getElementById('ok').onclick = function() {self.apply();}
+
+        this.dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+
+        // do some tweaking 
+        if (editor.config.PasteText.showParagraphOption)
+        {
+                this.dialog.getElementById("paragraphOption").style.display = "";
+        }
+        if (editor.config.PasteText.newParagraphDefault)
+        {
+                this.dialog.getElementById("insertParagraphs").checked = true;
+        }
+
+        // we can setup a custom function that cares for sizes etc. when the dialog is resized
+        this.dialog.onresize = function ()
+        {
+                this.getElementById("inputArea").style.height = 
+                parseInt(this.height,10) // the actual height of the dialog
+                - this.getElementById('h1').offsetHeight // the title bar
+                - this.getElementById('buttons').offsetHeight // the buttons
+                - parseInt(this.rootElem.style.paddingBottom,10) // we have a padding at the bottom, gotta take this into acount
+                + 'px'; // don't forget this ;)
+                
+                this.getElementById("inputArea").style.width =(this.width - 2) + 'px'; // and the width
+
+        }
+};
+
+PasteText.prototype.show = function()
+{
+        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
+        var inputs =
+        {
+                inputArea : '' // we want the textarea always to be empty on showing
+        }
+        // now calling the show method of the Xinha.Dialog object to set the values and show the actual dialog
+        this.dialog.show(inputs);
+
+        // Init the sizes (only if we have set up the custom resize function)
+        this.dialog.onresize();
+
+        this.dialog.getElementById("inputArea").focus();
+};
+
+// and finally ... take some action
+PasteText.prototype.apply = function()
+{
+        // the hide method of the dialog object returns the values of the inputs AND hides the dialog
+        // could also use this.dialog.getValues() here and hide it at the end
+        var returnValues = this.dialog.hide();
+        
+        var html = returnValues.inputArea;
+        var insertParagraphs = returnValues.insertParagraphs;
+        html = html.replace(/</g, "&lt;");
+        html = html.replace(/>/g, "&gt;");
+        if ( returnValues.insertParagraphs)
+        {
+                html = html.replace(/\t/g,"&nbsp;&nbsp;&nbsp;&nbsp;");
+                html = html.replace(/\n/g,"</p><p>");
+                html="<p>" + html + "</p>";
+                if (Xinha.is_ie)
+                {
+                        this.editor.insertHTML(html);
                 }
                 else
                 {
-                        html = html.replace(/\n/g,"<br />");
-                        editor.insertHTML(html);
+                        this.editor.execCommand("inserthtml",false,html);
                 }
         }
-        Dialog( Xinha.getPluginDir("PasteText")+ "/popups/paste_text.html", action, outparam);
+        else
+        {
+                html = html.replace(/\n/g,"<br />");
+                this.editor.insertHTML(html);
+        }
 };

trunk/plugins/PasteText/popups/paste_text.html

@@ -1 @@
-<!DOCTYPE html
-     PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-  <title>Paste Text</title>
-  <link rel="stylesheet" type="text/css" href="../../../popups/popup.css" />
-  <script type="text/javascript" src="../../../popups/popup.js"></script>
-<script type="text/javascript">
-
-function init() {
-
-  __dlg_translate("PasteText");
-  __dlg_init(null,{width:600,height:480});
-
-  var param = window.dialogArguments;
-  document.getElementById("paragraphOption").style.display = (param.showParagraphOption) ? '' : 'none';
-   document.getElementById("insertParagraphs").checked = param.newParagraphDefault;
-  document.getElementById("inputArea").focus();
-}
-
-function onCancel() {
-  __dlg_close( null );
-  return false;
-}
-
-function onOK() {
-  var ret = {};
-  ret.text = document.getElementById("inputArea").value;
-  ret.insertParagraphs = document.getElementById("insertParagraphs").checked;
-  __dlg_close( ret );
-}
-window.onload = init;
-</script>
-</head>
-
-<body class="dialog">
-<div class="title">Paste as Plain Text</div>
-<form>
-<div>
-<textarea name="inputArea" id="inputArea" cols=22 rows=5 style="width: 100%; height: 315px; margin-top: 8px; margin-bottom: 4px; font-family: monospace; font-size: 11px;"></textarea>
-<div id="buttons">
-<label for="insertParagraphs" style="float:left;display:none" id="paragraphOption">
-<input type="checkbox" id="insertParagraphs" /> Insert text in new paragraph 
+<h1 id="[h1]"><l10n>Paste as Plain Text</l10n></h1>
+<textarea name="[inputArea]" id="[inputArea]" style="font-family:monospace;height:300px;border:none;"></textarea>
+<div class="buttons" id="[buttons]">
+<label style="float:left;display:none" id="[paragraphOption]">
+<input type="checkbox" id="[insertParagraphs]" name="[insertParagraphs]" /> <l10n>Insert text in new paragraph</l10n> 
 </label>
-    <button type="button" name="ok" onclick="return onOK();">OK</button>
-    <button type="button" name="cancel" onclick="return onCancel();">Cancel</button>
+  <input type="button" id="[ok]"     value="_(OK)"     />
+  <input type="button" id="[cancel]" value="_(Cancel)" />
 </div>
-</div>
-</form>
-</body>
-</html>

trunk/plugins/SmartReplace/dialog.html

@@ -8 +8 @@
   <tr>
     <td style="width:15px"><input type="checkbox" id="[convert]" name="[convert]" /></td>
-    <td style="text-align:left"><l10n>Convert all quotes and dashes in the current document</l10n></td>
+    <td style="text-align:left"><l10n>Convert all quotes and dashes in the current document</l10n> <input style="display:none" type="button" id="[ok]" value="_(OK)" /></td>
   </tr>
 </table>
-  <div style="margin-top: 10px;">
-    <input type="button" id="[ok]"     value="_(OK)"     />
-    <input type="button" id="[cancel]" value="_(Cancel)" />
-  </div>
 </div>
+<div class="buttons">
+  
+</div>

trunk/plugins/SmartReplace/smart-replace.js

@@ -26 +26 @@
   version       : "1.0",
   developer     : "Raimund Meyer",
-  developer_url : "http://x-webservice.net",
+  developer_url : "http://rheinauf.de",
   c_owner       : "Raimund Meyer",
   sponsor       : "",
   sponsor_url   : "",
-  license       : "LGPL"
+  license       : "htmlArea"
 };
 
@@ -99 +99 @@
 
 SmartReplace.prototype.keyEvent = function(ev)
-{ 
+{
         if ( !this.active) return true;
         var editor = this.editor;
@@ -152 +152 @@
                         r.moveStart('character', +1);
                         r.text = closing;
-                        
                 }
                 else
@@ -224 +223 @@
         return true;
 }
-
 
 SmartReplace.prototype.replaceAll = function()
@@ -264 +262 @@
         this.editor.setHTML(html);
 }
-SmartReplace.prototype.dialog = function()
+
+SmartReplace.prototype.buttonPress = function(opts, obj)
 {
         var self = this;
-        var action = function (param)
-        {
-                self.toggleActivity(param.enable); 
-                if (param.convert)
-                {
-                        self.replaceAll();
-                }
-        }
-        var init = this;
-        Dialog(Xinha.getPluginDir('SmartReplace')+'/popups/dialog.html', action, init);
-}
-
-
-SmartReplace.prototype.buttonPress = function(opts, obj)
-{
-        var self = this;
-
-        if ( this._dialog.dialog.rootElem.style.display != 'none')
-        {
-                return this._dialog.hide();
+
+        if ( this.dialog.rootElem.style.display != 'none')
+        {
+                return this.dialog.hide();
         }
         var doOK = function()
         {
-                var opts = self._dialog.hide();
+                var opts = self.dialog.hide();
                 self.toggleActivity((opts.enable) ? true : false); 
                 if (opts.convert)
                 {
                         self.replaceAll();
-                        self._dialog.dialog.getElementById("convert").checked = false;
+                        self.dialog.getElementById("convert").checked = false;
                 }
         }
@@ -303 +286 @@
                 convert: ''
         };
-        this._dialog.show(inputs, doOK);
+        this.show(inputs, doOK);
 };
 
 SmartReplace.prototype.onGenerateOnce = function()
 {
-  if( !this._dialog)
-  {
-        this._dialog = new SmartReplace.Dialog(this);
-  }
-};
-
-SmartReplace.Dialog = function (mainPluginObject)
-{
-  this.Dialog_nxtid = 0;
-  this.mainPluginObject = mainPluginObject;
-  this.id = { }; // This will be filled below with a replace, nifty
-
-  this.ready = false;
-  this.files  = false;
-  this.html   = false;
-  this.dialog = false;
-
   this._prepareDialog();
-
-};
-
-SmartReplace.Dialog.prototype._prepareDialog = function()
-{
-  var pluginDialogObject = this;
-  var editor = this.mainPluginObject.editor;
-
-  if(this.html == false)
-  {
-        Xinha._getback(Xinha.getPluginDir('SmartReplace') + '/dialog.html', function(getback) { pluginDialogObject.html = getback; pluginDialogObject._prepareDialog(); });
+};
+
+SmartReplace.prototype._prepareDialog = function()
+{
+  var self = this;
+  var editor = this.editor;
+
+  if(!this.html)
+  {
+    Xinha._getback( Xinha.getPluginDir("SmartReplace") + '/dialog.html', function(getback) { self.html = getback; self._prepareDialog(); });
         return;
   }
   
   // Now we have everything we need, so we can build the dialog.
-  this.dialog = new Xinha.Dialog(editor, this.html, 'SmartReplace');
-
+  this.dialog = new Xinha.Dialog(editor, this.html, 'SmartReplace',{},{modal:false});
+  this.dialog.attachToPanel('top');
+
+  this.dialog.getElementById('enable').onchange = function ()
+  {
+        self.toggleActivity(this.checked); 
+  }
+  this.dialog.getElementById('convert').onchange = function ()
+  {
+        self.dialog.getElementById('ok').style.display = ( this.checked ) ? '' : 'none'; 
+  }
+  this.dialog.getElementById('ok').onclick = function ()
+  {
+        self.replaceAll();
+        self.dialog.getElementById('convert').checked = false; 
+        this.style.display =  'none'; 
+  }
   this.ready = true;
 };
 
-SmartReplace.Dialog.prototype._lc = SmartReplace.prototype._lc;
-
-SmartReplace.Dialog.prototype.show = function(inputs, ok, cancel)
+SmartReplace.prototype.show = function(inputs)
 {
   if(!this.ready)
   {
-        var pluginDialogObject = this;
-        window.setTimeout(function() {pluginDialogObject.show(inputs,ok,cancel);},100);
+    var self = this;
+    window.setTimeout(function() {self.show(inputs,ok,cancel);},100);
         return;
   }
 
   // Connect the OK and Cancel buttons
-  var dialog = this.dialog;
-  var pluginDialogObject = this;
-  if(ok)
-  {
-        this.dialog.getElementById('ok').onclick = ok;
-  }
-  else
-  {
-        this.dialog.getElementById('ok').onclick = function() {pluginDialogObject.hide();};
-  }
-
-  if(cancel)
-  {
-        this.dialog.getElementById('cancel').onclick = cancel;
-  }
-  else
-  {
-        this.dialog.getElementById('cancel').onclick = function() { pluginDialogObject.hide()};
-  }
-
-  // Show the dialog
-  this.mainPluginObject.editor.disableToolbar(['fullscreen','smartreplace']);
+  var self = this;
 
   this.dialog.show(inputs);
@@ -386 +343 @@
   this.dialog.onresize();
 };
-
-SmartReplace.Dialog.prototype.hide = function()
-{
-  this.mainPluginObject.editor.enableToolbar();
-  return this.dialog.hide();
-};

trunk/plugins/Stylist/stylist.js

@@ -66 +66 @@
 Xinha.prototype._fillStylist = function()
 {
-  if(!this._stylist) return false;
-  this.plugins.Stylist.instance.main.innerHTML = '';
+  if(!this.plugins.Stylist.instance.dialog) return false;
+  var main = this.plugins.Stylist.instance.dialog.main;
+  main.innerHTML = '';
 
   var may_apply = true;
@@ -180 +181 @@
     {
       var anch = document.createElement('a');
-      if ( Xinha.is_real_gecko ) anch.onfocus = function () { this.blur() } // prevent dotted line around link that causes horizontal scrollbar in Mozilla
+      anch.onfocus = function () { this.blur() } // prevent dotted line around link that causes horizontal scrollbar
       anch._stylist_className = className.trim();
       anch._stylist_applied   = applied;
@@ -215 +216 @@
       }
 
-      this.plugins.Stylist.instance.main.appendChild(anch);
+      main.appendChild(anch);
     }
   }
@@ -484 +485 @@
   RE_rule    = /\{(.|\r|\n)*?\}/g;
   css = css.replace(RE_comment, '');
-  css = css.replace(RE_comment, '');
   css = css.replace(RE_rule, ',');
 
@@ -527 +527 @@
 Stylist.prototype.onGenerateOnce = function()
 {
+  var cfg = this.editor.config;
+  if(typeof cfg.css_style != 'undefined' && Xinha.objectProperties(cfg.css_style).length != 0)
+  {
+    this._prepareDialog();
+  }
+
+};
+Stylist.prototype._prepareDialog = function()
+{
   var editor = this.editor;
   var stylist = this;
-  if(typeof editor.config.css_style != 'undefined' && Xinha.objectProperties(editor.config.css_style).length != 0)
-  {
-    editor._stylist = null; // This needs to be changes to be Stylist::_stylist sometime
-    editor._stylist = editor.addPanel('right');
-    Xinha.addClass(editor._stylist, 'stylist');
-
-    this.caption = document.createElement("h1");
-    this.caption.innerHTML = Xinha._lc('Styles', 'Stylist');
-    editor._stylist.appendChild(this.caption);
-    this.main = document.createElement("div");
-    this.main.style.overflow = "auto";
-    this.main.style.height = this.editor._framework.ed_cell.offsetHeight - this.caption.offsetHeight + 'px';
-
-    editor._stylist.appendChild(this.main);
-
-    Xinha.freeLater(this,"caption");
-    Xinha.freeLater(this,"main");
-
-    editor.notifyOn('modechange',
-      function(e,args)
-      {
-        switch(args.mode)
-        {
-          case 'text':
-          {
-            editor.hidePanel(editor._stylist);
-            break;
-          }
-          case 'wysiwyg':
-          {
-            editor.showPanel(editor._stylist);
-            break;
-          }
-        }
-      }
-    );
-    editor.notifyOn('panel_change',
-      function(e,args)
-      {
-        switch (args.action)
-        {
-          case 'show':
-          var newHeight = stylist.main.offsetHeight - args.panel.offsetHeight;
-          stylist.main.style.height = ((newHeight > 0) ?  stylist.main.offsetHeight - args.panel.offsetHeight : 0) + 'px';
-          editor._stylist.style.height = stylist.caption.offsetHeight + "px";
-          editor.sizeEditor();
-          break;
-          case 'hide':
-            stylist.resize();
-          break;
-        }
-      }
-    );
-    editor.notifyOn('before_resize',
-    function()
-      {
-        editor._stylist.style.height = stylist.caption.offsetHeight + "px";
-      }
-    );
-    editor.notifyOn('resize',
-      function()
-      {
-        stylist.resize();
-      }
-    );
-  }
-
-};
+
+  var html = '<h1><l10n>Styles</l10n></h1>';
+  
+  this.dialog = new Xinha.Dialog(editor, html, 'Stylist',{width:200},{modal:false,closable:false});
+        Xinha._addClass( this.dialog.rootElem, 'Stylist' );
+        this.dialog.attachToPanel('right');
+  this.dialog.show();
+  
+        var dialog = this.dialog;
+        var main = this.dialog.main;
+        var caption = this.dialog.captionBar;
+        
+  main.style.overflow = "auto";
+  main.style.height = this.editor._framework.ed_cell.offsetHeight - caption.offsetHeight + 'px';
+
+  editor.notifyOn('modechange',
+  function(e,args)
+  {
+    if (!dialog.attached)
+    {
+      return;
+    }
+    switch(args.mode)
+    {
+      case 'text':
+      {
+        dialog.hide();
+        break;
+      }
+      case 'wysiwyg':
+      {
+        dialog.show();
+        break;
+      }
+    }
+  }
+  );
+  editor.notifyOn('panel_change',
+  function(e,args)
+  {
+    if (!dialog.attached)
+    {
+      return;
+    }
+    switch (args.action)
+    {
+      case 'show':
+      var newHeight = main.offsetHeight - args.panel.offsetHeight;
+      main.style.height = ((newHeight > 0) ?  main.offsetHeight - args.panel.offsetHeight : 0) + 'px';
+      dialog.rootElem.style.height = caption.offsetHeight + "px";
+      editor.sizeEditor();
+      break;
+      case 'hide':
+      stylist.resize();
+      break;
+    }
+  }
+  );
+  editor.notifyOn('before_resize',
+  function()
+  {
+    if (!dialog.attached)
+    {
+      return;
+    }
+    dialog.rootElem.style.height = caption.offsetHeight + "px";
+  }
+  );
+  editor.notifyOn('resize',
+  function()
+  {
+    if (!dialog.attached)
+    {
+      return;
+    }
+    stylist.resize();
+  }
+  );
+}
 Stylist.prototype.resize = function()
 {
   var editor = this.editor;
-  var panelContainer = editor._stylist.parentNode;
+  var rootElem = this.dialog.rootElem;
+  
+  if (rootElem.style.display == 'none') return;
+  
+  var panelContainer = rootElem.parentNode;
 
   var newSize = panelContainer.offsetHeight;
   for (var i=0; i < panelContainer.childNodes.length;++i)
   {
-    if (panelContainer.childNodes[i]==editor._stylist || !panelContainer.childNodes[i].offsetHeight)
+    if (panelContainer.childNodes[i] == rootElem || !panelContainer.childNodes[i].offsetHeight)
     {
       continue;
@@ -611 +635 @@
     newSize -= panelContainer.childNodes[i].offsetHeight;
   }
-  editor._stylist.style.height = newSize + 'px';
-  this.main.style.height = newSize - this.caption.offsetHeight + 'px';
+  rootElem.style.height = newSize-5 + 'px';
+  this.dialog.main.style.height = newSize - this.dialog.captionBar.offsetHeight -5 + 'px';
 }
 
 Stylist.prototype.onUpdateToolbar = function()
 {
-  if(this.editor._stylist)
+  if(this.dialog)
   {
     if(this._timeoutID)

trunk/plugins/SuperClean/dialog.html

@@ -1 +1 @@
 <h1 id="[h1]"><l10n>Clean up HTML</l10n></h1>
-<div style="margin-left: 10px;">
+<div style="margin-left: 10px;" id="[main]">
     <l10n>Please select from the following cleaning options...</l10n>
     <!--filters-->
-  <div style="margin-top: 10px;">
-    <input type="button" id="[ok]"     value="_(OK)"     />
-    <input type="button" id="[cancel]" value="_(Cancel)" />
-  </div>
 </div>
+
+<div id="[waiting]" style="display:none;margin:3em 1em;text-align:center"><l10n>Please stand by while cleaning in process...</l10n></div>
+<div id="[alert]" style="display:none;margin:3em 1em;text-align:center"></l10n></div>
+
+<div class="buttons" id="[buttons]">
+  <input type="button" id="[ok]"     value="_(OK)"     />
+  <input type="button" id="[cancel]" value="_(Cancel)" />
+</div>

trunk/plugins/SuperClean/lang/de.js

@@ -14 +14 @@
   "Cancel": "Abbrechen",
   "Tidy failed.  Check your HTML for syntax errors.": "SÀubern fehlgeschlagen. ÜberprÃŒfen Sie Ihren Code auf Fehler.",
-  "You don't have anything to tidy!": "Es gibt nichts zu sÀubern...!"
+  "You don't have anything to tidy!": "Es gibt nichts zu sÀubern...!",
+  "Please stand by while cleaning in process..." : "Bitte warten Sie, wÀhrend die SÀuberung lÀuft..."
 };

trunk/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()
-  {
-    var opts = superclean._dialog.hide();
-    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);
-          break;
-          case 'alert':
-            alert(superclean._lc(response.value));
-          break;
-        }
-      }
-      Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : editor.getInnerHTML()},callback);
-    }
-    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);
-    }
-  }
 };
 
@@ -131 +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()
+{
 
-SuperClean.prototype.onGenerate = function()
-{
-  if(this.editor.config.SuperClean.show_dialog && !this._dialog)
-  {
-    this._dialog = new SuperClean.Dialog(this);
-  }
   if(this.editor.config.tidy_handler)
   {
@@ -205 +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()
+{
   var sc = this;
   //load the filter-functions
   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])
     {
@@ -222 +117 @@
                       function(func) {
                         eval('SuperClean.filterFunctions.'+filter+'='+func+';');
-                        sc.onGenerate();
+                        sc.loadFilters();
                       });
       }
@@ -229 +124 @@
   }
 };
-// 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');
-
-  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();
-  return this.dialog.hide();
-};

trunk/plugins/TableOperations/table-operations.js

@@ -11 +11 @@
 //   http://dynarch.com/mishoo
 //
-// $Id:table-operations.js 988 2008-04-12 13:46:09Z ray $
+// $Id$
 
 // Object that will encapsulate all the table operations provided by
@@ -18 +18 @@
 {
   'showButtons' : true // Set to false to hide all but inserttable and toggleborders buttons on the toolbar
-                       // this is useful if you have the ContextMenu plugin and want to save toolbar space
-                       // (the context menu can perform all the button operations)
+                                           // this is useful if you have the ContextMenu plugin and want to save toolbar space
+                                           // (the context menu can perform all the button operations)
 }
 
@@ -35 +35 @@
   
         var toolbar = ["linebreak", "inserttable", "toggleborders"];
-    
+        
   
         for (var i = 0; i < bl.length; ++i) {
@@ -56 +56 @@
         cfg.toolbar.push(toolbar);
         
-  if ( typeof PopupWin == 'undefined' )
+        if ( typeof PopupWin == 'undefined' )
   {
-    Xinha._loadback(_editor_url + 'modules/Dialogs/popupwin.js');
+        Xinha._loadback(_editor_url + 'modules/Dialogs/popupwin.js');
   }
+        if ( typeof Xinha.InlineStyler == 'undefined' )
+  {
+        Xinha._loadback(_editor_url + 'modules/InlineStyler/InlineStyler.js');
+  }
+        
 }
 
@@ -74 +79 @@
 
 TableOperations.prototype._lc = function(string) {
-    return Xinha._lc(string, 'TableOperations');
+        return Xinha._lc(string, 'TableOperations');
 };
 
@@ -96 +101 @@
         }
         return ret;
-};
-
-// this function requires the file PopupDiv/PopupWin to be loaded from browser
-TableOperations.prototype.dialogTableProperties = function() {
-        // retrieve existing values
-        var table = this.getClosest("table");
-        // this.editor.selectNodeContents(table);
-        // this.editor.updateToolbar();
-
-        var dialog = new PopupWin(this.editor, Xinha._lc("Table Properties", "TableOperations"), function(dialog, params) {
-                TableOperations.processStyle(params, table);
-                for (var i in params) {
-      if(typeof params[i] == 'function') continue;
-                        var val = params[i];
-                        switch (i) {
-                            case "f_caption":
-                                if (/\S/.test(val)) {
-                                        // contains non white-space characters
-                                        var caption = table.getElementsByTagName("caption")[0];
-                                        if (!caption) {
-                                                caption = dialog.editor._doc.createElement("caption");
-                                                table.insertBefore(caption, table.firstChild);
-                                        }
-                                        caption.innerHTML = val;
-                                } else {
-                                        // search for caption and delete it if found
-                                        var caption = table.getElementsByTagName("caption")[0];
-                                        if (caption) {
-                                                caption.parentNode.removeChild(caption);
-                                        }
-                                }
-                                break;
-                            case "f_summary":
-                                table.summary = val;
-                                break;
-                            case "f_width":
-                                table.style.width = ("" + val) + params.f_unit;
-                                break;
-                            case "f_align":
-                                table.align = val;
-                                break;
-                            case "f_spacing":
-                                table.cellSpacing = val;
-                                break;
-                            case "f_padding":
-                                table.cellPadding = val;
-                                break;
-                            case "f_borders":
-                                table.border = val;
-                                break;
-                            case "f_frames":
-                                table.frame = val;
-                                break;
-                            case "f_rules":
-                                table.rules = val;
-                                break;
-                        }
-                }
-                // various workarounds to refresh the table display (Gecko,
-                // what's going on?! do not disappoint me!)
-                dialog.editor.forceRedraw();
-                dialog.editor.focusEditor();
-                dialog.editor.updateToolbar();
-                var save_collapse = table.style.borderCollapse;
-                table.style.borderCollapse = "collapse";
-                table.style.borderCollapse = "separate";
-                table.style.borderCollapse = save_collapse;
-        },
-
-        // this function gets called when the dialog needs to be initialized
-        function (dialog) {
-
-                var f_caption = "";
-                var capel = table.getElementsByTagName("caption")[0];
-                if (capel) {
-                        f_caption = capel.innerHTML;
-                }
-                var f_summary = table.summary;
-                var f_width = parseInt(table.style.width);
-                isNaN(f_width) && (f_width = "");
-                var f_unit = /%/.test(table.style.width) ? 'percent' : 'pixels';
-                var f_align = table.align;
-                var f_spacing = table.cellSpacing;
-                var f_padding = table.cellPadding;
-                var f_borders = table.border;
-                var f_frames = table.frame;
-                var f_rules = table.rules;
-
-                function selected(val) {
-                        return val ? " selected" : "";
-                }
-
-                // dialog contents
-                dialog.content.style.width = "400px";
-                dialog.content.innerHTML = " \
-<div class='title'>" + Xinha._lc("Table Properties", "TableOperations") + "\
-</div> \
-<table style='width:100%'> \
-  <tr> \
-    <td> \
-      <fieldset><legend>" + Xinha._lc("Description", "TableOperations") + "</legend> \
-       <table style='width:100%'> \
-        <tr> \
-          <td class='label'>" + Xinha._lc("Caption", "TableOperations") + ":</td> \
-          <td class='value'><input type='text' name='f_caption' value='" + f_caption + "'/></td> \
-        </tr><tr> \
-          <td class='label'>" + Xinha._lc("Summary", "TableOperations") + ":</td> \
-          <td class='value'><input type='text' name='f_summary' value='" + f_summary + "'/></td> \
-        </tr> \
-       </table> \
-      </fieldset> \
-    </td> \
-  </tr> \
-  <tr><td id='--HA-layout'></td></tr> \
-  <tr> \
-    <td> \
-      <fieldset><legend>" + Xinha._lc("Spacing and padding", "TableOperations") + "</legend> \
-       <table style='width:100%'> \
-"+//        <tr> \
-//           <td class='label'>" + Xinha._lc("Width", "TableOperations") + ":</td> \
-//           <td><input type='text' name='f_width' value='" + f_width + "' size='5' /> \
-//             <select name='f_unit'> \
-//               <option value='%'" + selected(f_unit == "percent") + ">" + Xinha._lc("percent", "TableOperations") + "</option> \
-//               <option value='px'" + selected(f_unit == "pixels") + ">" + Xinha._lc("pixels", "TableOperations") + "</option> \
-//             </select> &nbsp;&nbsp;" + Xinha._lc("Align", "TableOperations") + ": \
-//             <select name='f_align'> \
-//               <option value='left'" + selected(f_align == "left") + ">" + Xinha._lc("Left", "TableOperations") + "</option> \
-//               <option value='center'" + selected(f_align == "center") + ">" + Xinha._lc("Center", "TableOperations") + "</option> \
-//               <option value='right'" + selected(f_align == "right") + ">" + Xinha._lc("Right", "TableOperations") + "</option> \
-//             </select> \
-//           </td> \
-//         </tr> \
-"        <tr> \
-          <td class='label'>" + Xinha._lc("Spacing", "TableOperations") + ":</td> \
-          <td><input type='text' name='f_spacing' size='5' value='" + f_spacing + "' /> &nbsp;" + Xinha._lc("Padding", "TableOperations") + ":\
-            <input type='text' name='f_padding' size='5' value='" + f_padding + "' /> &nbsp;&nbsp;" + Xinha._lc("pixels", "TableOperations") + "\
-          </td> \
-        </tr> \
-       </table> \
-      </fieldset> \
-    </td> \
-  </tr> \
-  <tr> \
-    <td> \
-      <fieldset><legend>" + Xinha._lc("Frame and borders", "TableOperations") + "</legend> \
-        <table width='100%'> \
-          <tr> \
-            <td class='label'>" + Xinha._lc("Borders", "TableOperations") + ":</td> \
-            <td><input name='f_borders' type='text' size='5' value='" + f_borders + "' /> &nbsp;&nbsp;" + Xinha._lc("pixels", "TableOperations") + "</td> \
-          </tr> \
-          <tr> \
-            <td class='label'>" + Xinha._lc("Frames", "TableOperations") + ":</td> \
-            <td> \
-              <select name='f_frames'> \
-                <option value='void'" + selected(f_frames == "void") + ">" + Xinha._lc("No sides", "TableOperations") + "</option> \
-                <option value='above'" + selected(f_frames == "above") + ">" + Xinha._lc("The top side only", "TableOperations") + "</option> \
-                <option value='below'" + selected(f_frames == "below") + ">" + Xinha._lc("The bottom side only", "TableOperations") + "</option> \
-                <option value='hsides'" + selected(f_frames == "hsides") + ">" + Xinha._lc("The top and bottom sides only", "TableOperations") + "</option> \
-                <option value='vsides'" + selected(f_frames == "vsides") + ">" + Xinha._lc("The right and left sides only", "TableOperations") + "</option> \
-                <option value='lhs'" + selected(f_frames == "lhs") + ">" + Xinha._lc("The left-hand side only", "TableOperations") + "</option> \
-                <option value='rhs'" + selected(f_frames == "rhs") + ">" + Xinha._lc("The right-hand side only", "TableOperations") + "</option> \
-                <option value='box'" + selected(f_frames == "box") + ">" + Xinha._lc("All four sides", "TableOperations") + "</option> \
-              </select> \
-            </td> \
-          </tr> \
-          <tr> \
-            <td class='label'>" + Xinha._lc("Rules", "TableOperations") + ":</td> \
-            <td> \
-              <select name='f_rules'> \
-                <option value='none'" + selected(f_rules == "none") + ">" + Xinha._lc("No rules", "TableOperations") + "</option> \
-                <option value='rows'" + selected(f_rules == "rows") + ">" + Xinha._lc("Rules will appear between rows only", "TableOperations") + "</option> \
-                <option value='cols'" + selected(f_rules == "cols") + ">" + Xinha._lc("Rules will appear between columns only", "TableOperations") + "</option> \
-                <option value='all'" + selected(f_rules == "all") + ">" + Xinha._lc("Rules will appear between all rows and columns", "TableOperations") + "</option> \
-              </select> \
-            </td> \
-          </tr> \
-        </table> \
-      </fieldset> \
-    </td> \
-  </tr> \
-  <tr> \
-    <td id='--HA-style'></td> \
-  </tr> \
-</table> \
-";
-                var st_prop = TableOperations.createStyleFieldset(dialog.doc, dialog.editor, table);
-                var p = dialog.doc.getElementById("--HA-style");
-                p.appendChild(st_prop);
-                var st_layout = TableOperations.createStyleLayoutFieldset(dialog.doc, dialog.editor, table);
-                p = dialog.doc.getElementById("--HA-layout");
-                p.appendChild(st_layout);
-                dialog.modal = true;
-                dialog.addButtons("OK", "Cancel");
-                dialog.showAtElement(dialog.editor._iframe, "c");
-        });
-};
-
-// this function requires the file PopupDiv/PopupWin to be loaded from browser
-TableOperations.prototype.dialogRowCellProperties = function(cell) {
-        // retrieve existing values
-        var element = this.getClosest(cell ? "td" : "tr");
-        var table = this.getClosest("table");
-        // this.editor.selectNodeContents(element);
-        // this.editor.updateToolbar();
-
-        var dialog = new PopupWin(this.editor, cell ? Xinha._lc("Cell Properties", "TableOperations") : Xinha._lc("Row Properties", "TableOperations"), function(dialog, params) {
-                TableOperations.processStyle(params, element);
-                for (var i in params) {
-      if(typeof params[i] == 'function') continue;
-                        var val = params[i];
-                        switch (i) {
-                            case "f_align":
-                                element.align = val;
-                                break;
-                            case "f_char":
-                                element.ch = val;
-                                break;
-                            case "f_valign":
-                                element.vAlign = val;
-                                break;
-                        }
-                }
-                // various workarounds to refresh the table display (Gecko,
-                // what's going on?! do not disappoint me!)
-                dialog.editor.forceRedraw();
-                dialog.editor.focusEditor();
-                dialog.editor.updateToolbar();
-                var save_collapse = table.style.borderCollapse;
-                table.style.borderCollapse = "collapse";
-                table.style.borderCollapse = "separate";
-                table.style.borderCollapse = save_collapse;
-        },
-
-        // this function gets called when the dialog needs to be initialized
-        function (dialog) {
-
-                var f_align = element.align;
-                var f_valign = element.vAlign;
-                var f_char = element.ch;
-
-                function selected(val) {
-                        return val ? " selected" : "";
-                }
-
-                // dialog contents
-                dialog.content.style.width = "400px";
-                dialog.content.innerHTML = " \
-<div class='title'>" + Xinha._lc(cell ? "Cell Properties" : "Row Properties", "TableOperations") + "</div> \
-<table style='width:100%'> \
-  <tr> \
-    <td id='--HA-layout'> \
-"+//      <fieldset><legend>" + Xinha._lc("Layout", "TableOperations") + "</legend> \
-//        <table style='width:100%'> \
-//         <tr> \
-//           <td class='label'>" + Xinha._lc("Align", "TableOperations") + ":</td> \
-//           <td> \
-//             <select name='f_align'> \
-//               <option value='left'" + selected(f_align == "left") + ">" + Xinha._lc("Left", "TableOperations") + "</option> \
-//               <option value='center'" + selected(f_align == "center") + ">" + Xinha._lc("Center", "TableOperations") + "</option> \
-//               <option value='right'" + selected(f_align == "right") + ">" + Xinha._lc("Right", "TableOperations") + "</option> \
-//               <option value='char'" + selected(f_align == "char") + ">" + Xinha._lc("Char", "TableOperations") + "</option> \
-//             </select> \
-//             &nbsp;&nbsp;" + Xinha._lc("Char", "TableOperations") + ": \
-//             <input type='text' style='font-family: monospace; text-align: center' name='f_char' size='1' value='" + f_char + "' /> \
-//           </td> \
-//         </tr><tr> \
-//           <td class='label'>" + Xinha._lc("Vertical align", "TableOperations") + ":</td> \
-//           <td> \
-//             <select name='f_valign'> \
-//               <option value='top'" + selected(f_valign == "top") + ">" + Xinha._lc("Top", "TableOperations") + "</option> \
-//               <option value='middle'" + selected(f_valign == "middle") + ">" + Xinha._lc("Middle", "TableOperations") + "</option> \
-//               <option value='bottom'" + selected(f_valign == "bottom") + ">" + Xinha._lc("Bottom", "TableOperations") + "</option> \
-//               <option value='baseline'" + selected(f_valign == "baseline") + ">" + Xinha._lc("Baseline", "TableOperations") + "</option> \
-//             </select> \
-//           </td> \
-//         </tr> \
-//        </table> \
-//       </fieldset> \
-"    </td> \
-  </tr> \
-  <tr> \
-    <td id='--HA-style'></td> \
-  </tr> \
-</table> \
-";
-                var st_prop = TableOperations.createStyleFieldset(dialog.doc, dialog.editor, element);
-                var p = dialog.doc.getElementById("--HA-style");
-                p.appendChild(st_prop);
-                var st_layout = TableOperations.createStyleLayoutFieldset(dialog.doc, dialog.editor, element);
-                p = dialog.doc.getElementById("--HA-layout");
-                p.appendChild(st_layout);
-                dialog.modal = true;
-                dialog.addButtons("OK", "Cancel");
-                dialog.showAtElement(dialog.editor._iframe, "c");
-        });
 };
 
@@ -519 +229 @@
                 // ROWS
 
-            case "TO-row-insert-above":
-            case "TO-row-insert-under":
+                case "TO-row-insert-above":
+                case "TO-row-insert-under":
                 var tr = this.getClosest("tr");
                 if (!tr) {
@@ -531 +241 @@
                 editor.focusEditor();
                 break;
-            case "TO-row-delete":
+                case "TO-row-delete":
                 var tr = this.getClosest("tr");
                 if (!tr) {
@@ -549 +259 @@
                 editor.updateToolbar();
                 break;
-            case "TO-row-split":
+                case "TO-row-split":
                 var td = this.getClosest("td");
                 if (!td) {
@@ -559 +269 @@
                 // COLUMNS
 
-            case "TO-col-insert-before":
-            case "TO-col-insert-after":
+                case "TO-col-insert-before":
+                case "TO-col-insert-after":
                 var td = this.getClosest("td");
                 if (!td) {
@@ -567 +277 @@
                 var rows = td.parentNode.parentNode.rows;
                 var index = td.cellIndex;
-    var lastColumn = (td.parentNode.cells.length == index + 1);
+        var lastColumn = (td.parentNode.cells.length == index + 1);
                 for (var i = rows.length; --i >= 0;) {
                         var tr = rows[i];                       
                         var otd = editor._doc.createElement("td");
                         otd.innerHTML = mozbr;
-      if (lastColumn && Xinha.is_ie) 
-      {
-        tr.insertBefore(otd);
-      } 
-      else 
-      {
-        var ref = tr.cells[index + (/after/.test(button_id) ? 1 : 0)];
-        tr.insertBefore(otd, ref);
-      }
+          if (lastColumn && Xinha.is_ie) 
+          {
+                tr.insertBefore(otd);
+          } 
+          else 
+          {
+                var ref = tr.cells[index + (/after/.test(button_id) ? 1 : 0)];
+                tr.insertBefore(otd, ref);
+          }
                 }
                 editor.focusEditor();
                 break;
-            case "TO-col-split":
+                case "TO-col-split":
                 var td = this.getClosest("td");
                 if (!td) {
@@ -591 +301 @@
                 splitCol(td);
                 break;
-            case "TO-col-delete":
+                case "TO-col-delete":
                 var td = this.getClosest("td");
                 if (!td) {
@@ -615 +325 @@
                 // CELLS
 
-            case "TO-cell-split":
+                case "TO-cell-split":
                 var td = this.getClosest("td");
                 if (!td) {
@@ -622 +332 @@
                 splitCell(td);
                 break;
-            case "TO-cell-insert-before":
-            case "TO-cell-insert-after":
+                case "TO-cell-insert-before":
+                case "TO-cell-insert-after":
                 var td = this.getClosest("td");
                 if (!td) {
@@ -635 +345 @@
                 editor.focusEditor();
                 break;
-            case "TO-cell-delete":
+                case "TO-cell-delete":
                 var td = this.getClosest("td");
                 if (!td) {
@@ -650 +360 @@
                 editor.updateToolbar();
                 break;
-            case "TO-cell-merge":
+                case "TO-cell-merge":
                 //Mozilla, as opposed to IE, allows the selection of several cells, which is fine :)
                 var sel = editor._getSelection();
@@ -690 +400 @@
                                 break;
                         }
-                        editor._popupDialog("plugin://TableOperations/merge_cells.html", function(param) {
-                                if (!param) {   // user pressed Cancel
-                                        return false;
-                                }
-                                no_cols = parseInt(param['f_cols'],10) + 1;
-                                no_rows = parseInt(param['f_rows'],10) + 1;
-                                var tr = td.parentNode;
-                                var cell_index = td.cellIndex;
-                                var row_index = tr.rowIndex;
-                                var table = tr.parentNode;
-                                cellMerge(table, cell_index, row_index, no_cols, no_rows);
-                        }, null);       
+                        var tr = td.parentNode;
+                        var cell_index = td.cellIndex;
+                        var row_index = tr.rowIndex;
+                        // pass cellMerge and the indices so apply() can call cellMerge and know 
+                        // what cell was selected when the dialog was opened
+                        this.dialogMerge(cellMerge, cell_index, row_index);
                 }
                 break;
@@ -707 +411 @@
                 // PROPERTIES
 
-            case "TO-table-prop":
+                case "TO-table-prop":
                 this.dialogTableProperties();
                 break;
 
-            case "TO-row-prop":
+                case "TO-row-prop":
                 this.dialogRowCellProperties(false);
                 break;
 
-            case "TO-cell-prop":
+                case "TO-cell-prop":
                 this.dialogRowCellProperties(true);
                 break;
 
-            default:
+                default:
                 alert("Button [" + button_id + "] not yet implemented");
         }
@@ -727 +431 @@
 TableOperations.btnList = [
         // table properties button
-    ["table-prop",       "table", "Table properties"],
+        ["table-prop",       "table", "Table properties"],
         null,                   // separator
 
@@ -754 +458 @@
         ];
 
-
-
-//// GENERIC CODE [style of any element; this should be moved into a separate
-//// file as it'll be very useful]
-//// BEGIN GENERIC CODE -----------------------------------------------------
-
-TableOperations.getLength = function(value) {
-        var len = parseInt(value);
-        if (isNaN(len)) {
-                len = "";
-        }
-        return len;
+TableOperations.prototype.dialogMerge = function(merge_func, cell_index, row_index) {
+  var table = this.getClosest("table");
+  var self = this;
+  var editor = this.editor;
+
+  if (!this.dialogMergeCellsHtml) {
+    Xinha._getback(Xinha.getPluginDir("TableOperations") + '/popups/dialogMergeCells.html', function(getback) { self.dialogMergeCellsHtml = getback; self.dialogMerge(merge_func, cell_index, row_index); });
+    return;
+  }
+
+  if (!this.dialogMergeCells) {
+    this.dialogMergeCells = new Xinha.Dialog(editor, this.dialogMergeCellsHtml, 'TableOperations', {width:400});
+    this.dialogMergeCells.getElementById('cancel').onclick = function() { self.dialogMergeCells.hide(); };
+  }
+
+  var dialog = this.dialogMergeCells;
+  function apply() {
+    dialog.hide();
+    no_cols = parseInt(dialog.getElementById('f_cols').value,10) + 1;
+    no_rows = parseInt(dialog.getElementById('f_rows').value,10) + 1;
+    merge_func(table, cell_index, row_index, no_cols, no_rows);    
+    return
+  }
+
+  this.dialogMergeCells.getElementById('ok').onclick = apply;
+  this.dialogMergeCells.show();
+  this.dialogMergeCells.getElementById('f_cols').focus();
+}
+
+TableOperations.prototype.dialogTableProperties = function() {
+
+        var table = this.getClosest("table");
+        var self = this;
+        var editor = this.editor;
+
+        if(!this.dialogTablePropertiesHtml){ // retrieve the raw dialog contents
+                Xinha._getback( Xinha.getPluginDir("TableOperations") + '/popups/dialogTable.html', function(getback) { self.dialogTablePropertiesHtml = getback; self.dialogTableProperties(); });
+                return;
+        }
+        if (!this.dialogTable) {
+                // Now we have everything we need, so we can build the dialog.
+                this.dialogTable = new Xinha.Dialog(editor, this.dialogTablePropertiesHtml, 'TableOperations',{width:440})
+                this.dialogTable.getElementById('cancel').onclick = function() { self.dialogTable.hide()};
+        }
+        var dialog = this.dialogTable;
+        
+        var Styler = new Xinha.InlineStyler(table, this.editor);
+        
+        function apply() {
+                var params = dialog.hide();
+                Styler.applyStyle(params);
+                
+                for (var i in params) {
+          if(typeof params[i] == 'function') continue;
+                        var val = params[i];
+                        if (typeof val == 'object' && val.tagName) val = val.value;
+                        switch (i) {
+                                case "caption":
+                                if (/\S/.test(val)) {
+                                        // contains non white-space characters
+                                        var caption = table.getElementsByTagName("caption")[0];
+                                        if (!caption) {
+                                                caption = dialog.editor._doc.createElement("caption");
+                                                table.insertBefore(caption, table.firstChild);
+                                        }
+                                        caption.innerHTML = val;
+                                } else {
+                                        // search for caption and delete it if found
+                                        var caption = table.getElementsByTagName("caption")[0];
+                                        if (caption) {
+                                                caption.parentNode.removeChild(caption);
+                                        }
+                                }
+                                break;
+                                case "summary":
+                                table.summary = val;
+                                break;
+                                case "width":
+                                table.style.width = ("" + val) + params.f_unit;
+                                break;
+                                case "align":
+                                table.align = val;
+                                break;
+                                case "spacing":
+                                table.cellSpacing = val;
+                                break;
+                                case "padding":
+                                table.cellPadding = val;
+                                break;
+                                case "borders":
+                                table.border = val;
+                                break;
+                                case "frames":
+                                table.frame = val;
+                                break;
+                                case "rules":
+                                table.rules = val;
+                                break;
+                        }
+                }
+
+                // various workarounds to refresh the table display (Gecko,
+                // what's going on?! do not disappoint me!)
+                self.editor.forceRedraw();
+                self.editor.focusEditor();
+                self.editor.updateToolbar();
+                var save_collapse = table.style.borderCollapse;
+                table.style.borderCollapse = "collapse";
+                table.style.borderCollapse = "separate";
+                table.style.borderCollapse = save_collapse;
+        }
+        
+        var st_layout = Styler.createStyleLayoutFieldset();
+        var p = dialog.getElementById("TO_layout");
+        p.replaceChild(st_layout,p.firstChild);
+        
+        var st_prop = Styler.createStyleFieldset();
+        p = dialog.getElementById("TO_style");
+        p.replaceChild(st_prop,p.firstChild);
+
+        this.dialogTable.getElementById('ok').onclick = apply;
+
+        // gather element's values
+        var values = {};
+        var capel = table.getElementsByTagName("caption")[0];
+        if (capel) {
+                values['caption'] = capel.innerHTML;
+        }
+        else values['caption'] = "";
+        values['summary'] = table.summary;
+        
+        values['spacing'] = table.cellSpacing;
+        values['padding'] = table.cellPadding;
+        var f_borders = table.border;
+        
+        values['frames'] = table.frame;
+        values['rules'] = table.rules;
+        
+        this.dialogTable.show(values);
 };
 
-// Applies the style found in "params" to the given element.
-TableOperations.processStyle = function(params, element) {
-        var style = element.style;
-        for (var i in params) {
-    if(typeof params[i] == 'function') continue;
-                var val = params[i];
-                switch (i) {
-                    case "f_st_backgroundColor":
-                        style.backgroundColor = val;
-                        break;
-                    case "f_st_color":
-                        style.color = val;
-                        break;
-                    case "f_st_backgroundImage":
-                        if (/\S/.test(val)) {
-                                style.backgroundImage = "url(" + val + ")";
-                        } else {
-                                style.backgroundImage = "none";
-                        }
-                        break;
-                    case "f_st_borderWidth":
-                        style.borderWidth = val;
-                        break;
-                    case "f_st_borderStyle":
-                        style.borderStyle = val;
-                        break;
-                    case "f_st_borderColor":
-                        style.borderColor = val;
-                        break;
-                    case "f_st_borderCollapse":
-                        style.borderCollapse = val ? "collapse" : "";
-                        break;
-                    case "f_st_width":
-                        if (/\S/.test(val)) {
-                                style.width = val + params["f_st_widthUnit"];
-                        } else {
-                                style.width = "";
-                        }
-                        break;
-                    case "f_st_height":
-                        if (/\S/.test(val)) {
-                                style.height = val + params["f_st_heightUnit"];
-                        } else {
-                                style.height = "";
-                        }
-                        break;
-                    case "f_st_textAlign":
-                        if (val == "char") {
-                                var ch = params["f_st_textAlignChar"];
-                                if (ch == '"') {
-                                        ch = '\\"';
-                                }
-                                style.textAlign = '"' + ch + '"';
-                        } else if (val == "-") {
-                            style.textAlign = "";
-                        } else {
-                                style.textAlign = val;
-                        }
-                        break;
-                    case "f_st_verticalAlign":
-                    element.vAlign = "";
-                        if (val == "-") {
-                            style.verticalAlign = "";
-                            
-                    } else {
-                            style.verticalAlign = val;
-                        }
-                        break;
-                        case "f_st_float":
-                        if (Xinha.is_ie) {
-                                style.styleFloat = val;
-                        }
-                        else {
-                                style.cssFloat = val;
-                        }
-                        break;
-//                  case "f_st_margin":
-//                      style.margin = val + "px";
-//                      break;
-//                  case "f_st_padding":
-//                      style.padding = val + "px";
-//                      break;
-                }
-        }
+TableOperations.prototype.dialogRowCellProperties = function(cell) {
+        // retrieve existing values
+        var element = this.getClosest(cell ? "td" : "tr");
+        var table = this.getClosest("table");
+
+        var self = this;
+        var editor = this.editor;
+
+        if(!self.dialogRowCellPropertiesHtml) // retrieve the raw dialog contents
+        {
+                Xinha._getback( Xinha.getPluginDir("TableOperations") + '/popups/dialogRowCell.html', function(getback) { self.dialogRowCellPropertiesHtml = getback; self.dialogRowCellProperties(cell); });
+                return;
+        }
+        if (!this.dialogRowCell) {
+                // Now we have everything we need, so we can build the dialog.
+                this.dialogRowCell = new Xinha.Dialog(editor, self.dialogRowCellPropertiesHtml, 'TableOperations',{width:440})
+                this.dialogRowCell.getElementById('cancel').onclick = function() { self.dialogRowCell.hide()};
+        }
+        
+        var dialog = this.dialogRowCell;
+        dialog.getElementById('title').innerHTML = cell ? Xinha._lc("Cell Properties", "TableOperations") : Xinha._lc("Row Properties", "TableOperations");
+  var Styler = new Xinha.InlineStyler(element, self.editor);
+        
+        function apply() {
+                var params = dialog.hide();
+                Styler.applyStyle();
+                
+                // various workarounds to refresh the table display (Gecko,
+                // what's going on?! do not disappoint me!)
+                self.editor.forceRedraw();
+                self.editor.focusEditor();
+                self.editor.updateToolbar();
+                var save_collapse = table.style.borderCollapse;
+                table.style.borderCollapse = "collapse";
+                table.style.borderCollapse = "separate";
+                table.style.borderCollapse = save_collapse;
+        }
+        
+        var st_layout = Styler.createStyleLayoutFieldset();
+        var p = dialog.getElementById("TO_layout");
+
+        p.replaceChild(st_layout,p.firstChild);
+        
+        var st_prop = Styler.createStyleFieldset();
+        p = dialog.getElementById("TO_style");
+        p.replaceChild(st_prop,p.firstChild);
+
+        this.dialogRowCell.getElementById('ok').onclick = apply;
+        this.dialogRowCell.show();
 };
-
-// Returns an HTML element for a widget that allows color selection.  That is,
-// a button that contains the given color, if any, and when pressed will popup
-// the sooner-or-later-to-be-rewritten select_color.html dialog allowing user
-// to select some color.  If a color is selected, an input field with the name
-// "f_st_"+name will be updated with the color value in #123456 format.
-TableOperations.createColorButton = function(doc, editor, color, name) {
-        if (!color) {
-                color = "";
-        } else if (!/#/.test(color)) {
-                color = Xinha._colorToRgb(color);
-        }
-
-        var df = doc.createElement("span");
-        var field = doc.createElement("input");
-        field.type = "hidden";
-        df.appendChild(field);
-        field.name = "f_st_" + name;
-        field.value = color;
-        var button = doc.createElement("span");
-        button.className = "buttonColor";
-        df.appendChild(button);
-        var span = doc.createElement("span");
-        span.className = "chooser";
-        // span.innerHTML = "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;";
-        span.style.backgroundColor = color;
-        button.appendChild(span);
-        button.onmouseover = function() { if (!this.disabled) { this.className += " buttonColor-hilite"; }};
-        button.onmouseout = function() { if (!this.disabled) { this.className = "buttonColor"; }};
-        span.onclick = function() {
-                if (this.parentNode.disabled) {
-                        return false;
-                }
-                editor._popupDialog("select_color.html", function(color) {
-                        if (color) {
-                                span.style.backgroundColor = "#" + color;
-                                field.value = "#" + color;
-                        }
-                }, color);
-        };
-        var span2 = doc.createElement("span");
-        span2.innerHTML = "&#x00d7;";
-        span2.className = "nocolor";
-        span2.title = Xinha._lc("Unset color", "TableOperations");
-        button.appendChild(span2);
-        span2.onmouseover = function() { if (!this.parentNode.disabled) { this.className += " nocolor-hilite"; }};
-        span2.onmouseout = function() { if (!this.parentNode.disabled) { this.className = "nocolor"; }};
-        span2.onclick = function() {
-                span.style.backgroundColor = "";
-                field.value = "";
-        };
-        return df;
-};
-
-TableOperations.createStyleLayoutFieldset = function(doc, editor, el) {
-        var fieldset = doc.createElement("fieldset");
-        var legend = doc.createElement("legend");
-        fieldset.appendChild(legend);
-        legend.innerHTML = Xinha._lc("Layout", "TableOperations");
-        var table = doc.createElement("table");
-        fieldset.appendChild(table);
-        table.style.width = "100%";
-        var tbody = doc.createElement("tbody");
-        table.appendChild(tbody);
-
-        var tagname = el.tagName.toLowerCase();
-        var tr, td, input, select, option, options, i;
-
-        if (tagname != "td" && tagname != "tr" && tagname != "th") {
-                tr = doc.createElement("tr");
-                tbody.appendChild(tr);
-                td = doc.createElement("td");
-                td.className = "label";
-                tr.appendChild(td);
-                td.innerHTML = Xinha._lc("Float", "TableOperations") + ":";
-                td = doc.createElement("td");
-                tr.appendChild(td);
-                select = doc.createElement("select");
-                td.appendChild(select);
-                select.name = "f_st_float";
-                options = ["None", "Left", "Right"];
-                for (var i = 0; i < options.length; ++i) {
-                        var Val = options[i];
-                        var val = options[i].toLowerCase();
-                        option = doc.createElement("option");
-                        option.innerHTML = Xinha._lc(Val, "TableOperations");
-                        option.value = val;
-                        if (Xinha.is_ie) {
-                                option.selected = (("" + el.style.styleFloat).toLowerCase() == val);
-                        }
-                        else {
-                                option.selected = (("" + el.style.cssFloat).toLowerCase() == val);
-                        }
-                        select.appendChild(option);
-                }
-        }
-
-        tr = doc.createElement("tr");
-        tbody.appendChild(tr);
-        td = doc.createElement("td");
-        td.className = "label";
-        tr.appendChild(td);
-        td.innerHTML = Xinha._lc("Width", "TableOperations") + ":";
-        td = doc.createElement("td");
-        tr.appendChild(td);
-        input = doc.createElement("input");
-        input.type = "text";
-        input.value = TableOperations.getLength(el.style.width);
-        input.size = "5";
-        input.name = "f_st_width";
-        input.style.marginRight = "0.5em";
-        td.appendChild(input);
-        select = doc.createElement("select");
-        select.name = "f_st_widthUnit";
-        option = doc.createElement("option");
-        option.innerHTML = Xinha._lc("percent", "TableOperations");
-        option.value = "%";
-        option.selected = /%/.test(el.style.width);
-        select.appendChild(option);
-        option = doc.createElement("option");
-        option.innerHTML = Xinha._lc("pixels", "TableOperations");
-        option.value = "px";
-        option.selected = /px/.test(el.style.width);
-        select.appendChild(option);
-        td.appendChild(select);
-
-        select.style.marginRight = "0.5em";
-        td.appendChild(doc.createTextNode(Xinha._lc("Text align", "TableOperations") + ":"));
-        select = doc.createElement("select");
-        select.style.marginLeft = select.style.marginRight = "0.5em";
-        td.appendChild(select);
-        select.name = "f_st_textAlign";
-        options = ["Left", "Center", "Right", "Justify", "-"];
-        if (tagname == "td") {
-                options.push("Char");
-        }
-        input = doc.createElement("input");
-        input.name = "f_st_textAlignChar";
-        input.size = "1";
-        input.style.fontFamily = "monospace";
-        td.appendChild(input);
-        for (var i = 0; i < options.length; ++i) {
-                var Val = options[i];
-                var val = Val.toLowerCase();
-                option = doc.createElement("option");
-                option.value = val;
-                option.innerHTML = Xinha._lc(Val, "TableOperations");
-                option.selected = ((el.style.textAlign.toLowerCase() == val) || (el.style.textAlign == "" && Val == "-"));
-                select.appendChild(option);
-        }
-        function setCharVisibility(value) {
-                input.style.visibility = value ? "visible" : "hidden";
-                if (value) {
-                        input.focus();
-                        input.select();
-                }
-        }
-        select.onchange = function() { setCharVisibility(this.value == "char"); };
-        setCharVisibility(select.value == "char");
-
-        tr = doc.createElement("tr");
-        tbody.appendChild(tr);
-        td = doc.createElement("td");
-        td.className = "label";
-        tr.appendChild(td);
-        td.innerHTML = Xinha._lc("Height", "TableOperations") + ":";
-        td = doc.createElement("td");
-        tr.appendChild(td);
-        input = doc.createElement("input");
-        input.type = "text";
-        input.value = TableOperations.getLength(el.style.height);
-        input.size = "5";
-        input.name = "f_st_height";
-        input.style.marginRight = "0.5em";
-        td.appendChild(input);
-        select = doc.createElement("select");
-        select.name = "f_st_heightUnit";
-        option = doc.createElement("option");
-        option.innerHTML = Xinha._lc("percent", "TableOperations");
-        option.value = "%";
-        option.selected = /%/.test(el.style.height);
-        select.appendChild(option);
-        option = doc.createElement("option");
-        option.innerHTML = Xinha._lc("pixels", "TableOperations");
-        option.value = "px";
-        option.selected = /px/.test(el.style.height);
-        select.appendChild(option);
-        td.appendChild(select);
-
-        select.style.marginRight = "0.5em";
-        td.appendChild(doc.createTextNode(Xinha._lc("Vertical align", "TableOperations") + ":"));
-        select = doc.createElement("select");
-        select.name = "f_st_verticalAlign";
-        select.style.marginLeft = "0.5em";
-        td.appendChild(select);
-        options = ["Top", "Middle", "Bottom", "Baseline", "-"];
-        for (var i = 0; i < options.length; ++i) {
-                var Val = options[i];
-                var val = Val.toLowerCase();
-                option = doc.createElement("option");
-                option.value = val;
-                option.innerHTML = Xinha._lc(Val, "TableOperations");
-                option.selected = ((el.style.verticalAlign.toLowerCase() == val) || (el.style.verticalAlign == "" && Val == "-"));
-                select.appendChild(option);
-        }
-
-        return fieldset;
-};
-
-// Returns an HTML element containing the style attributes for the given
-// element.  This can be easily embedded into any dialog; the functionality is
-// also provided.
-TableOperations.createStyleFieldset = function(doc, editor, el) {
-        var fieldset = doc.createElement("fieldset");
-        var legend = doc.createElement("legend");
-        fieldset.appendChild(legend);
-        legend.innerHTML = Xinha._lc("CSS Style", "TableOperations");
-        var table = doc.createElement("table");
-        fieldset.appendChild(table);
-        table.style.width = "100%";
-        var tbody = doc.createElement("tbody");
-        table.appendChild(tbody);
-
-        var tr, td, input, select, option, options, i;
-
-        tr = doc.createElement("tr");
-        tbody.appendChild(tr);
-        td = doc.createElement("td");
-        tr.appendChild(td);
-        td.className = "label";
-        td.innerHTML = Xinha._lc("Background", "TableOperations") + ":";
-        td = doc.createElement("td");
-        tr.appendChild(td);
-        var df = TableOperations.createColorButton(doc, editor, el.style.backgroundColor, "backgroundColor");
-        df.firstChild.nextSibling.style.marginRight = "0.5em";
-        td.appendChild(df);
-        td.appendChild(doc.createTextNode(Xinha._lc("Image URL", "TableOperations") + ": "));
-        input = doc.createElement("input");
-        input.type = "text";
-        input.name = "f_st_backgroundImage";
-        if (el.style.backgroundImage.match(/url\(\s*(.*?)\s*\)/)) {
-                input.value = RegExp.$1;
-        }
-        // input.style.width = "100%";
-        td.appendChild(input);
-
-        tr = doc.createElement("tr");
-        tbody.appendChild(tr);
-        td = doc.createElement("td");
-        tr.appendChild(td);
-        td.className = "label";
-        td.innerHTML = Xinha._lc("FG Color", "TableOperations") + ":";
-        td = doc.createElement("td");
-        tr.appendChild(td);
-        td.appendChild(TableOperations.createColorButton(doc, editor, el.style.color, "color"));
-
-        // for better alignment we include an invisible field.
-        input = doc.createElement("input");
-        input.style.visibility = "hidden";
-        input.type = "text";
-        td.appendChild(input);
-
-        tr = doc.createElement("tr");
-        tbody.appendChild(tr);
-        td = doc.createElement("td");
-        tr.appendChild(td);
-        td.className = "label";
-        td.innerHTML = Xinha._lc("Border", "TableOperations") + ":";
-        td = doc.createElement("td");
-        tr.appendChild(td);
-
-        var colorButton = TableOperations.createColorButton(doc, editor, el.style.borderColor, "borderColor");
-        var btn = colorButton.firstChild.nextSibling;
-        td.appendChild(colorButton);
-        // borderFields.push(btn);
-        btn.style.marginRight = "0.5em";
-
-        select = doc.createElement("select");
-        var borderFields = [];
-        td.appendChild(select);
-        select.name = "f_st_borderStyle";
-        options = ["none", "dotted", "dashed", "solid", "double", "groove", "ridge", "inset", "outset"];
-        var currentBorderStyle = el.style.borderStyle;
-        // Gecko reports "solid solid solid solid" for "border-style: solid".
-        // That is, "top right bottom left" -- we only consider the first
-        // value.
-        if (currentBorderStyle.match(/([^\s]*)\s/)) currentBorderStyle = RegExp.$1;
-        for (var i=0;i<options.length;i++) {
-                var val = options[i];
-                option = doc.createElement("option");
-                option.value = val;
-                option.innerHTML = val;
-                if (val == currentBorderStyle) option.selected = true;
-                select.appendChild(option);
-        }
-        select.style.marginRight = "0.5em";
-        function setBorderFieldsStatus(value) {
-                for (var i = 0; i < borderFields.length; ++i) {
-                        var el = borderFields[i];
-                        el.style.visibility = value ? "hidden" : "visible";
-                        if (!value && (el.tagName.toLowerCase() == "input")) {
-                                el.focus();
-                                el.select();
-                        }
-                }
-        }
-        select.onchange = function() { setBorderFieldsStatus(this.value == "none"); };
-
-        input = doc.createElement("input");
-        borderFields.push(input);
-        input.type = "text";
-        input.name = "f_st_borderWidth";
-        input.value = TableOperations.getLength(el.style.borderWidth);
-        input.size = "5";
-        td.appendChild(input);
-        input.style.marginRight = "0.5em";
-        var span = doc.createElement("span");
-        span.innerHTML = Xinha._lc("pixels", "TableOperations");
-        td.appendChild(span);
-        borderFields.push(span);
-
-        setBorderFieldsStatus(select.value == "none");
-
-        if (el.tagName.toLowerCase() == "table") {
-                // the border-collapse style is only for tables
-                tr = doc.createElement("tr");
-                tbody.appendChild(tr);
-                td = doc.createElement("td");
-                td.className = "label";
-                tr.appendChild(td);
-                input = doc.createElement("input");
-                input.type = "checkbox";
-                input.name = "f_st_borderCollapse";
-                input.id = "f_st_borderCollapse";
-                var val = (/collapse/i.test(el.style.borderCollapse));
-                input.checked = val ? 1 : 0;
-                td.appendChild(input);
-
-                td = doc.createElement("td");
-                tr.appendChild(td);
-                var label = doc.createElement("label");
-                label.htmlFor = "f_st_borderCollapse";
-                label.innerHTML = Xinha._lc("Collapsed borders", "TableOperations");
-                td.appendChild(label);
-        }
-
-//      tr = doc.createElement("tr");
-//      tbody.appendChild(tr);
-//      td = doc.createElement("td");
-//      td.className = "label";
-//      tr.appendChild(td);
-//      td.innerHTML = Xinha._lc("Margin", "TableOperations") + ":";
-//      td = doc.createElement("td");
-//      tr.appendChild(td);
-//      input = doc.createElement("input");
-//      input.type = "text";
-//      input.size = "5";
-//      input.name = "f_st_margin";
-//      td.appendChild(input);
-//      input.style.marginRight = "0.5em";
-//      td.appendChild(doc.createTextNode(Xinha._lc("Padding", "TableOperations") + ":"));
-
-//      input = doc.createElement("input");
-//      input.type = "text";
-//      input.size = "5";
-//      input.name = "f_st_padding";
-//      td.appendChild(input);
-//      input.style.marginLeft = "0.5em";
-//      input.style.marginRight = "0.5em";
-//      td.appendChild(doc.createTextNode(Xinha._lc("pixels", "TableOperations")));
-
-        return fieldset;
-};
-
-//// END GENERIC CODE -------------------------------------------------------

trunk/plugins/UnFormat/un-format.js

@@ -1 +1 @@
 // Unormat plugin for Xinha
+
+
+UnFormat._pluginInfo = {
+  name          : "UnFormat",
+  version       : "1.0",
+  license       : "htmlArea"
+};
 
 
@@ -9 +16 @@
   cfg.registerButton({
     id       : "unformat",
-    tooltip  : this._lc("Page Cleaner"),
+    tooltip  : Xinha._lc("Page Cleaner",'UnFormat'),
     image    : editor.imgURL("unformat.gif", "UnFormat"),
     textMode : false,
     action   : function(editor) {
-                 self.buttonPress(editor);
+                 self.show();
                }
   });
@@ -20 +27 @@
 }
 
-UnFormat._pluginInfo = {
-  name          : "UnFormat",
-  version       : "1.0",
-  license       : "htmlArea"
+UnFormat.prototype.onGenerateOnce = function(editor){
+  // Load assets
+  var self = UnFormat;
+  if (self.loading) return;
+  self.loading = true;
+  self.methodsReady = true;
+  Xinha._getback(_editor_url + 'plugins/UnFormat/dialog.html', function(getback) { self.html = getback; self.dialogReady = true; });
+}
+UnFormat.prototype.onUpdateToolbar = function(editor){
+  if (!(UnFormat.dialogReady && UnFormat.methodsReady))
+  {
+    this.editor._toolbarObjects.UnFormat.state("enabled", false);
+  }
+  else this.onUpdateToolbar = null;
+
+}
+UnFormat.prototype.prepareDialog = function(editor){
+  var self = this;
+  var editor = this.editor;
+
+  var dialog = this.dialog = new Xinha.Dialog(editor, UnFormat.html, 'Xinha',{width:400})
+  // Connect the OK and Cancel buttons
+  dialog.getElementById('ok').onclick = function() {self.apply();}
+  dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+  
+  this.dialogReady = true;
+}
+UnFormat.prototype.show = function(editor){
+ if (!this.dialog) this.prepareDialog();
+
+  var editor = this.editor;
+
+  var values = 
+  {
+    "cleaning_area"    : 'selection',
+    "formatting"       : '',
+    "html_all"         : ''
+  }
+  // now calling the show method of the Xinha.Dialog object to set the values and show the actual dialog
+  this.dialog.show(values);
+  this.dialog.onresize();
+}
+UnFormat.prototype.apply = function(editor){
+  var editor = this.editor;
+  var doc = editor._doc;
+  var param = this.dialog.getValues();
+  
+  // selection is only restored on dialog.hide()
+  this.dialog.hide();
+  // assign the given arguments
+  
+  if (param["cleaning_area"] == "all") {
+    var html = editor._doc.body.innerHTML;
+  } else {
+    var html = editor.getSelectedHTML();
+  }
+
+  if (param.html_all) {
+    html = html.replace(/<[\!]*?[^<>]*?>/g, "");
+  }
+
+  if (param.formatting) {
+    html = html.replace(/style="[^"]*"/gi, "");
+    html = html.replace(/<\/?font[^>]*>/gi,"");
+    html = html.replace(/<\/?b>/gi,"");
+    html = html.replace(/<\/?strong[^>]*>/gi,"");
+    html = html.replace(/<\/?i>/gi,"");
+    html = html.replace(/<\/?em[^>]*>/gi,"");
+    html = html.replace(/<\/?u[^>]*>/gi,"");
+    html = html.replace(/<\/?strike[^>]*>/gi,"");
+    html = html.replace(/ align=[^\s|>]*/gi,"");
+    html = html.replace(/ class=[^\s|>]*/gi,"");
+  }
+  if (param["cleaning_area"] == "all") {
+    editor._doc.body.innerHTML = html;
+  } else {
+    editor.insertHTML(html);
+  }
 };
-
-
-UnFormat.prototype._lc = function(string) {
-  return Xinha._lc(string, 'UnFormat');
-};
-
-UnFormat.prototype.buttonPress = function(editor){
-  editor._popupDialog( "plugin://UnFormat/unformat", function( param){
-    if (param) {
-      if (param["cleaning_area"] == "all") {
-        var html = editor._doc.body.innerHTML;
-      } else {
-        var html = editor.getSelectedHTML();
-      }
-
-      if (param["html_all"]== true) {
-        html = html.replace(/<[\!]*?[^<>]*?>/g, "");                            
-      }
-
-      if (param["formatting"] == true) {
-        html = html.replace(/style="[^"]*"/gi, "");
-        html = html.replace(/<\/?font[^>]*>/gi,"");
-        html = html.replace(/<\/?b>/gi,"");
-        html = html.replace(/<\/?strong[^>]*>/gi,"");
-        html = html.replace(/<\/?i>/gi,"");
-        html = html.replace(/<\/?em[^>]*>/gi,"");
-        html = html.replace(/<\/?u[^>]*>/gi,"");
-        html = html.replace(/<\/?strike[^>]*>/gi,"");
-        html = html.replace(/ align=[^\s|>]*/gi,"");
-        html = html.replace(/ class=[^\s|>]*/gi,"");
-      }
-      if (param["cleaning_area"] == "all") {
-        editor._doc.body.innerHTML = html;
-      } else    {
-        editor.insertHTML(html);
-      }
-    } else { return false; }
-  }, null);
-};