Changeset 762 for branches

Timestamp:

02/24/07 15:47:57 (13 years ago)

Author:

ray

Message:

updated branch

Location:

branches/ray

Files:

• Xinha.css (modified) (7 diffs)
• XinhaCore.js (modified) (8 diffs)
• examples/ext_example-body.html (modified) (1 diff)
• examples/testbed.html (modified) (5 diffs)
• images/xinha-small-icon.gif (added)
• modules/ColorPicker/ColorPicker.js (modified) (3 diffs)
• modules/CreateLink/CreateLink.js (added)
• modules/CreateLink/dialog.html (added)
• modules/CreateLink/pluginMethods.js (added)
• modules/Dialogs/inline-dialog.js (modified) (4 diffs)
• modules/FullScreen/full-screen.js (modified) (1 diff)
• modules/InsertImage/InsertImage.js (added)
• modules/InsertImage/dialog.html (added)
• modules/InsertImage/pluginMethods.js (added)
• modules/InsertTable/InsertTable.js (added)
• modules/InsertTable/dialog.html (added)
• modules/InsertTable/pluginMethods.js (added)
• plugins/ImageManager/Classes/ImageEditor.php (modified) (3 diffs)
• plugins/ImageManager/Classes/ImageManager.php (modified) (3 diffs)
• plugins/Linker/dialog.html (modified) (1 diff)
• plugins/Linker/linker.js (modified) (3 diffs)
• 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) (5 diffs)
• plugins/Stylist/stylist.js (modified) (9 diffs)
• plugins/SuperClean/dialog.html (modified) (1 diff)
• plugins/SuperClean/lang/de.js (modified) (1 diff)
• plugins/SuperClean/super-clean.js (modified) (5 diffs)
• plugins/SuperClean/tidy.php (modified) (1 diff)

branches/ray/Xinha.css

@@ -108 +108 @@
 .dialog {
   color: ButtonText;
-  background: ButtonFace;
-}
-
+  background: ButtonFace; 
+  border: 1px outset; 
+  border-color: WindowFrame;
+}
+div.dialog {
+  padding-bottom:10px;
+}
+.xinha_dialog_background {
+  background-color:#666;
+  filter: alpha(opacity = 70);
+  -moz-opacity: 0.7;
+  opacity: 0.7;
+  border:none;
+}
 .dialog .content { padding: 2px; }
 
@@ -121 +132 @@
 .dialog .title, .dialog h1
 {
-  background: #008;
-  color: #ff8;
+  background: ActiveCaption;
+  color: CaptionText;
   border-bottom: 1px solid #000;
   padding: 1px 0px 2px 5px;
@@ -128 +139 @@
   font-weight: bold;
   cursor: default;
-}
-.dialog h1 { margin:0px;}
+  letter-spacing: 0.01em;
+}
+.dialog h1 { margin:0;}
 .dialog .title .button {
   float: right;
@@ -142 +154 @@
 
 .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;
   padding: 1px;
   cursor: default;
@@ -153 +184 @@
 }
 
+.dialog .buttonClick {
+  border-color: ButtonShadow ButtonHighlight ButtonHighlight ButtonShadow;
+}
 .dialog .buttonColor-hilite {
   border-color: #000;
@@ -169 +203 @@
 .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;
@@ -228 +274 @@
   padding: 2px;
   clear:left;
-  
+  letter-spacing: 0.01em;
 }
 

branches/ray/XinhaCore.js

@@ -507 +507 @@
   this.debug = true;
 
+  // ATTENTION: implementing custom image/link/table popups using this uris is DEPRECATED
   this.URIs =
   {
@@ -1278 +1279 @@
         function(ev)
         {
+          ev = Xinha.is_ie ? window.event : ev;
+          editor.btnClickEvent = ev;
           if ( obj.enabled )
           {
@@ -1287 +1290 @@
             }
             obj.cmd(editor, obj.name, obj);
-            Xinha._stopEvent(Xinha.is_ie ? window.event : ev);
+            Xinha._stopEvent(ev);
           }
         }
@@ -1553 +1556 @@
           if ( typeof InsertImage == 'undefined' && typeof Xinha.prototype._insertImage == 'undefined' )
           {
-            Xinha.loadPlugin("InsertImage", function() { editor.generate(); } , _editor_url + 'modules/InsertImage/insert_image.js');
+            var url = (this.config.URIs.insert_image != _editor_url + "modules/InsertImage/insert_image.html") ? _editor_url + "modules/InsertImage/insert_image.js" : _editor_url + "modules/InsertImage/InsertImage.js";
+            Xinha.loadPlugin("InsertImage", function() { editor.generate(); } , _editor_url + 'modules/InsertImage/InsertImage.js');
             return false;
           }
@@ -1561 +1565 @@
           if ( typeof CreateLink == 'undefined' && typeof Xinha.prototype._createLink == 'undefined' &&  typeof Linker == 'undefined' )
           {
-            Xinha.loadPlugin("CreateLink", function() { editor.generate(); } , _editor_url + 'modules/CreateLink/link.js');
+            var url = (this.config.URIs.link != _editor_url + "modules/CreateLink/link.html") ? _editor_url + "modules/CreateLink/link.js" : _editor_url + "modules/CreateLink/CreateLink.js";
+                Xinha.loadPlugin("CreateLink", function() { editor.generate(); } , url);
             return false;
           }
@@ -1569 +1574 @@
           if ( typeof InsertTable == 'undefined' && typeof Xinha.prototype._insertTable == 'undefined' )
           {
-            Xinha.loadPlugin("InsertTable", function() { editor.generate(); } , _editor_url + 'modules/InsertTable/insert_table.js');
+            var url = (this.config.URIs.insert_table != _editor_url + "modules/InsertTable/insert_table.html") ? _editor_url + "modules/InsertTable/insert_table.js" : _editor_url + "modules/InsertTable/InsertTable.js";
+                Xinha.loadPlugin("InsertTable", function() { editor.generate(); } , url);
             return false;
           }
@@ -4999 +5005 @@
         }
       }
+      else if (req.status == 404)
+      {
+        alert('File not found: ' + url);
+      }
       else
       {
-        alert('An error has occurred: ' + req.statusText);
+        alert('An error has occurred: ' + req.statusText + '\nURL: ' + url);
       }
     }
@@ -5027 +5037 @@
         handler(req.responseText, req);
       }
+      else if (req.status == 404)
+      {
+        alert('File not found: ' + url);
+      }
       else
       {
-        alert('An error has occurred: ' + req.statusText);
+        alert('An error has occurred: ' + req.statusText + '\nURL: ' + url);
       }
     }

branches/ray/examples/ext_example-body.html

@@ -12 +12 @@
   <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
   <title>Example of Xinha</title>
-  <link rel="stylesheet" type="text/css" href="full_example.css" />
+
 
   <script type="text/javascript">

branches/ray/examples/testbed.html

@@ -1 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
@@ -55 +54 @@
       xinha_plugins = xinha_plugins ? xinha_plugins :
       [
-        'CharacterMap', 'SpellChecker', 'Linker'
+        'CharacterMap', 'SpellChecker', 'SmartReplace','PasteText','SuperClean'
+        //'Linker'//,'GetHtml'
       ];
              // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
@@ -67 +67 @@
       xinha_editors = xinha_editors ? xinha_editors :
       [
-        'myTextArea'
+      'HAllo',  
+      'myTextArea'
+        
       ];
 
@@ -84 +86 @@
 
        xinha_config = xinha_config ? xinha_config : new Xinha.Config();
-       xinha_config.fullPage = true;
+   xinha_config.width  = 300;
+   xinha_config.height = 300;
+       xinha_config.fullPage = false;
        xinha_config.CharacterMap.mode = 'panel';
+       xinha_config.toolbar =
+  [
+    ["popupeditor"],
+    ["separator","formatblock","fontname","fontsize","bold","italic","underline","strikethrough"],
+    ["separator","forecolor","hilitecolor","textindicator"],
+    ["separator","subscript","superscript"],
+    ["linebreak","separator","justifyleft","justifycenter","justifyright","justifyfull"],
+    ["separator","insertorderedlist","insertunorderedlist","outdent","indent"],
+    ["separator","inserthorizontalrule","createlink","insertimage","inserttable"],
+    ["linebreak","separator","undo","redo","selectall","print"], (Xinha.is_gecko ? [] : ["cut","copy","paste","overwrite","saveas"]),
+    ["separator","killword","clearfonts","removeformat","toggleborders","splitblock","lefttoright", "righttoleft"],
+    ["separator","htmlmode","showhelp","about"]
+  ];
 /*
        // We can load an external stylesheet like this - NOTE : YOU MUST GIVE AN ABSOLUTE URL
@@ -142 +159 @@
 </head>
 
-<body>
-
-  <form action="javascript:var x = document.getElementById('editors_here');alert(x.myTextArea.value);" id="editors_here" onsubmit="alert(this.myTextArea.value);">
-    <textarea id="myTextArea" name="myTextArea" style="width:100%;height:320px;">
-      &lt;html&gt;
-      &lt;head&gt;
-        &lt;title&gt;Hello&lt;/title&gt;
-        &lt;style type="text/css"&gt;
-          li { color:red; }
-        &lt;/style&gt;
-      &lt;/head&gt;
-      &lt;body&gt;
-      &lt;img src="http://xinha.python-hosting.com/trac/logo.jpg" usemap="#m1"&gt;
-      &lt;map name="m1"&gt;
-      &lt;area shape="rect" coords="137,101,255,124" href="http://www.mydomain.com"&gt;
-      &lt;/map&gt;
-
-      &lt;p&gt;
-        Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
-        Aliquam et tellus vitae justo varius placerat. Suspendisse iaculis
-        velit semper dolor. Donec gravida tincidunt mi. Curabitur tristique
-        ante elementum turpis. Aliquam nisl. Nulla posuere neque non
-        tellus. Morbi vel nibh. Cum sociis natoque penatibus et magnis dis
-        parturient montes, nascetur ridiculus mus. Nam nec wisi. In wisi.
-        Curabitur pharetra bibendum lectus.
-      &lt;/p&gt;
-
-      &lt;ul&gt;
-        &lt;li&gt; Phasellus et massa sed diam viverra semper.  &lt;/li&gt;
-        &lt;li&gt; Mauris tincidunt felis in odio.              &lt;/li&gt;
-        &lt;li&gt; Nulla placerat nunc ut pede.                 &lt;/li&gt;
-        &lt;li&gt; Vivamus ultrices mi sit amet urna.           &lt;/li&gt;
-        &lt;li&gt; Quisque sed augue quis nunc laoreet volutpat.&lt;/li&gt;
-        &lt;li&gt; Nunc sit amet metus in tortor semper mattis. &lt;/li&gt;
-      &lt;/ul&gt;
-      &lt;/body&gt;
-      &lt;/html&gt;
-    </textarea>
+<body bgcolor="Aqua">
+
+  <form action="test_dest.php" id="editors_here" onsubmit="alert(this.myTextArea.value);">
+<input type="checkbox" name="hallo" />
+<select>
+<option>Test</option>
+</select>
+  <textarea id="myTextArea" name="myTextArea" style="width:100%;height:320px;">
+    <table cellspacing="1" cellpadding="1" border="1" style="width: 100%;"><tbody><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr></tbody></table><br /></textarea>
+
+    <input type="submit" /> <input type="reset" /><input type="checkbox" name="hallo" />
+<select>
+<option>Test</option>
+</select>
+  <textarea name="myTextArea" style="width:100%;height:320px;">
+    <table cellspacing="1" cellpadding="1" border="1" style="width: 100%;"><tbody><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr></tbody></table><br /></textarea>
+
+    <input type="submit" /> <input type="reset" /><input type="checkbox" name="hallo" />
+<select>
+<option>Test</option>
+</select>
+  <textarea name="myTextArea" style="width:100%;height:320px;">
+    <table cellspacing="1" cellpadding="1" border="1" style="width: 100%;"><tbody><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr></tbody></table><br /></textarea>
+
+    <input type="submit" /> <input type="reset" /><input type="checkbox" name="hallo" />
+<select>
+<option>Test</option>
+</select>
+  <textarea id="myTextArea" name="myTextArea" style="width:100%;height:320px;">
+    <table cellspacing="1" cellpadding="1" border="1" style="width: 100%;"><tbody><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr></tbody></table><br /></textarea>
+
+    <input type="submit" /> <input type="reset" /><input type="checkbox" name="hallo" />
+<select>
+<option>Test</option>
+</select>
+  <textarea name="myTextArea" style="width:100%;height:320px;">
+    <table cellspacing="1" cellpadding="1" border="1" style="width: 100%;"><tbody><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr><tr><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td><td style="width: 25%;">&nbsp;</td></tr></tbody></table><br /></textarea>
 
     <input type="submit" /> <input type="reset" />

branches/ray/modules/ColorPicker/ColorPicker.js

@@ -132 +132 @@
     this.table.appendChild(this.tbody);
     this.table.style.border = '1px solid WindowFrame';
-    this.table.style.zIndex = '1000';
+    this.table.style.zIndex = '1050';
     // Add a title bar and close button
     var tr = document.createElement('tr');
@@ -141 +141 @@
     td.style.fontFamily = 'small-caption,caption,sans-serif';
     td.style.fontSize = 'x-small';
+    td.unselectable = "on";
+    td.style.MozUserSelect = "none";
     td.appendChild(document.createTextNode(Xinha._lc('Click a color...')));
     td.style.borderBottom = '1px solid WindowFrame';
@@ -829 +831 @@
   return Xinha._lc(string);
 }
+Xinha.colorPicker.inputBinding = function(input)
+{
+  var main = document.createElement('span');
+  main.className = "buttonColor";
+  
+  var chooser = this.chooser = document.createElement('span');
+  chooser.className = "chooser";
+  chooser.onmouseover = function() {main.style.borderColor='black';chooser.style.borderColor='black'};
+  chooser.onmouseout = function() {main.style.borderColor='ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight',chooser.style.borderColor='ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight'};
+  chooser.appendChild(document.createTextNode('\u00a0'));
+  main.appendChild(chooser);
+  var clearColor = document.createElement('span');
+  clearColor.className = "nocolor";
+  clearColor.onmouseover = function() {clearColor.style.color='#f00'};
+  clearColor.onmouseout = function() {clearColor.style.color='#000'};
+  clearColor.onclick = function() {input.value ='';chooser.style.backgroundColor = ''};
+  clearColor.appendChild(document.createTextNode('\u00d7'));
+  main.appendChild(clearColor);
+  
+  input.parentNode.insertBefore(main,input.nextSibling);
+  
+  Xinha._addEvent(input,'change',function() {chooser.style.backgroundColor = this.value;})
+  
+  chooser.onclick = function() 
+  { 
+          var colPicker = new Xinha.colorPicker({cellsize:'5px',callback:function(color) {chooser.style.backgroundColor = color;input.value=color}});
+          colPicker.open('left',chooser, input.value ); 
+  }
+}
+Xinha.colorPicker.inputBinding.prototype.setColor = function(color)
+{
+  this.chooser.style.backgroundColor = color;
+}

branches/ray/modules/Dialogs/inline-dialog.js

@@ -21 +21 @@
     --  $LastChangedBy$
     --------------------------------------------------------------------------*/
-Xinha.Dialog = function(editor, html, localizer)
-{
+Xinha.Dialog = function(editor, html, localizer, size, layer)
+{
+  var dialog = this;
   this.id    = { };
   this.r_id  = { }; // reverse lookup id
   this.editor   = editor;
   this.document = document;
-
-  this.rootElem = document.createElement('div');
-  this.rootElem.className = 'dialog';
-  this.rootElem.style.position = 'absolute';
-  this.rootElem.style.display  = 'none';
-  this.editor._framework.ed_cell.insertBefore(this.rootElem, this.editor._framework.ed_cell.firstChild);
-  this.rootElem.style.width  = this.width  =  this.editor._framework.ed_cell.offsetWidth + 'px';
-  this.rootElem.style.height = this.height =  this.editor._framework.ed_cell.offsetHeight + 'px';
-
-  var dialog = this;
+  this.layer = (layer) ? layer : 0;
+  
+  if ( !Xinha.Dialog.background[this.layer] )
+  {
+        Xinha.Dialog.background[this.layer] = [];
+        
+    if (Xinha.is_ie)
+    { // IE6 needs the iframe to hide select boxes
+      var backG = document.createElement("iframe");
+      backG.src = "about:blank";
+    }
+    else 
+    { // Mozilla (<FF3) can't have the iframe, because it hides the caret in text fields 
+      // see https://bugzilla.mozilla.org/show_bug.cgi?id=226933
+      // unfortunately https://bugzilla.mozilla.org/show_bug.cgi?id=230701 indicates that this is an issue with pos fixed div, too
+      var backG = document.createElement("div");
+    }
+    backG.className = "xinha_dialog_background";
+    with (backG.style)
+    {
+      position = "absolute";//(Xinha.is_ie) ? "absolute" : "fixed"; 
+      top = 0;
+      left = 0;
+      border = 'none';
+      overflow = "hidden";
+      display = "none";
+      zIndex = 1001 + this.layer;
+    }
+    document.body.appendChild(backG);
+    Xinha.Dialog.background[this.layer].push(backG);
+  
+    backG = document.createElement("div");
+    with (backG.style)
+    {
+      position =  "absolute";//(Xinha.is_ie) ? "absolute" : "fixed";
+      top = 0;
+      left = 0;
+      overflow = "hidden";
+      display = "none";
+      zIndex = 1002+ this.layer;
+    } 
+    document.body.appendChild(backG);
+    Xinha.Dialog.background[this.layer].push(backG);
+  }
+  var rootElem = document.createElement('div');
+  rootElem.style.position = 'absolute';
+  rootElem.style.zIndex = 1003+ this.layer;
+  rootElem.style.display  = 'none';
+  
+  // FIXME: This is nice, but I don't manage to get it switched off on text inputs :(
+  // rootElem.style.MozUserSelect = "none";
+  
+  rootElem.className = 'dialog';
+  
+ // Xinha.Dialog.background[this.layer][1].appendChild(rootElem);
+  document.body.appendChild(rootElem);
+
+  rootElem.style.paddingBottom = "10px";
+  rootElem.style.width = size.width + 'px';
+
+  
+  this.size = size;
+  if (size.height)
+  {
+    if (Xinha.ie_version < 7)
+    {
+      rootElem.style.height = size.height + 'px';
+    }
+    else
+    {
+      rootElem.style.minHeight =  size.height + 'px';
+    }
+  }
+
   if(typeof localizer == 'function')
   {
@@ -78 +143 @@
              );
 
-  this.rootElem.innerHTML = html;
-
-
-
-
-  this.editor.notifyOn
-   ('resize',
-      function(e, args)
+  rootElem.innerHTML = html;
+
+  //make the first h1 to drag&drop the rootElem
+  var titleBar = rootElem.getElementsByTagName("h1")[0];
+  titleBar.onmousedown = function(ev) { dialog._dragStart(ev); };
+  titleBar.style.MozUserSelect = "none";
+  
+  var but = document.createElement('div');
+  but.className= 'closeButton'; 
+  
+  but.onmousedown = function(ev) { this.className = "closeButton buttonClick"; Xinha._stopEvent((ev) ? ev : window.event); return false;};
+  but.onmouseout = function(ev) { this.className = "closeButton"; Xinha._stopEvent((ev) ? ev : window.event); return false;};
+  but.onmouseup = function() { this.className = "closeButton"; dialog.hide(); return false;};
+  titleBar.appendChild(but);
+  
+  var butX = document.createElement('span');
+  butX.style.position = 'relative';
+  butX.style.top = '-3px';
+
+  butX.appendChild(document.createTextNode('\u00D7'));
+  but.appendChild(butX);
+  
+  var icon = document.createElement('img');
+  icon.src = _editor_url + 'images/xinha-small-icon.gif';
+  icon.style.position = 'absolute';
+  icon.style.top = '3px';
+  icon.style.left = '2px';
+  titleBar.style.paddingLeft = '30px';
+  titleBar.appendChild(icon);
+   
+  var all = rootElem.getElementsByTagName("*");
+
+  for (var i=0; i<all.length;i++)
+  {
+        var el = all[i]; 
+    if (el.tagName.toLowerCase() == 'textarea' || el.tagName.toLowerCase() == 'input')
+    {
+      // FIXME: this doesn't work
+      //el.style.MozUserSelect = "text";
+    }
+    else
+    {
+      el.unselectable = "on";
+    }
+  }
+
+  var resizeHandle = document.createElement('div');
+  resizeHandle.className = "resizeHandle";
+  with (resizeHandle.style)
+  {
+    position = "absolute";
+    bottom = "0px";
+    right= "0px";
+  }
+  resizeHandle.onmousedown = function(ev) { dialog._resizeStart(ev); };
+  rootElem.appendChild(resizeHandle);
+  this.rootElem = rootElem;
+  // for caching size & position after dragging & resizing
+  this.size = {};
+};
+
+Xinha.Dialog.background = [];
+Xinha.Dialog.prototype.sizeBackground = function()
+{
+  var win_dim = Xinha.viewportSize();
+  Xinha.Dialog.background[this.layer][0].style.width = win_dim.x + 'px';
+  Xinha.Dialog.background[this.layer][0].style.height = win_dim.y + 'px';
+  Xinha.Dialog.background[this.layer][1].style.width = win_dim.x + 'px';
+  Xinha.Dialog.background[this.layer][1].style.height = win_dim.y + 'px';
+  window.scroll(this.scrollPos.x, this.scrollPos.y);
+  return win_dim;
+}
+
+Xinha.Dialog.prototype.onresize = function()
+{
+  return true;
+};
+
+Xinha.Dialog.prototype.show = function(values)
+{
+  var rootElem = this.rootElem;
+  var scrollPos = this.scrollPos = this.editor.scrollPos();
+  var dialog = this;
+  
+  function resetScroll()
+  {
+    if ( dialog.dialogShown )
+    {
+      window.scroll(scrollPos.x,scrollPos.y);
+      window.setTimeout(resetScroll,150);
+    }
+  }
+  Xinha.Dialog.background[this.layer][0].style.left = this.scrollPos.x + 'px';
+  Xinha.Dialog.background[this.layer][0].style.top = this.scrollPos.y + 'px';
+  Xinha.Dialog.background[this.layer][1].style.left = this.scrollPos.x + 'px';
+  Xinha.Dialog.background[this.layer][1].style.top = this.scrollPos.y + 'px';
+  
+  // We need to preserve the selection
+  if(Xinha.is_ie)
+  {      
+    this._lastRange = this.editor._createRange(this.editor._getSelection());
+  }
+  else
+  {
+        this._lastRange = this.editor._createRange(this.editor._getSelection()).cloneRange();
+  }
+  this.editor.deactivateEditor();
+  
+  // unfortunately we have to hide the editor (iframe/caret bug)
+  if (Xinha.is_gecko)
+  {
+    this._restoreTo = [this.editor._textArea.style.display, this.editor._iframe.style.visibility, this.editor.hidePanels()];
+    this.editor._textArea.style.display = 'none';
+    this.editor._iframe.style.visibility   = 'hidden';
+  }
+  if (!this.editor._isFullScreen)
+  {
+    if(Xinha.is_ie && document.compatMode == 'CSS1Compat')
+    {
+      var bod = document.getElementsByTagName('html');
+    }
+    else
+    {
+      var bod = document.getElementsByTagName('body');
+    }
+  
+    bod[0].style.overflow='hidden';
+    window.scroll(this.scrollPos.x, this.scrollPos.y);
+  }
+
+  Xinha.Dialog.background[this.layer][0].style.display = '';
+  Xinha.Dialog.background[this.layer][1].style.display = '';
+  
+  var backgroundSize = this.sizeBackground();
+  var backgroundHeight = backgroundSize.y;
+  var backgroundWidth = backgroundSize.x;
+  
+  this.onResizeWin = function () {dialog.sizeBackground()};
+  Xinha._addEvent(window, 'resize', this.onResizeWin );
+  
+
+  
+  var rootElemStyle = rootElem.style;
+  rootElemStyle.display   = '';
+  
+  var dialogHeight = rootElem.offsetHeight;
+  var dialogWidth = rootElem.offsetWidth;
+  
+  if (dialogHeight >  backgroundHeight)
+  {
+        rootElemStyle.height =  backgroundHeight + "px";
+        if (rootElem.scrollHeight > dialogHeight)
+        {
+          rootElemStyle.overflowY = "auto";
+        }
+  }
+
+  if(this.size.top && this.size.left)
+  {
+    rootElemStyle.top =  parseInt(this.size.top,10) + 'px';
+    rootElemStyle.left = parseInt(this.size.left,10) + 'px';
+  }
+  else
+  {
+    if (this.editor.btnClickEvent)
+    {
+      var btnClickEvent = this.editor.btnClickEvent; 
+      rootElemStyle.top =  btnClickEvent.clientY + this.scrollPos.y +'px';
+     
+      if (dialogHeight + rootElem.offsetTop >  backgroundHeight)
       {
-        dialog.rootElem.style.width  = dialog.width  =  dialog.editor._framework.ed_cell.offsetWidth + 'px';
-        dialog.rootElem.style.height = dialog.height =  dialog.editor._framework.ed_cell.offsetHeight + 'px';
-        dialog.onresize();
+        rootElemStyle.top = this.scrollPos.y;
       }
-    );
-};
-
-Xinha.Dialog.prototype.onresize = function()
-{
-  return true;
-};
-
-Xinha.Dialog.prototype.show = function(values)
-{
-  // We need to preserve the selection for IE
-  if(Xinha.is_ie)
-  {
-    this._lastRange = this.editor._createRange(this.editor._getSelection());
-  }
-
+      rootElemStyle.left = btnClickEvent.clientX +  this.scrollPos.x +'px';
+      if (dialogWidth + rootElem.offsetLeft >  backgroundWidth)
+      {
+        rootElemStyle.left =  btnClickEvent.clientX - dialogWidth   + 'px';
+        if (rootElem.offsetLeft < 0) 
+        {
+                rootElemStyle.left = 0;
+        }
+      }
+      this.editor.btnClickEvent = null;
+    }
+    else
+    {
+    var top =  ( backgroundHeight - dialogHeight) / 2;
+    var left = ( backgroundWidth - dialogWidth) / 2;
+    rootElemStyle.top =  ((top > 0) ? top : 0) +'px';
+    rootElemStyle.left = ((left > 0) ? left : 0)+'px';          
+    }
+        
+  }
+  this.width = dialogWidth;
+  this.height = dialogHeight;  
+  
   if(typeof values != 'undefined')
   {
     this.setValues(values);
   }
-  this._restoreTo = [this.editor._textArea.style.display, this.editor._iframe.style.visibility, this.editor.hidePanels()];
-
-  this.editor._textArea.style.display = 'none';
-  this.editor._iframe.style.visibility   = 'hidden';
-  this.rootElem.style.display   = '';
+  this.dialogShown = true;
+  resetScroll();
 };
 
 Xinha.Dialog.prototype.hide = function()
 {
-  this.rootElem.style.display         = 'none';
-  this.editor._textArea.style.display = this._restoreTo[0];
-  this.editor._iframe.style.visibility   = this._restoreTo[1];
-  this.editor.showPanels(this._restoreTo[2]);
-
-  // Restore the selection
-  if(Xinha.is_ie)
-  {
+  this.rootElem.style.display = 'none';
+  Xinha.Dialog.background[this.layer][0].style.display = 'none';
+  Xinha.Dialog.background[this.layer][1].style.display = 'none';
+  var dialog = this;
+
+  Xinha._removeEvent(window, 'resize', this.onResizeWin);
+  
+  if (Xinha.is_gecko)
+  {
+    this.editor._textArea.style.display = this._restoreTo[0];
+    this.editor._iframe.style.visibility   = this._restoreTo[1];
+    this.editor.showPanels(this._restoreTo[2]);  
+  }
+  
+  if (!this.editor._isFullScreen)
+  {
+    if(Xinha.is_ie && document.compatMode == 'CSS1Compat')
+    {
+      var bod = document.getElementsByTagName('html');
+    }
+    else
+    {
+      var bod = document.getElementsByTagName('body');
+    }
+    bod[0].style.overflow='';
+    window.scroll(this.scrollPos.x, this.scrollPos.y);
+  }
+// Restore the selection
+  this.editor.activateEditor();
+  if (Xinha.is_gecko)
+  {             
+    var sel = this.editor.getSelection();
+    sel.removeAllRanges();
+    sel.addRange(this._lastRange);
+  }
+  else
+  { 
     this._lastRange.select();
   }
+  this.dialogShown = false;
   this.editor.updateToolbar();
   return this.getValues();
@@ -144 +403 @@
     this.hide();
   }
+};
+
+Xinha.Dialog.prototype.getElementById = function(id)
+{
+  return this.document.getElementById(this.id[id] ? this.id[id] : id);
+};
+
+Xinha.Dialog.prototype.getElementsByName = function(name)
+{
+  return this.document.getElementsByName(this.id[name] ? this.id[name] : name);
+};
+
+Xinha.Dialog.prototype._dragStart = function (ev) 
+{
+
+  var dialog = this;
+  if (dialog.dragging) 
+  {
+    return;
+  }
+  dialog.dragging = true;
+
+  var st = dialog.rootElem.style;
+
+  dialog.xOffs = ((Xinha.is_ie) ? window.event.offsetX : ev.layerX);
+  dialog.yOffs = ((Xinha.is_ie) ? window.event.offsetY : ev.layerY);
+
+  Xinha._addEvent(document, "mousemove", function(ev) { dialog.dragIt(ev); } );
+  Xinha._addEvent(document, "mouseup", function (ev) { dialog.dragEnd(ev); } );
+};
+
+Xinha.Dialog.prototype.dragIt = function(ev)
+{
+  var dialog = this;
+
+  if (!dialog.dragging) 
+  {
+    return false;
+  }
+  ev = (Xinha.is_ie) ? window.event : ev;
+
+  var posY = ev.clientY + this.scrollPos.y;
+  var posX = ev.clientX + this.scrollPos.x;
+
+  var st = dialog.rootElem.style;
+
+  st.left = (posX - dialog.xOffs) + "px";
+  st.top = (posY - dialog.yOffs) + "px";
+};
+
+Xinha.Dialog.prototype.dragEnd = function(ev)
+{
+  var dialog = this;
+  dialog.dragging = false;
+
+  Xinha._removeEvent(document, "mousemove", function(ev) { dialog.dragIt(ev); } );
+  Xinha._removeEvent(document, "mouseup", function (ev) { dialog.dragEnd(ev); } );
+
+  dialog.size.top  = dialog.rootElem.style.top;
+  dialog.size.left =dialog.rootElem.style.left;
+};
+
+Xinha.Dialog.prototype._resizeStart = function (ev) {
+  var dialog = this;
+
+  if (dialog.resizing)
+  {
+    return;
+  }
+  dialog.resizing = true;
+
+  var st = dialog.rootElem.style;
+  st.minHeight = '';
+  st.overflow  =  'hidden';
+  dialog.xOffs = parseInt(st.left,10);
+  dialog.yOffs = parseInt(st.top,10);
+
+  Xinha._addEvent(document, "mousemove", function(ev) { dialog.resizeIt(ev); } );
+  Xinha._addEvent(document, "mouseup", function (ev) { dialog.resizeEnd(ev); } );
+};
+
+Xinha.Dialog.prototype.resizeIt = function(ev)
+{
+  var dialog = this;
+
+  if (!dialog.resizing) {
+    return false;
+  }
+
+  var posY = ev.clientY + dialog.scrollPos.y;
+  var posX = ev.clientX + dialog.scrollPos.x;
+
+  var st = dialog.rootElem.style;
+
+  posX = posX - dialog.xOffs;
+  posY = posY - dialog.yOffs;
+
+  st.width  = (( posX > 10) ? posX : 10) + "px";
+  st.height = (( posY > 10) ? posY : 10) + "px";
+
+  dialog.width = dialog.rootElem.offsetWidth;
+  dialog.height = dialog.rootElem.offsetHeight;
+
+  dialog.onresize();
+};
+
+Xinha.Dialog.prototype.resizeEnd = function(ev)
+{
+  var dialog = this;
+  dialog.resizing = false;
+
+  Xinha._removeEvent(document, "mousemove", function(ev) { dialog.resizeIt(ev); } );
+  Xinha._removeEvent(document, "mouseup", function (ev) { dialog.resizeEnd(ev); } );
+
+  dialog.size.width  = dialog.rootElem.offsetWidth;
+  dialog.size.height = dialog.rootElem.offsetHeight;
 };
 
@@ -337 +712 @@
   return values;
 };
-
-Xinha.Dialog.prototype.getElementById = function(id)
-{
-  return this.document.getElementById(this.id[id] ? this.id[id] : id);
-};
-
-Xinha.Dialog.prototype.getElementsByName = function(name)
-{
-  return this.document.getElementsByName(this.id[name] ? this.id[name] : name);
-};

branches/ray/modules/FullScreen/full-screen.js

@@ -72 +72 @@
    */
   function resetScroll()
-  {
+  {console.log('resetScroll');
     if(e._isFullScreen)
     {

branches/ray/plugins/ImageManager/Classes/ImageEditor.php

@@ -1 @@
-<<<<<<< .working
 <?php
 /**
@@ -8 +7 @@
  */
 
-require_once('Transform.php');
+require_once('../ImageManager/Classes/Transform.php');
 
 /**
@@ -449 +448 @@
 
 ?>
-=======
-<?php
-/**
- * Image Editor. Editing tools, crop, rotate, scale and save.
- * @author $Author$
- * @version $Id$
- * @package ImageManager
- */
-
-require_once('../ImageManager/Classes/Transform.php');
-
-/**
- * Handles the basic image editing capbabilities.
- * @author $Author$
- * @version $Id$
- * @package ImageManager
- * @subpackage Editor
- */
-class ImageEditor 
-{
-        /**
-         * ImageManager instance.
-         */
-        var $manager;
-
-        /**
-         * user based on IP address
-         */
-        var $_uid;
-
-        /**
-         * tmp file storage time.
-         */
-        var $lapse_time =900; //15 mins
-
-        var $filesaved = 0;
-
-        /**
-         * Create a new ImageEditor instance. Editing requires a 
-         * tmp file, which is saved in the current directory where the
-         * image is edited. The tmp file is assigned by md5 hash of the
-         * user IP address. This hashed is used as an ID for cleaning up
-         * the tmp files. In addition, any tmp files older than the
-         * the specified period will be deleted.
-         * @param ImageManager $manager the image manager, we need this
-         * for some file and path handling functions.
-         */
-        function ImageEditor($manager) 
-        {
-                $this->manager = $manager;
-                $this->_uid = md5($_SERVER['REMOTE_ADDR']);
-        }
-        
-        /**
-         * Did we save a file?
-         * @return int 1 if the file was saved sucessfully, 
-         * 0 no save operation, -1 file save error.
-         */
-        function isFileSaved() 
-        {
-                Return $this->filesaved;
-        }
-
-        /**
-         * Process the image, if not action, just display the image.
-         * @return array with image information, empty array if not an image.
-         * <code>array('src'=>'url of the image', 'dimensions'=>'width="xx" height="yy"',
-         * 'file'=>'image file, relative', 'fullpath'=>'full path to the image');</code>
-         */
-        function processImage() 
-        {
-                if(isset($_GET['img']))
-                        $relative = rawurldecode($_GET['img']);
-                else
-                        Return array();
-                
-                //$relative = '/Series2004NoteFront.jpg';
-
-                $imgURL = $this->manager->getFileURL($relative);
-                $fullpath = $this->manager->getFullPath($relative);
-                
-                $imgInfo = @getImageSize($fullpath);
-                if(!is_array($imgInfo))
-                        Return array();
-
-                $action = $this->getAction();
-
-                if(!is_null($action))
-                {
-                        $image = $this->processAction($action, $relative, $fullpath);
-                }
-                else
-                {
-                        $image['src'] = $imgURL;
-                        $image['dimensions'] = $imgInfo[3];
-                        $image['file'] = $relative;
-                        $image['fullpath'] = $fullpath;
-                }
-
-                Return $image;
-        }
-
-        /**
-         * Process the actions, crop, scale(resize), rotate, flip, and save.
-         * When ever an action is performed, the result is save into a
-         * temporary image file, see createUnique on the filename specs.
-         * It does not return the saved file, alway returning the tmp file.
-         * @param string $action, should be 'crop', 'scale', 'rotate','flip', or 'save'
-         * @param string $relative the relative image filename
-         * @param string $fullpath the fullpath to the image file
-         * @return array with image information
-         * <code>array('src'=>'url of the image', 'dimensions'=>'width="xx" height="yy"',
-         * 'file'=>'image file, relative', 'fullpath'=>'full path to the image');</code>
-         */
-        function processAction($action, $relative, $fullpath) 
-        {
-                $params = '';
-                
-                if(isset($_GET['params']))
-                        $params = $_GET['params'];
-
-                $values =  explode(',',$params,4);
-                $saveFile = $this->getSaveFileName($values[0]);
-
-                $img = Image_Transform::factory(IMAGE_CLASS);
-                $img->load($fullpath);
-
-                switch ($action) 
-                {
-                        case 'crop':
-                                $img->crop(intval($values[0]),intval($values[1]),
-                                                        intval($values[2]),intval($values[3]));
-                        break;
-                        case 'scale':
-                                $img->resize(intval($values[0]),intval($values[1]));
-                                break;
-                        case 'rotate':
-                                $img->rotate(floatval($values[0]));
-                                break;
-                        case 'flip':
-                                if ($values[0] == 'hoz')
-                                        $img->flip(true);
-                                else if($values[0] == 'ver') 
-                                        $img->flip(false);
-                                break;
-                        case 'save':
-                                if(!is_null($saveFile))
-                                {
-                                        $quality = intval($values[1]);
-                            if($quality <0) $quality = 85;
-                                        $newSaveFile = $this->makeRelative($relative, $saveFile);
-                                        $newSaveFile = $this->getUniqueFilename($newSaveFile);
-                                        
-                                        //get unique filename just returns the filename, so
-                                        //we need to make the relative path once more.
-                                        $newSaveFile = $this->makeRelative($relative, $newSaveFile);
-          $image['saveFile'] = $newSaveFile;
-                                        $newSaveFullpath = $this->manager->getFullPath($newSaveFile);
-                                        $img->save($newSaveFullpath, $values[0], $quality);
-                                        if(is_file($newSaveFullpath))
-                                                $this->filesaved = 1;
-                                        else
-                                                $this->filesaved = -1;
-                                }
-                                break;
-                }
-                
-                //create the tmp image file
-                $filename = $this->createUnique($fullpath);
-                $newRelative = $this->makeRelative($relative, $filename);
-                $newFullpath = $this->manager->getFullPath($newRelative);
-                $newURL = $this->manager->getFileURL($newRelative);
-                
-                //save the file.
-                $img->save($newFullpath);
-                $img->free();
-
-                //get the image information
-                $imgInfo = @getimagesize($newFullpath);
-
-                $image['src'] = $newURL;
-    $image['width'] = $imgInfo[0];
-    $image['height'] = $imgInfo[1];
-                $image['dimensions'] = $imgInfo[3];
-                $image['file'] = $newRelative;
-                $image['fullpath'] = $newFullpath;
-
-                Return $image;
-        
-        }
-
-        /**
-         * Get the file name base on the save name
-         * and the save type.
-         * @param string $type image type, 'jpeg', 'png', or 'gif'
-         * @return string the filename according to save type
-         */
-        function getSaveFileName($type) 
-        {
-                if(!isset($_GET['file']))
-                        Return null;
-
-                $filename = Files::escape(rawurldecode($_GET['file']));
-                $index = strrpos($filename,'.');
-                $base = substr($filename,0,$index);
-                $ext = strtolower(substr($filename,$index+1,strlen($filename)));
-
-                if($type == 'jpeg' && !($ext=='jpeg' || $ext=='jpg'))
-                {
-                        Return $base.'.jpeg';
-                }
-                if($type=='png' && $ext != 'png')
-                        Return $base.'.png';
-                if($type=='gif' && $ext != 'gif')
-                        Return $base.'.gif';
-
-                Return $filename;
-        }
-
-        /**
-         * Get the default save file name, used by editor.php.
-         * @return string a suggestive filename, this should be unique
-         */
-        function getDefaultSaveFile() 
-        {
-                if(isset($_GET['img']))
-                        $relative = rawurldecode($_GET['img']);
-                else
-                        Return null;
-
-                Return $this->getUniqueFilename($relative);
-        }
-
-        /**
-         * Get a unique filename. If the file exists, the filename
-         * base is appended with an increasing integer.
-         * @param string $relative the relative filename to the base_dir
-         * @return string a unique filename in the current path
-         */
-        function getUniqueFilename($relative) 
-        {
-                $fullpath = $this->manager->getFullPath($relative);
-                
-                $pathinfo = pathinfo($fullpath);
-
-                $path = Files::fixPath($pathinfo['dirname']);
-                $file = Files::escape($pathinfo['basename']);
-                
-                $filename = $file;
-
-                $dotIndex = strrpos($file, '.');
-                $ext = '';
-
-                if(is_int($dotIndex)) 
-                {
-                        $ext = substr($file, $dotIndex);
-                        $base = substr($file, 0, $dotIndex);
-                }
-
-                $counter = 0;
-                while(is_file($path.$filename)) 
-                {
-                        $counter++;
-                        $filename = $base.'_'.$counter.$ext;
-                }
-                
-                Return $filename;
-                
-        }
-
-        /**
-         * Specifiy the original relative path, a new filename
-         * and return the new filename with relative path.
-         * i.e. $pathA (-filename) + $file
-         * @param string $pathA the relative file
-         * @param string $file the new filename
-         * @return string relative path with the new filename
-         */
-        function makeRelative($pathA, $file) 
-        {
-                $index = strrpos($pathA,'/');
-                if(!is_int($index))
-                        Return $file;
-
-                $path = substr($pathA, 0, $index);
-                Return Files::fixPath($path).$file;
-        }
-
-        /**
-         * Get the action GET parameter
-         * @return string action parameter
-         */
-        function getAction() 
-        {
-                $action = null;
-                if(isset($_GET['action']))
-                        $action = $_GET['action'];
-                Return $action;
-        }
-
-        /**
-         * Generate a unique string based on md5(microtime()).
-         * Well not so uniqe, as it is limited to 6 characters
-         * @return string unique string.
-         */
-    function uniqueStr()
-    {
-      return substr(md5(microtime()),0,6);
-    }
-
-        /**
-         * Create unique tmp image file name.
-         * The filename is based on the tmp file prefix
-         * specified in config.inc.php plus 
-         * the UID (basically a md5 of the remote IP)
-         * and some random 6 character string.
-         * This function also calls to clean up the tmp files.
-         * @param string $file the fullpath to a file
-         * @return string a unique filename for that path
-         * NOTE: it only returns the filename, path no included.
-         */
-        function createUnique($file) 
-        {
-                $pathinfo = pathinfo($file);
-                $path = Files::fixPath($pathinfo['dirname']);
-                $imgType = $this->getImageType($file);
-
-                $unique_str = $this->manager->getTmpPrefix().$this->_uid.'_'.$this->uniqueStr().".".$imgType;
-
-           //make sure the the unique temp file does not exists
-        while (file_exists($path.$unique_str))
-        {
-            $unique_str = $this->manager->getTmpPrefix().$this->_uid.'_'.$this->uniqueStr().".".$imgType;
-        }
-
-                $this->cleanUp($path,$pathinfo['basename']);
-
-                Return $unique_str;
-        }
-
-        /**
-         * Delete any tmp image files.
-         * @param string $path the full path 
-         * where the clean should take place.
-         */
-        function cleanUp($path,$file) 
-        {
-                $path = Files::fixPath($path);
-
-                if(!is_dir($path))
-                        Return false;
-
-                $d = @dir($path);
-                
-                $tmp = $this->manager->getTmpPrefix();
-                $tmpLen = strlen($tmp);
-
-                $prefix = $tmp.$this->_uid;
-                $len = strlen($prefix);
-
-                while (false !== ($entry = $d->read())) 
-                {
-                        //echo $entry."<br>";
-                        if(is_file($path.$entry) && $this->manager->isTmpFile($entry))
-                        {
-                                if(substr($entry,0,$len)==$prefix && $entry != $file)
-                                        Files::delFile($path.$entry);
-                                else if(substr($entry,0,$tmpLen)==$tmp && $entry != $file)
-                                {
-                                        if(filemtime($path.$entry)+$this->lapse_time < time())
-                                                Files::delFile($path.$entry);
-                                }
-                        }
-                }
-                $d->close();
-        }
-
-        /**
-         * Get the image type base on an image file.
-         * @param string $file the full path to the image file.
-         * @return string of either 'gif', 'jpeg', 'png' or 'bmp'
-         * otherwise it will return null.
-         */
-        function getImageType($file) 
-        {
-                $imageInfo = @getImageSize($file);
-
-                if(!is_array($imageInfo))
-                        Return null;
-
-                switch($imageInfo[2]) 
-                {
-                        case 1:
-                                Return 'gif';
-                        case 2:
-                                Return 'jpeg';
-                        case 3:
-                                Return 'png';
-                        case 6:
-                                Return 'bmp';
-                }
-
-                Return null;
-        }
-
-        /**
-         * Check if the specified image can be edit by GD
-         * mainly to check that GD can read and save GIFs
-         * @return int 0 if it is not a GIF file, 1 is GIF is editable, -1 if not editable.
-         */
-        function isGDEditable() 
-        {
-                if(isset($_GET['img']))
-                        $relative = rawurldecode($_GET['img']);
-                else
-                        Return 0;
-                if(IMAGE_CLASS != 'GD')
-                        Return 0;
-
-                $fullpath = $this->manager->getFullPath($relative);
-
-                $type = $this->getImageType($fullpath);
-                if($type != 'gif')
-                        Return 0;
-
-                if(function_exists('ImageCreateFrom'+$type)
-                        && function_exists('image'+$type))
-                        Return 1;
-                else
-                        Return -1;
-        }
-
-        /**
-         * Check if GIF can be edit by GD.
-         * @return int 0 if it is not using the GD library, 1 is GIF is editable, -1 if not editable.
-         */
-        function isGDGIFAble() 
-        {
-                if(IMAGE_CLASS != 'GD')
-                        Return 0;
-
-                if(function_exists('ImageCreateFromGif')
-                        && function_exists('imagegif'))
-                        Return 1;
-                else
-                        Return -1;
-        }
-}
-
-?>
->>>>>>> .merge-right.r760

branches/ray/plugins/ImageManager/Classes/ImageManager.php

@@ -1 @@
-<<<<<<< .working
 <?php
 /**
@@ -8 +7 @@
  */
 
-require_once('Files.php');
+require_once('../ImageManager/Classes/Files.php');
 
 // uncomment to turn on debugging
@@ -664 +663 @@
 
 ?>
-=======
-<?php
-/**
- * ImageManager, list images, directories, and thumbnails.
- * @author $Author$
- * @version $Id$
- * @package ImageManager
- */
-
-require_once('../ImageManager/Classes/Files.php');
-
-// uncomment to turn on debugging
-
-// _ddtOn();
-
-/**
- * ImageManager Class.
- * @author $Author$
- * @version $Id$
- */
-class ImageManager 
-{
-        /**
-         * Configuration array.
-         */
-        var $config;
-
-        /**
-         * Array of directory information.
-         */
-        var $dirs;
-
-        /**
-         * Constructor. Create a new Image Manager instance.
-         * @param array $config configuration array, see config.inc.php
-         */
-        function ImageManager($config) 
-        {
-                $this->config = $config;
-        }
-
-        /**
-         * Get the images base directory.
-         * @return string base dir, see config.inc.php
-         */
-        function getImagesDir() 
-        {
-                Return $this->config['images_dir'];
-        }
-
-        /**
-         * Get the images base URL.
-         * @return string base url, see config.inc.php
-         */
-        function getImagesURL() 
-        {
-                Return $this->config['images_url'];
-        }
-
-        function isValidBase()
-        {
-                return is_dir($this->getImagesDir());
-        }
-
-        /**
-         * Get the tmp file prefix.
-         * @return string tmp file prefix.
-         */
-        function getTmpPrefix() 
-        {
-                Return $this->config['tmp_prefix'];
-        }
-
-        /**
-         * Get the sub directories in the base dir.
-         * Each array element contain
-         * the relative path (relative to the base dir) as key and the 
-         * full path as value.
-         * @return array of sub directries
-         * <code>array('path name' => 'full directory path', ...)</code>
-         */
-        function getDirs() 
-        {
-                if(is_null($this->dirs))
-                {
-                        $dirs = $this->_dirs($this->getImagesDir(),'/');
-                        ksort($dirs);
-                        $this->dirs = $dirs;
-                }
-                return $this->dirs;
-        }
-
-        /**
-         * Recursively travese the directories to get a list
-         * of accessable directories.
-         * @param string $base the full path to the current directory
-         * @param string $path the relative path name
-         * @return array of accessiable sub-directories
-         * <code>array('path name' => 'full directory path', ...)</code>
-         */
-        function _dirs($base, $path) 
-        {
-                $base = Files::fixPath($base);
-                $dirs = array();
-
-                if($this->isValidBase() == false)
-                        return $dirs;
-
-                $d = @dir($base);
-                
-                while (false !== ($entry = $d->read())) 
-                {
-                        //If it is a directory, and it doesn't start with
-                        // a dot, and if is it not the thumbnail directory
-                        if(is_dir($base.$entry) 
-                                && substr($entry,0,1) != '.'
-                                && $this->isThumbDir($entry) == false) 
-                        {
-                                $relative = Files::fixPath($path.$entry);
-                                $fullpath = Files::fixPath($base.$entry);
-                                $dirs[$relative] = $fullpath;
-                                $dirs = array_merge($dirs, $this->_dirs($fullpath, $relative));
-                        }
-                }
-                $d->close();
-
-                Return $dirs;
-        }
-
-        /**
-         * Get all the files and directories of a relative path.
-         * @param string $path relative path to be base path.
-         * @return array of file and path information.
-         * <code>array(0=>array('relative'=>'fullpath',...), 1=>array('filename'=>fileinfo array(),...)</code>
-         * fileinfo array: <code>array('url'=>'full url', 
-         *                       'relative'=>'relative to base', 
-         *                        'fullpath'=>'full file path', 
-         *                        'image'=>imageInfo array() false if not image,
-         *                        'stat' => filestat)</code>
-         */
-        function getFiles($path) 
-        {
-                $files = array();
-                $dirs = array();
-
-                if($this->isValidBase() == false)
-                        return array($files,$dirs);
-
-                $path = Files::fixPath($path);
-                $base = Files::fixPath($this->getImagesDir());
-                $fullpath = Files::makePath($base,$path);
-
-
-                $d = @dir($fullpath);
-                
-                while (false !== ($entry = $d->read())) 
-                {
-                        //not a dot file or directory
-                        if(substr($entry,0,1) != '.')
-                        {
-                                if(is_dir($fullpath.$entry)
-                                        && $this->isThumbDir($entry) == false)
-                                {
-                                        $relative = Files::fixPath($path.$entry);
-                                        $full = Files::fixPath($fullpath.$entry);
-                                        $count = $this->countFiles($full);
-                                        $dirs[$relative] = array('fullpath'=>$full,'entry'=>$entry,'count'=>$count);
-                                }
-                                else if(is_file($fullpath.$entry) && $this->isThumb($entry)==false && $this->isTmpFile($entry) == false) 
-                                {
-                                        $img = $this->getImageInfo($fullpath.$entry);
-
-                                        if(!(!is_array($img)&&$this->config['validate_images']))
-                                        {
-                                                $file['url'] = Files::makePath($this->config['base_url'],$path).$entry;
-                                                $file['relative'] = $path.$entry;
-                                                $file['fullpath'] = $fullpath.$entry;
-                                                $file['image'] = $img;
-                                                $file['stat'] = stat($fullpath.$entry);
-                                                $files[$entry] = $file;
-                                        }
-                                }
-                        }
-                }
-                $d->close();
-                ksort($dirs);
-                ksort($files);
-                
-                Return array($dirs, $files);
-        }       
-
-        /**
-         * Count the number of files and directories in a given folder
-         * minus the thumbnail folders and thumbnails.
-         */
-        function countFiles($path) 
-        {
-                $total = 0;
-
-                if(is_dir($path)) 
-                {
-                        $d = @dir($path);
-
-                        while (false !== ($entry = $d->read())) 
-                        {
-                                //echo $entry."<br>";
-                                if(substr($entry,0,1) != '.'
-                                        && $this->isThumbDir($entry) == false
-                                        && $this->isTmpFile($entry) == false
-                                        && $this->isThumb($entry) == false) 
-                                {
-                                        $total++;
-                                }
-                        }
-                        $d->close();
-                }
-                return $total;
-        }
-
-        /**
-         * Get image size information.
-         * @param string $file the image file
-         * @return array of getImageSize information, 
-         *  false if the file is not an image.
-         */
-        function getImageInfo($file) 
-        {
-                Return @getImageSize($file);
-        }
-
-        /**
-         * Check if the file contains the thumbnail prefix.
-         * @param string $file filename to be checked
-         * @return true if the file contains the thumbnail prefix, false otherwise.
-         */
-        function isThumb($file) 
-        {
-                $len = strlen($this->config['thumbnail_prefix']);
-                if(substr($file,0,$len)==$this->config['thumbnail_prefix'])
-                        Return true;
-                else
-                        Return false;
-        }
-
-        /**
-         * Check if the given directory is a thumbnail directory.
-         * @param string $entry directory name
-         * @return true if it is a thumbnail directory, false otherwise
-         */
-        function isThumbDir($entry) 
-        {
-                if($this->config['thumbnail_dir'] == false
-                        || strlen(trim($this->config['thumbnail_dir'])) == 0)
-                        Return false;           
-                else
-                        Return ($entry == $this->config['thumbnail_dir']);
-        }
-
-        /**
-         * Check if the given file is a tmp file.
-         * @param string $file file name
-         * @return boolean true if it is a tmp file, false otherwise
-         */
-        function isTmpFile($file) 
-        {
-                $len = strlen($this->config['tmp_prefix']);
-                if(substr($file,0,$len)==$this->config['tmp_prefix'])
-                        Return true;
-                else
-                        Return false;           
-        }
-
-        /**
-         * For a given image file, get the respective thumbnail filename
-         * no file existence check is done.
-         * @param string $fullpathfile the full path to the image file
-         * @return string of the thumbnail file
-         */
-        function getThumbName($fullpathfile) 
-        {
-                $path_parts = pathinfo($fullpathfile);
-                
-                $thumbnail = $this->config['thumbnail_prefix'].$path_parts['basename'];
-
-                if( strlen(trim($this->config['thumbnail_dir'])) == 0 || $this->config['safe_mode'] == true)
-                {
-                        Return Files::makeFile($path_parts['dirname'],$thumbnail);
-                }
-                else
-                {
-                                $path = Files::makePath($path_parts['dirname'],$this->config['thumbnail_dir']);
-                                if(!is_dir($path))
-                                        Files::createFolder($path);
-                                Return Files::makeFile($path,$thumbnail);
-                }
-        }
-        
-        /**
-         * Similar to getThumbName, but returns the URL, base on the
-         * given base_url in config.inc.php
-         * @param string $relative the relative image file name, 
-         * relative to the base_dir path
-         * @return string the url of the thumbnail
-         */
-        function getThumbURL($relative) 
-        {
-
-                _ddt( __FILE__, __LINE__, "getThumbURL(): relative is '$relative'" );
-
-                $path_parts = pathinfo($relative);
-                $thumbnail = $this->config['thumbnail_prefix'].$path_parts['basename'];
-                if($path_parts['dirname']=='\\') $path_parts['dirname']='/';
-
-                if($this->config['safe_mode'] == true
-                        || strlen(trim($this->config['thumbnail_dir'])) == 0)
-                {
-                        Return Files::makeFile($this->getImagesURL(),$thumbnail);
-                }
-                else
-                {
-                        if(strlen(trim($this->config['thumbnail_dir'])) > 0)
-                        {
-                                $path = Files::makePath($path_parts['dirname'],$this->config['thumbnail_dir']);
-                                $url_path = Files::makePath($this->getImagesURL(), $path);
-
-                                _ddt( __FILE__, __LINE__, "getThumbURL(): url_path is '$url_path'" );
-
-                                Return Files::makeFile($url_path,$thumbnail);
-                        }
-                        else //should this ever happen?
-                        {
-                                //error_log('ImageManager: Error in creating thumbnail url');
-                        }
-
-                }
-        }
-
-
-        /**
-         * For a given image file, get the respective resized filename
-         * no file existence check is done.
-         * @param string $fullpathfile the full path to the image file
-         * @param integer $width the intended width
-         * @param integer $height the intended height
-         * @param boolean $mkDir whether to attempt to make the resized_dir if it doesn't exist
-         * @return string of the resized filename
-         */
-        function getResizedName($fullpathfile, $width, $height, $mkDir = TRUE)
-        {
-                $path_parts = pathinfo($fullpathfile);
-
-                $thumbnail = $this->config['resized_prefix']."_{$width}x{$height}_{$path_parts['basename']}";
-
-                if( strlen(trim($this->config['resized_dir'])) == 0 || $this->config['safe_mode'] == true )
-                {
-                        Return Files::makeFile($path_parts['dirname'],$thumbnail);
-                }
-                else
-                {
-                        $path = Files::makePath($path_parts['dirname'],$this->config['resized_dir']);
-                        if($mkDir && !is_dir($path))
-                                Files::createFolder($path);
-                        Return Files::makeFile($path,$thumbnail);
-                }
-        }
-
-        /**
-         * Check if the given path is part of the subdirectories
-         * under the base_dir.
-         * @param string $path the relative path to be checked
-         * @return boolean true if the path exists, false otherwise
-         */
-        function validRelativePath($path) 
-        {
-                $dirs = $this->getDirs();
-                if($path == '/')
-                        Return true;
-                //check the path given in the url against the 
-                //list of paths in the system.
-                for($i = 0; $i < count($dirs); $i++)
-                {
-                        $key = key($dirs);
-                        //we found the path
-                        if($key == $path)
-                                Return true;
-                
-                        next($dirs);
-                }               
-                Return false;
-        }
-
-        /**
-         * Process uploaded files, assumes the file is in 
-         * $_FILES['upload'] and $_POST['dir'] is set.
-         * The dir must be relative to the base_dir and exists.
-         * If 'validate_images' is set to true, only file with
-         * image dimensions will be accepted.
-         * @return null
-         */
-        function processUploads() 
-        {
-                if($this->isValidBase() == false)
-                        return;
-
-                $relative = null;
-
-                if(isset($_POST['dir'])) 
-                        $relative = rawurldecode($_POST['dir']);
-                else
-                        return;
-
-                //check for the file, and must have valid relative path
-                if(isset($_FILES['upload']) && $this->validRelativePath($relative))
-                {
-                        $this->_processFiles($relative, $_FILES['upload']);
-                }
-        }
-
-        /**
-         * Process upload files. The file must be an 
-         * uploaded file. If 'validate_images' is set to
-         * true, only images will be processed. Any duplicate
-         * file will be renamed. See Files::copyFile for details
-         * on renaming.
-         * @param string $relative the relative path where the file
-         * should be copied to.
-         * @param array $file the uploaded file from $_FILES
-         * @return boolean true if the file was processed successfully, 
-         * false otherwise
-         */
-        function _processFiles($relative, $file)
-        {
-                
-                if($file['error']!=0)
-                {
-                        Return false;
-                }
-
-                if(!is_file($file['tmp_name']))
-                {
-                        Return false;
-                }
-
-                if(!is_uploaded_file($file['tmp_name']))
-                {
-                        Files::delFile($file['tmp_name']);
-                        Return false;
-                }
-                
-
-                if($this->config['validate_images'] == true)
-                {
-                        $imgInfo = @getImageSize($file['tmp_name']);
-                        if(!is_array($imgInfo))
-                        {
-                                Files::delFile($file['tmp_name']);
-                                Return false;
-                        }
-                }
-
-                //now copy the file
-                $path = Files::makePath($this->getImagesDir(),$relative);
-                $result = Files::copyFile($file['tmp_name'], $path, $file['name']);
-
-                //no copy error
-                if(!is_int($result))
-                {
-                        Files::delFile($file['tmp_name']);
-                        Return true;
-                }
-
-                //delete tmp files.
-                Files::delFile($file['tmp_name']);
-                Return false;
-        }
-
-        /**
-         * Get the URL of the relative file.
-         * basically appends the relative file to the 
-         * base_url given in config.inc.php
-         * @param string $relative a file the relative to the base_dir
-         * @return string the URL of the relative file.
-         */
-        function getFileURL($relative) 
-        {
-                Return Files::makeFile($this->getImagesURL(),$relative);
-        }
-
-        /**
-         * Get the fullpath to a relative file.
-         * @param string $relative the relative file.
-         * @return string the full path, .ie. the base_dir + relative.
-         */
-        function getFullPath($relative) 
-        {
-                Return Files::makeFile($this->getImagesDir(),$relative);;
-        }
-
-        /**
-         * Get the default thumbnail.
-         * @return string default thumbnail, empty string if 
-         * the thumbnail doesn't exist.
-         */
-        function getDefaultThumb() 
-        {
-
-                // FIXME: hack
-
-                Return $this->config['default_thumbnail'];
-
-                if(is_file($this->config['default_thumbnail']))
-                        {
-                        Return $this->config['default_thumbnail'];
-                        }
-                else 
-                        Return '';
-        }
-
-
-        /**
-         * Get the thumbnail url to be displayed. 
-         * If the thumbnail exists, and it is up-to-date
-         * the thumbnail url will be returns. If the 
-         * file is not an image, a default image will be returned.
-         * If it is an image file, and no thumbnail exists or 
-         * the thumbnail is out-of-date (i.e. the thumbnail 
-         * modified time is less than the original file)
-         * then a thumbs.php?img=filename.jpg is returned.
-         * The thumbs.php url will generate a new thumbnail
-         * on the fly. If the image is less than the dimensions
-         * of the thumbnails, the image will be display instead.
-         * @param string $relative the relative image file.
-         * @return string the url of the thumbnail, be it
-         * actually thumbnail or a script to generate the
-         * thumbnail on the fly.
-         */
-        function getThumbnail($relative) 
-        {
-
-                global $IMConfig;
-
-                _ddt( __FILE__, __LINE__, "getThumbnail(): top with '$relative'" );
-
-                $fullpath = Files::makeFile($this->getImagesDir(),$relative);
-
-                //not a file???
-                if(!is_file($fullpath))
-                        Return $this->getDefaultThumb();
-
-                $imgInfo = @getImageSize($fullpath);
-                
-                //not an image
-                if(!is_array($imgInfo))
-                        Return $this->getDefaultThumb();
-
-                //the original image is smaller than thumbnails,
-                //so just return the url to the original image.
-                if ($imgInfo[0] <= $this->config['thumbnail_width']
-                 && $imgInfo[1] <= $this->config['thumbnail_height'])
-                        Return $this->getFileURL($relative);
-
-                $thumbnail = $this->getThumbName($fullpath);
-                
-                //check for thumbnails, if exists and
-                // it is up-to-date, return the thumbnail url
-                if(is_file($thumbnail))
-                {
-                        if(filemtime($thumbnail) >= filemtime($fullpath))
-                                {
-                                _ddt( __FILE__, __LINE__, "getThumbnail(): returning url '" . $this->getThumbURL($relative) . "'" );
-
-                                Return $this->getThumbURL($relative);
-                                }
-                }
-
-                //well, no thumbnail was found, so ask the thumbs.php
-                //to generate the thumbnail on the fly.
-                Return $IMConfig['backend_url'] . '__function=thumbs&img='.rawurlencode($relative);
-        }
-
-        /**
-         * Delete and specified files.
-         * @return boolean true if delete, false otherwise
-         */
-        function deleteFiles() 
-        {
-                if(isset($_GET['delf']))
-                        $this->_delFile(rawurldecode($_GET['delf']));
-        }
-
-        /**
-         * Delete and specified directories.
-         * @return boolean true if delete, false otherwise
-         */
-        function deleteDirs() 
-        {
-                 if(isset($_GET['deld']))
-                        return $this->_delDir(rawurldecode($_GET['deld']));             
-                 else
-                         Return false;
-        }
-
-        /**
-         * Delete the relative file, and any thumbnails.
-         * @param string $relative the relative file.
-         * @return boolean true if deleted, false otherwise.
-         */
-        function _delFile($relative) 
-        {
-                $fullpath = Files::makeFile($this->getImagesDir(),$relative);
-                
-                //check that the file is an image
-                if($this->config['validate_images'] == true)
-                {
-                        if(!is_array($this->getImageInfo($fullpath)))
-                                return false; //hmmm not an Image!!???
-                }
-
-                $thumbnail = $this->getThumbName($fullpath);
-
-                if(Files::delFile($fullpath))
-                        Return Files::delFile($thumbnail);
-                else
-                        Return false;
-        }
-
-        /**
-         * Delete directories recursively.
-         * @param string $relative the relative path to be deleted.
-         * @return boolean true if deleted, false otherwise.
-         */
-        function _delDir($relative) 
-        {
-                $fullpath = Files::makePath($this->getImagesDir(),$relative);
-                if($this->countFiles($fullpath) <= 0)
-                        return Files::delFolder($fullpath,true); //delete recursively.
-                else
-                        Return false;
-        }
-
-        /**
-         * Create new directories.
-         * If in safe_mode, nothing happens.
-         * @return boolean true if created, false otherwise.
-         */
-        function processNewDir() 
-        {
-                if($this->config['safe_mode'] == true)
-                        Return false;
-
-                if(isset($_GET['newDir']) && isset($_GET['dir']))
-                {
-                        $newDir = rawurldecode($_GET['newDir']);
-                        $dir = rawurldecode($_GET['dir']);
-                        $path = Files::makePath($this->getImagesDir(),$dir);
-                        $fullpath = Files::makePath($path, Files::escape($newDir));
-                        if(is_dir($fullpath))
-                                Return false;
-
-                        Return Files::createFolder($fullpath);
-                }
-        }
-}
-
-?>
->>>>>>> .merge-right.r760

branches/ray/plugins/Linker/dialog.html

@@ -99 +99 @@
   </fieldset>
 
-  <div style="text-align:right">
+  <div class="buttons">
     <input type="button" id="[ok]"     value="_(OK)"     />
-    <input type="button" id="[clear]"  value="_(Remove Link)" onclick="this.form['[href]'].value='';this.form['[to]'].value='';document.getElementById('[ok]').click();" />
+    <input type="button" id="[clear]" value="_(Remove Link)" onclick="this.form['[href]'].value='';this.form['[to]'].value='';document.getElementById('[ok]').click();" />
     <input type="button" id="[cancel]" value="_(Cancel)" />
   </div>

branches/ray/plugins/Linker/linker.js

@@ -366 +366 @@
 
   // 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 dialog = this.dialog = new Xinha.Dialog(linker.editor, this.html, 'Linker',{width:600,height:400});
   var dTreeName = Xinha.uniq('dTree_');
 
@@ -379 +379 @@
   //ddTree.innerHTML = this.dTree.toString();
   ddTree.innerHTML = '';
-  ddTree.style.position = 'absolute';
-  ddTree.style.left = 1 + 'px';
-  ddTree.style.top =  0 + 'px';
+//  ddTree.style.position = 'absolute';
+//  ddTree.style.left = 1 + 'px';
+ // ddTree.style.top =  0 + 'px';
   ddTree.style.overflow = 'auto';
+  ddTree.style.height = '300px';
+  if ( Xinha.is_ie )
+  {
+    ddTree.style.styleFloat = "left";
+  }
+  else
+  {
+    ddTree.style.cssFloat = "left";
+  }
   ddTree.style.backgroundColor = 'white';
   this.ddTree = ddTree;
@@ -388 +397 @@
 
   var options = this.dialog.getElementById('options');
-  options.style.position = 'absolute';
-  options.style.top      = 0   + 'px';
-  options.style.right    = 0   + 'px';
+  //options.style.position = 'absolute';
+  //options.style.top      = 0   + 'px';
+  //options.style.right    = 0   + 'px';
   options.style.width    = 320 + 'px';
   options.style.overflow = 'auto';
 
   // Hookup the resizer
+  this.dialog.rootElem.style.paddingBottom ="0";
   this.dialog.onresize = function()
     {
       var h = parseInt(dialog.height) - dialog.getElementById('h1').offsetHeight;
-      var w = parseInt(dialog.width)  - 322 ;
+      var w = parseInt(dialog.width)  - 330 ;
+
       // An error is thrown with IE when trying to set a negative width or a negative height
       // But perhaps a width / height of 0 is not the minimum required we need to set
       if (w<0) w = 0;
       if (h<0) h = 0;
-      options.style.height = ddTree.style.height = h + 'px';
+      //options.style.height =
+       ddTree.style.height = h + 'px';
       ddTree.style.width  = w + 'px';
     }
-
   this.ready = true;
 };

branches/ray/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()
+{
+        this._prepareDialog();
+};
 
+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);
-                        }
+
+        if(!this.html) // retrieve the raw dialog contents
+        {
+                Xinha._getback(_editor_url + 'plugins/PasteText/popups/paste_text.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, '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
+
+        }
+        this.ready = true;
+};
+
+PasteText.prototype.show = function()
+{
+        if(!this.ready) // if the user is too fast clicking the, we have to make them wait
+        {
+                var self = this;
+                window.setTimeout(function() {self.show();},100);
+                return;
+        }
+        // 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( _editor_url+ "plugins/PasteText/popups/paste_text.html", action, outparam);
+        else
+        {
+                html = html.replace(/\n/g,"<br />");
+                this.editor.insertHTML(html);
+        }
 };

branches/ray/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>
-<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]">Paste as Plain Text</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]" /> Insert text in new paragraph 
 </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>
-</body>
-</html>

branches/ray/plugins/SmartReplace/dialog.html

@@ -11 +11 @@
   </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">
+  <input type="button" id="[ok]"     value="_(OK)"     />
+  <input type="button" id="[cancel]" value="_(Cancel)" />
+</div>

branches/ray/plugins/SmartReplace/smart-replace.js

@@ -263 +263 @@
         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;
                 }
         }
@@ -282 +282 @@
                 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(_editor_url + 'plugins/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(_editor_url + 'plugins/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',{width:300});
 
   this.ready = true;
 };
 
-SmartReplace.Dialog.prototype._lc = SmartReplace.prototype._lc;
-
-SmartReplace.Dialog.prototype.show = function(inputs, ok, cancel)
+SmartReplace.prototype.show = function(inputs, ok, cancel)
 {
   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;
+  var self = this;
   if(ok)
   {
@@ -345 +324 @@
   else
   {
-    this.dialog.getElementById('ok').onclick = function() {pluginDialogObject.hide();};
+    this.dialog.getElementById('ok').onclick = function() {self.dialog.hide();};
   }
 
@@ -354 +333 @@
   else
   {
-    this.dialog.getElementById('cancel').onclick = function() { pluginDialogObject.hide()};
-  }
-
-  // Show the dialog
-  this.mainPluginObject.editor.disableToolbar(['fullscreen','smartreplace']);
+    this.dialog.getElementById('cancel').onclick = function() { self.dialog.hide()};
+  }
 
   this.dialog.show(inputs);
@@ -365 +341 @@
   this.dialog.onresize();
 };
-
-SmartReplace.Dialog.prototype.hide = function()
-{
-  this.mainPluginObject.editor.enableToolbar();
-  return this.dialog.hide();
-};

branches/ray/plugins/Stylist/stylist.js

@@ -83 +83 @@
     var className = x.trim();
     var applicable = true;
+    var idApplicable = false;
     var apply_to   = active_elem;
 
@@ -96 +97 @@
       // No class name, just redefines a tag
       applicable = false;
+  
+      if (className.indexOf('#') >= 0)
+      {
+        idApplicable = true;
+      }
     }
 
@@ -147 +153 @@
     }
 
-    if(applicable)
-    {
-      // Remove the first .
-      className = className.substring(className.indexOf('.'), className.length);
-
-      // Replace any futher ones with spaces (for multiple class definitions)
-      className = className.replace('.', ' ');
+    if (idApplicable) // IDs
+    {
+       // requires specific html tag
+      tag = className.substring(0, className.indexOf('#')).toLowerCase();
+      var idName = className.substring(className.indexOf('#'), className.length);
+  
+      // To apply we must have an ancestor tag that is the right type
+      if(active_elem != null && active_elem.tagName.toLowerCase() == tag)
+      {
+        idApplicable = true;
+        apply_to = active_elem;
+      }
+      else
+      {
+        if(this._getFirstAncestor(this._getSelection(), [tag]) != null)
+        {
+          idApplicable = true;
+          apply_to = this._getFirstAncestor(this._getSelection(), [tag]);
+        }
+        else
+        {
+          // alert (this._getFirstAncestor(this._getSelection(), tag));
+          // If we don't have an ancestor, but it's a div/span/p/hx stle, we can make one
+          if(( tag == 'div' || tag == 'span' || tag == 'p'
+              || (tag.substr(0,1) == 'h' && tag.length == 2 && tag != 'hr')))
+          {
+            if(!this._selectionEmpty(this._getSelection()))
+            {
+              idApplicable = true;
+              apply_to = 'new';
+            }
+            else
+            {
+              // See if we can get a paragraph or header that can be converted
+              apply_to = this._getFirstAncestor(sel, ['p', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'h7']);
+              if(apply_to != null)
+              {
+                idApplicable = true;
+              }
+            }
+          }
+          else
+          {
+            idApplicable = false;
+          }
+        }
+      }    
+    }
+
+
+    if(applicable || idApplicable)
+    {
+
+      if (idApplicable)
+      {
+        // Remove the first .
+        idName = idName.substring(idName.indexOf('#'), idName.length);
+
+        // Replace any futher ones with spaces (for multiple id definitions (yes it happens))
+        idName = idName.replace('#', ' ');
+      }
+      else
+      {
+        // Remove the first .
+        className = className.substring(className.indexOf('.'), className.length);
+
+        // Replace any futher ones with spaces (for multiple class definitions)
+        className = className.replace('.', ' ');
+      }
 
       if(apply_to == null)
@@ -170 +238 @@
     }
 
-    var applied    = (this._ancestorsWithClasses(sel, tag, className).length > 0 ? true : false);
-    var applied_to = this._ancestorsWithClasses(sel, tag, className);
-
-    if(applicable)
+    if (idApplicable)
+    {
+      var applied    = (this._ancestorsWithIDs(sel, tag, idName).length > 0 ? true : false);
+      var applied_to = this._ancestorsWithIDs(sel, tag, idName);
+    }
+    else
+    {
+      var applied    = (this._ancestorsWithClasses(sel, tag, className).length > 0 ? true : false);
+      var applied_to = this._ancestorsWithClasses(sel, tag, className);
+    }
+
+    if(applicable || idApplicable)
     {
       var anch = document.createElement('a');
-      anch._stylist_className = className.trim();
+      if (idApplicable)
+        anch._stylist_idName = idName.trim();  
+      else
+        anch._stylist_className = className.trim();
       anch._stylist_applied   = applied;
       anch._stylist_appliedTo = applied_to;
@@ -185 +264 @@
       anch.href = 'javascript:void(0)';
       var editor = this;
-      anch.onclick = function()
-      {
-        if(this._stylist_applied == true)
-        {
-          editor._stylistRemoveClasses(this._stylist_className, this._stylist_appliedTo);
-        }
-        else
-        {
-          editor._stylistAddClasses(this._stylist_applyTo, this._stylist_applyTag, this._stylist_className);
-        }
-        return false;
+      if (idApplicable)
+      {  
+        anch.onclick = function()
+        {
+          if(this._stylist_applied == true)
+          {
+            editor._stylistRemoveIDs(this._stylist_idName, this._stylist_appliedTo);
+          }
+          else
+          {
+            editor._stylistAddIDs(this._stylist_applyTo, this._stylist_applyTag, this._stylist_idName);
+          }
+          return false;
+        }
+      }
+      else
+      {
+        anch.onclick = function()
+        {
+          if(this._stylist_applied == true)
+          {
+            editor._stylistRemoveClasses(this._stylist_className, this._stylist_appliedTo);
+          }
+          else
+          {
+            editor._stylistAddClasses(this._stylist_applyTo, this._stylist_applyTag, this._stylist_className);
+          }
+          return false;
+        }
       }
 
@@ -253 +350 @@
     this.updateToolbar();
   };
+  
+HTMLArea.prototype._stylistAddIDs = function(el, tag, ids)
+  {
+    if(el == 'new')
+    {
+      this.insertHTML('<' + tag + ' id="' + ids + '">' + this.getSelectedHTML() + '</' + tag + '>');
+    }
+    else
+    {
+      if(tag != null && el.tagName.toLowerCase() != tag)
+      {
+        // Have to change the tag!
+        var new_el = this.switchElementTag(el, tag);
+
+        if(typeof el._stylist_usedToBe != 'undefined')
+        {
+          new_el._stylist_usedToBe = el._stylist_usedToBe;
+          new_el._stylist_usedToBe[new_el._stylist_usedToBe.length] = {'tagName' : el.tagName, 'id' : el.getAttribute('id')};
+        }
+        else
+        {
+          new_el._stylist_usedToBe = [{'tagName' : el.tagName, 'id' : el.getAttribute('id')}];
+        }
+
+        HTMLArea.addIDs(new_el, ids);
+      }
+      else
+      {
+        HTMLArea._addIDs(el, ids);
+      }
+    }
+    this.focusEditor();
+    this.updateToolbar();
+  };  
 
 /**
@@ -266 +397 @@
     this.updateToolbar();
   };
+  
+HTMLArea.prototype._stylistRemoveIDs = function(ids, from)
+  {
+    for(var x = 0; x < from.length; x++)
+    {
+      this._stylistRemoveIDsFull(from[x], ids);
+    }
+    this.focusEditor();
+    this.updateToolbar();
+  };  
 
 HTMLArea.prototype._stylistRemoveClassesFull = function(el, classes)
@@ -336 +477 @@
 };
 
+HTMLArea.prototype._stylistRemoveIDsFull = function(el, ids)
+{
+  if(el != null)
+  {
+    var thiers = el.id.trim().split(' ');
+    var new_thiers = [ ];
+    var ours   = ids.split(' ');
+    for(var x = 0; x < thiers.length; x++)
+    {
+      var exists = false;
+      for(var i = 0; exists == false && i < ours.length; i++)
+      {
+        if(ours[i] == thiers[x])
+        {
+          exists = true;
+        }
+      }
+      if(exists == false)
+      {
+        new_thiers[new_thiers.length] = thiers[x];
+      }
+    }
+
+    if(new_thiers.length == 0 && el._stylist_usedToBe && el._stylist_usedToBe.length > 0 && el._stylist_usedToBe[el._stylist_usedToBe.length - 1].id != null)
+    {
+      // Revert back to what we were IF the classes are identical
+      var last_el = el._stylist_usedToBe[el._stylist_usedToBe.length - 1];
+      var last_ids = HTMLArea.arrayFilter(last_el.id.trim().split(' '), function(c) { if (c == null || c.trim() == '') { return false;} return true; });
+
+      if(
+        (new_thiers.length == 0)
+        ||
+        (
+        HTMLArea.arrayContainsArray(new_thiers, last_ids)
+        && HTMLArea.arrayContainsArray(last_ids, new_thiers)
+        )
+      )
+      {
+        el = this.switchElementTag(el, last_el.tagName);
+        new_thiers = last_ids;
+      }
+      else
+      {
+        // We can't rely on the remembered tags any more
+        el._stylist_usedToBe = [ ];
+      }
+    }
+
+    if(     new_thiers.length > 0
+        ||  el.tagName.toLowerCase() != 'span'
+        || (el.id && el.id != '')
+      )
+    {
+      el.id = new_thiers.join(' ').trim();
+    }
+    else
+    {
+      // Must be a span with no classes and no id, so we can splice it out
+      var prnt = el.parentNode;
+      var childs = el.childNodes;
+      for(var x = 0; x < childs.length; x++)
+      {
+        prnt.insertBefore(childs[x], el);
+      }
+      prnt.removeChild(el);
+    }
+  }
+};
+
 /**
  * Change the tag of an element
@@ -427 +637 @@
 
           if(!found_class)
+          {
+            found_all = false;
+            break;
+          }
+        }
+
+        if(found_all) ancestors[ancestors.length] = prnt;
+      }
+      if(prnt.tagName.toLowerCase() == 'body')    break;
+      if(prnt.tagName.toLowerCase() == 'table'  ) break;
+    }
+    prnt = prnt.parentNode;
+  }
+
+  return ancestors;
+};
+
+HTMLArea.prototype._ancestorsWithIDs = function(sel, tag, ids)
+{
+  var ancestors = [ ];
+  var prnt = this._activeElement(sel);
+  if(prnt == null)
+  {
+    try
+    {
+      prnt = (HTMLArea.is_ie ? this._createRange(sel).parentElement() : this._createRange(sel).commonAncestorContainer);
+    }
+    catch(e)
+    {
+      return ancestors;
+    }
+  }
+  var search_ids = ids.trim().split(' ');
+
+  while(prnt)
+  {
+    if(prnt.nodeType == 1 && prnt.id)
+    {
+      if(tag == null || prnt.tagName.toLowerCase() == tag)
+      {
+        var ids = prnt.id.trim().split(' ');
+        var found_all = true;
+        for(var i = 0; i < search_ids.length; i++)
+        {
+          var found_id = false;
+          for(var x = 0; x < ids.length; x++)
+          {
+            if(search_ids[i] == ids[x])
+            {
+              found_id = true;
+              break;
+            }
+          }
+
+          if(!found_id)
           {
             found_all = false;

branches/ray/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>

branches/ray/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..."
 };

branches/ray/plugins/SuperClean/super-clean.js

@@ -37 +37 @@
   var doOK = function()
   {
-    var opts = superclean._dialog.hide();
+    superclean._dialog.dialog.getElementById("main").style.display = "none";
+    superclean._dialog.dialog.getElementById("waiting").style.display = "";
+    superclean._dialog.dialog.getElementById("buttons").style.display = "none";
+    
+        var opts = superclean._dialog.dialog.getValues();
     var editor = superclean.editor;
 
@@ -66 +70 @@
           case 'setHTML':
             editor.setHTML(response.value);
+            superclean._dialog.hide();
           break;
           case 'alert':
-            alert(superclean._lc(response.value));
+            superclean._dialog.dialog.getElementById("buttons").style.display = "";
+            superclean._dialog.dialog.getElementById("ok").style.display = "none";
+            superclean._dialog.dialog.getElementById("waiting").style.display = "none"; 
+            superclean._dialog.dialog.getElementById("alert").style.display = ""; 
+            superclean._dialog.dialog.getElementById("alert").innerHTML = superclean._lc(response.value);
+          break;
+          default: // make the dialog go away if sth goes wrong, who knows...
+           superclean._dialog.hide();
           break;
         }
       }
       Xinha._postback(editor.config.SuperClean.tidy_handler, {'content' : editor.getInnerHTML()},callback);
+    }
+    else
+    {
+      superclean._dialog.hide();
     }
     return true;
@@ -189 +205 @@
 
 
-SuperClean.prototype.onGenerate = function()
+SuperClean.prototype.onGenerateOnce = function()
 {
   if(this.editor.config.SuperClean.show_dialog && !this._dialog)
@@ -282 +298 @@
 
   // Now we have everything we need, so we can build the dialog.
-  var dialog = this.dialog = new Xinha.Dialog(SuperClean.editor, this.html, 'SuperClean');
+  var dialog = this.dialog = new Xinha.Dialog(SuperClean.editor, this.html, 'SuperClean',{width:400});
 
   this.ready = true;
@@ -331 +347 @@
 {
   this.SuperClean.editor.enableToolbar();
+  this.dialog.getElementById("main").style.display = "";
+  this.dialog.getElementById("buttons").style.display = "";
+  this.dialog.getElementById("waiting").style.display = "none";
+  this.dialog.getElementById("alert").style.display = "none";
+  this.dialog.getElementById("ok").style.display = "";
   return this.dialog.hide();
 };

branches/ray/plugins/SuperClean/tidy.php

@@ -116 +116 @@
     ob_end_clean();
 
-    if(!strlen($content))
+    if(strlen($content) < 5)
     {
       // Tidy on the local machine failed, try a post