Changeset 975

Timestamp:

02/20/08 19:12:57 (5 years ago)

Author:

ray

Message:

updated branch

Location:

branches/ray

Files:

• Xinha.css (modified) (1 diff)
• XinhaCore.js (modified) (50 diffs)
• XinhaLoader.js (modified) (5 diffs)
• contrib/compress.php (modified) (5 diffs)
• contrib/compress_yui.php (copied) (copied from trunk/contrib/compress_yui.php)
• contrib/php-xinha.php (modified) (2 diffs)
• examples/Extended.html (deleted)
• examples/ExtendedDemo.html (copied) (copied from trunk/examples/ExtendedDemo.html)
• examples/Newbie.html (modified) (2 diffs)
• examples/XinhaConfig.js (modified) (4 diffs)
• examples/custom.css (deleted)
• examples/dynamic.css (deleted)
• examples/ext_example-body.html (deleted)
• examples/ext_example-dest.php (deleted)
• examples/ext_example-menu.php (deleted)
• examples/ext_example.html (deleted)
• examples/files (copied) (copied from trunk/examples/files)
• examples/files/Extended.html (copied) (copied from trunk/examples/files/Extended.html)
• examples/files/custom.css (copied) (copied from trunk/examples/files/custom.css)
• examples/files/dynamic.css (copied) (copied from trunk/examples/files/dynamic.css)
• examples/files/ext_example-body.html (copied) (copied from trunk/examples/files/ext_example-body.html)
• examples/files/ext_example-dest.php (copied) (copied from trunk/examples/files/ext_example-dest.php)
• examples/files/ext_example-menu.php (copied) (copied from trunk/examples/files/ext_example-menu.php)
• examples/files/full_example.css (copied) (copied from trunk/examples/files/full_example.css)
• examples/files/stylist.css (copied) (copied from trunk/examples/files/stylist.css)
• examples/full_example.css (deleted)
• examples/full_example.js (deleted)
• examples/simple_example.html (modified) (4 diffs)
• examples/stylist.css (deleted)
• examples/testbed.html (modified) (7 diffs)
• lang/es.js (modified) (2 diffs)
• lang/fa.js (modified) (1 diff)
• modules/ColorPicker/ColorPicker.js (modified) (5 diffs)
• modules/Dialogs/XinhaDialog.js (modified) (4 diffs)
• modules/Dialogs/dialog.js (modified) (1 diff)
• modules/FullScreen/full-screen.js (modified) (1 diff)
• modules/Gecko/Gecko.js (modified) (10 diffs)
• modules/Gecko/lang (deleted)
• modules/Gecko/paraHandlerDirty.js (deleted)
• modules/GetHtml/DOMwalk.js (modified) (3 diffs)
• modules/GetHtml/TransformInnerHTML.js (modified) (2 diffs)
• modules/InternetExplorer/InternetExplorer.js (modified) (6 diffs)
• modules/WebKit (copied) (copied from trunk/modules/WebKit)
• modules/WebKit/WebKit.js (copied) (copied from trunk/modules/WebKit/WebKit.js)
• plugins/ExtendedFileManager/Classes/ExtendedFileManager.php (modified) (1 diff)
• plugins/ExtendedFileManager/assets/EditorContent.js (modified) (24 diffs)
• plugins/ExtendedFileManager/assets/dialog.js (modified) (1 diff)
• plugins/ExtendedFileManager/assets/dragTableCols.js (copied) (copied from trunk/plugins/ExtendedFileManager/assets/dragTableCols.js)
• plugins/ExtendedFileManager/assets/editor.css (modified) (4 diffs)
• plugins/ExtendedFileManager/assets/editor.js (modified) (8 diffs)
• plugins/ExtendedFileManager/assets/editorFrame.css (modified) (1 diff)
• plugins/ExtendedFileManager/assets/editorFrame.js (modified) (4 diffs)
• plugins/ExtendedFileManager/assets/imagelist.css (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/manager.css (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/manager.js (modified) (9 diffs)
• plugins/ExtendedFileManager/assets/popup.js (modified) (1 diff)
• plugins/ExtendedFileManager/assets/wz_jsgraphics.js (modified) (6 diffs)
• plugins/ExtendedFileManager/config.inc.php (modified) (4 diffs)
• plugins/ExtendedFileManager/demo_images/linux/linux.gif (modified) (previous)
• plugins/ExtendedFileManager/editor.php (copied) (copied from trunk/plugins/ExtendedFileManager/editor.php)
• plugins/ExtendedFileManager/editorFrame.php (modified) (2 diffs)
• plugins/ExtendedFileManager/extended-file-manager.js (modified) (5 diffs)
• plugins/ExtendedFileManager/images.php (modified) (12 diffs)
• plugins/ExtendedFileManager/lang/de.js (modified) (2 diffs)
• plugins/ExtendedFileManager/lang/es.js (copied) (copied from trunk/plugins/ExtendedFileManager/lang/es.js)
• plugins/ExtendedFileManager/lang/fr.js (copied) (copied from trunk/plugins/ExtendedFileManager/lang/fr.js)
• plugins/ExtendedFileManager/manager.php (modified) (7 diffs)
• plugins/ExtendedFileManager/resizer.php (modified) (1 diff)
• plugins/ImageManager/Classes/GD.php (modified) (9 diffs)
• plugins/ImageManager/Classes/IM.php (modified) (2 diffs)
• plugins/ImageManager/Classes/ImageEditor.php (modified) (7 diffs)
• plugins/ImageManager/assets/dialog.js (modified) (1 diff)
• plugins/ImageManager/assets/images.js (modified) (1 diff)
• plugins/ImageManager/demo_images/linux/linux.gif (modified) (previous)
• plugins/ImageManager/editor.php (modified) (1 diff)
• plugins/ImageManager/lang/es.js (copied) (copied from trunk/plugins/ImageManager/lang/es.js)
• plugins/ImageManager/manager.php (modified) (1 diff)
• plugins/ImageManager/resizer.php (modified) (1 diff)
• plugins/InsertAnchor/insert-anchor.js (modified) (1 diff)
• plugins/Linker/scan.php (modified) (3 diffs)
• plugins/SaveSubmit/save-submit.js (modified) (2 diffs)
• plugins/SmartReplace/smart-replace.js (modified) (5 diffs)
• plugins/Stylist/stylist.js (modified) (3 diffs)
• plugins/SuperClean/tidy.php (modified) (1 diff)
• popups/popup.js (modified) (1 diff)
• release-notes.txt (modified) (1 diff)
• skins/silva/skin.css (modified) (1 diff)

branches/ray/Xinha.css

@@ -71 +71 @@
 .htmlarea .toolbar select:hover,
 .htmlarea .toolbar select:active { 
-  margin-top: 2px;
-  margin-bottom: 1px;
-  color: ButtonText;
-  height: 17px;
+  position:relative;
+  top:-2px;
+  margin-bottom:-2px;
+  color: ButtonText;
 }
 

branches/ray/XinhaCore.js

@@ -22 +22 @@
     --        bar();
     --      }
-    --   * Don't change brace styles unless you're working on the non BSD-Style
-    --     area (so we don't get spurious changes in line numbering).
-    --   * Don't change indentation unless you're working on the badly indented
-    --     area (so we don't get spurious changes of large blocks of code).
+    --   * Don't change brace styles.
+    --   * Don't change indentation.
     --   * Jedit is the recommended editor, a comment of this format should be
     --     included in the top 10 lines of the file (see the embedded edit mode)
@@ -141 +139 @@
 */
 Xinha.is_khtml  = (Xinha.agt.indexOf("khtml") != -1);
+/** Browser is WebKit
+@type string 
+*/
+Xinha.is_webkit  = (Xinha.agt.indexOf("applewebkit") != -1);
 /** Browser is Safari
 @type string 
@@ -157 +159 @@
 */
 Xinha.is_win_ie = (Xinha.is_ie && !Xinha.is_mac);
-/** Browserengine is Gecko (Mozilla)
+/** Browserengine is Gecko (Mozilla), applies also to Safari
 @type string 
 */
-Xinha.is_gecko  = (navigator.product == "Gecko" && !Xinha.is_safari); // Safari lies!
+Xinha.is_gecko  = (navigator.product == "Gecko");
+Xinha.is_real_gecko = (navigator.product == "Gecko" && !Xinha.is_webkit);
+Xinha.is_ff3 = Xinha.is_real_gecko && parseInt(navigator.productSub) >= "2007121016";
+Xinha.is_ff2 = Xinha.is_real_gecko && parseInt(navigator.productSub) < "2007121016";
+
 /** File is opened locally opened ("file://" protocol)
  * @type string
@@ -178 +184 @@
 Xinha.checkSupportedBrowser = function()
 {
-  if ( Xinha.is_gecko )
-  {
-    if ( navigator.productSub < 20021201 )
-    {
-      alert("You need at least Mozilla-1.3 Alpha.\nSorry, your Gecko is not supported.");
+  if ( Xinha.is_opera )
+  {
+    // alert("Sorry, Opera is not yet supported by Xinha.");
       return false;
     }
-    if ( navigator.productSub < 20030210 )
-    {
-      alert("Mozilla < 1.3 Beta is not supported!\nI'll try, though, but it might not work.");
-    }
-  }
-  if ( Xinha.is_opera )
-  {
-    alert("Sorry, Opera is not yet supported by Xinha.");
-  }
-  return Xinha.is_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5;
+  return Xinha.is_gecko || (Xinha.is_opera && 0 && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5;
 };
 /** Cache result of checking for browser support
@@ -219 +214 @@
   if ( !textarea )
   {
-    throw("Tried to create Xinha without textarea specified.");
+    throw new Error ("Tried to create Xinha without textarea specified.");
   }
 
@@ -475 +470 @@
 Xinha.Config = function()
 {
-  var cfg = this;
   this.version = Xinha.version.Revision;
   
@@ -704 +698 @@
    *  your absolute links, your external string might be some special code, say "{server_url}"
    *  an you say that the internal represenattion of that should be http://your.server/<br />
-   *  Example:  <code>{'external_string' : 'internal_string'}</code><br />
+   *  Example:  <code>{ 'html_string' : 'wysiwyg_string' }</code><br />
    *  Default: <code>{}</code> (empty)
    *  @type Object
    */
-  this.specialReplacements = {}; // { 'external_string' : 'internal_string' }
+  this.specialReplacements = {}; //{ 'html_string' : 'wysiwyg_string' }
 
  /** Set to true if you want Word code to be cleaned upon Paste. This only works if 
@@ -745 +739 @@
   this.popupURL = "popups/";
 
-  /** Remove given tags when rendering the HTML (these have to be a regexp, or null if this functionality is not desired)<br />
+  /** RegExp allowing to remove certain HTML tags when rendering the HTML.<br />
+   *  Example: remove span and font tags
+   *  <code>
+   *    xinha_config.htmlRemoveTags = /span|font/;
+   *  </code>
    *  Default: <code>null</code>
    *  @type RegExp|null
@@ -1428 +1426 @@
   toolbar.className = "toolbar";
   toolbar.unselectable = "1";
+  toolbar.align = this.config.toolbarAlign;
 
   Xinha.freeLater(this, '_toolBar');
@@ -2046 +2045 @@
     editor._browserSpecificPlugin = editor.registerPlugin('InternetExplorer');
   }
-  else
+  else if (Xinha.is_webkit)
+  {
+    url = _editor_url + 'modules/WebKit/WebKit.js';
+    if ( !Xinha.loadPlugins(["WebKit"], function() { editor.generate(); }, url ) )
+    {            
+  
+      return false;
+    }
+    editor._browserSpecificPlugin = editor.registerPlugin('WebKit');
+  }
+  else if (Xinha.is_gecko)
   {
     url = _editor_url + 'modules/Gecko/Gecko.js';
@@ -2118 +2127 @@
 
   // If this is gecko, set up the paragraph handling now
-  if ( Xinha.is_gecko && ( editor.config.mozParaHandler == 'best' || editor.config.mozParaHandler == 'dirty' ) )
-  {
-    switch (this.config.mozParaHandler)
-    {
-      case 'dirty':
-        var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerDirty.js';
-      break;
-      default:
-        var ParaHandlerPlugin = _editor_url + 'modules/Gecko/paraHandlerBest.js';
-      break;
-    }
-    if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, ParaHandlerPlugin ) )
+  if ( Xinha.is_gecko &&  editor.config.mozParaHandler != 'built-in' )
+  {
+    if (  !Xinha.loadPlugins(["EnterParagraphs"], function() { editor.generate(); }, _editor_url + 'modules/Gecko/paraHandlerBest.js' ) )
     {
       return false;
@@ -2447 +2447 @@
   
   this.notifyOf('before_resize', {width:width, height:height});
+  this.firePluginEvent('onBeforeResize', width, height);
   // We need to set the iframe & textarea to 100% height so that the htmlarea
   // isn't "pushed out" when we get it's height, so we can change them later.
@@ -2628 +2629 @@
     edcellwidth -= parseInt(this.config.panel_dimensions.right, 10);    
   }
-  this._iframe.style.width = edcellwidth + 'px';
+  var iframeWidth = (this.config.iframeWidth)? parseInt(this.config.iframeWidth,10): null; 
+  this._iframe.style.width = (iframeWidth && iframeWidth < edcellwidth)? iframeWidth + "px": edcellwidth + "px"; 
 
   this._textArea.style.height = this._iframe.style.height;
@@ -2634 +2636 @@
      
   this.notifyOf('resize', {width:this._htmlArea.offsetWidth, height:this._htmlArea.offsetHeight});
+  this.firePluginEvent('onResize',this._htmlArea.offsetWidth, this._htmlArea.offsetWidth);
   this._risizing = false;
 };
@@ -2672 +2675 @@
 
   this.notifyOf('panel_change', {'action':'add','panel':div});
-
+  this.firePluginEvent('onPanelChange','add',div);
   return div;
 };
@@ -2691 +2694 @@
   this._panels[panel.side].panels = clean;
   this.notifyOf('panel_change', {'action':'remove','panel':panel});
+  this.firePluginEvent('onPanelChange','remove',panel);
 };
 /** Hides a panel
@@ -2702 +2706 @@
     panel.style.display = 'none';
     this.notifyOf('panel_change', {'action':'hide','panel':panel});
+    this.firePluginEvent('onPanelChange','hide',panel);
     try { this._iframe.contentWindow.scrollTo(pos.x,pos.y)} catch(e) { }
   }
@@ -2715 +2720 @@
     panel.style.display = '';
     this.notifyOf('panel_change', {'action':'show','panel':panel});
+    this.firePluginEvent('onPanelChange','show',panel);
     try { this._iframe.contentWindow.scrollTo(pos.x,pos.y)} catch(e) { }
   }
@@ -2738 +2744 @@
   }
   this.notifyOf('panel_change', {'action':'multi_hide','sides':sides});
+  this.firePluginEvent('onPanelChange','multi_hide',sides);
 };
 /** Shows the panel(s) on one or more sides
@@ -2759 +2766 @@
   }
   this.notifyOf('panel_change', {'action':'multi_show','sides':sides});
+  this.firePluginEvent('onPanelChange','multi_show',sides);
 };
 /** Returns an array containig all properties that are set in an object
@@ -2866 +2874 @@
     } catch (ex) {}
   }
-  else if ( !Xinha.is_gecko && this._doc.body.contentEditable !== false )
+  else if ( !Xinha.is_designMode && this._doc.body.contentEditable !== false )
   {
     this._doc.body.contentEditable = false;
@@ -2949 +2957 @@
     html += Xinha.addCoreCSS();
     
-    if ( editor.config.pageStyle )
-    {
-      html += "<style type=\"text/css\">\n" + editor.config.pageStyle + "\n</style>";
-    }
-
     if ( typeof editor.config.pageStyleSheets !== 'undefined' )
     {
@@ -2965 +2968 @@
       }
     }
+    
+    if ( editor.config.pageStyle )
+    {
+      html += "<style type=\"text/css\">\n" + editor.config.pageStyle + "\n</style>";
+    }
+    
     html += "</head>\n";
-    html += "<body>\n";
+    html += "<body" + (editor.config.bodyID ? (" id=\"" + editor.config.bodyID + "\"") : '') + ">\n";
     html +=   editor.inwardHtml(editor._textArea.value);
     html += "</body>\n";
@@ -3027 +3036 @@
   {
     case "textmode":
+      this.firePluginEvent('onBeforeMode', 'textmode');
       this.setCC("iframe");
       html = this.outwardHtml(this.getHTML());
@@ -3041 +3051 @@
         this._statusBarTextMode.style.display = "";
       }
+      this.findCC("textarea");
       this.notifyOf('modechange', {'mode':'text'});
-      this.findCC("textarea"); 
+      this.firePluginEvent('onMode', 'textmode');
     break;
 
     case "wysiwyg":
+      this.firePluginEvent('onBeforeMode', 'wysiwyg');
       this.setCC("textarea");
       html = this.inwardHtml(this.getHTML());
@@ -3058 +3070 @@
         this._statusBarTextMode.style.display = "none";
       }
+      this.findCC("iframe");
       this.notifyOf('modechange', {'mode':'wysiwyg'});
-      this.findCC("iframe");
+      this.firePluginEvent('onMode', 'wysiwyg');
+
     break;
 
@@ -3067 +3081 @@
   }
   this._editMode = mode;
-
-  for ( var i in this.plugins )
-  {
-    var plugin = this.plugins[i].instance;
-    if ( plugin && typeof plugin.onMode == "function" )
-    {
-      plugin.onMode(mode);
-    }
-  }
 };
 /** Sets the HTML in fullpage mode. Actually the whole iframe document is rewritten.
@@ -3213 +3218 @@
   var plugin = arguments[0];
 
-  // @todo : try to avoid the use of eval()
   // We can only register plugins that have been succesfully loaded
-  if ( plugin === null || typeof plugin == 'undefined' || (typeof plugin == 'string' && eval('typeof ' + plugin) == 'undefined') )
+  if ( plugin === null || typeof plugin == 'undefined' || (typeof plugin == 'string' && typeof window[plugin] == 'undefined') )
   {
     return false;
@@ -3235 +3239 @@
 Xinha.prototype.registerPlugin2 = function(plugin, args)
 {
-  // @todo : try to avoid the use of eval()
-  if ( typeof plugin == "string" )
-  {
-    plugin = eval(plugin);
+  if ( typeof plugin == "string" && typeof window[plugin] == 'function' )
+  {
+    plugin = window[plugin];
   }
   if ( typeof plugin == "undefined" )
@@ -3288 +3291 @@
   
   Xinha.setLoadingMessage (Xinha._lc("Loading plugin $plugin="+pluginName+"$"));
-  // @todo : try to avoid the use of eval()
+
   // Might already be loaded
-  //if ( eval('typeof ' + pluginName) != 'undefined' )
-  // @todo: try if this works to avoid the use of eval, I've been never getting here when testing
   if ( typeof window['pluginName'] != 'undefined' )
   {
@@ -3334 +3335 @@
   {
     var p = nuPlugins.pop();
+        if (p == 'FullScreen' && !url ) continue; //prevent trying to load FullScreen plugin from the plugins folder
     if ( typeof Xinha._pluginLoadStatus[p] == 'undefined' )
     {
@@ -3508 +3510 @@
   link.type = "text/css";
   if (id) link.id = id;
-  if (prepend)
+  if (prepend && head.getElementsByTagName('link')[0])
   {
     head.insertBefore(link,head.getElementsByTagName('link')[0]);
@@ -4171 +4173 @@
     this._timerUndo = setTimeout(function() { editor._timerUndo = null; }, this.config.undoTimeout);
   }
-
-  // Insert a space in certain locations, this is just to make editing a little
-  // easier (to "get out of" tags), it's not essential.
-  // TODO: Make this work for IE?
-  // TODO: Perhaps should use a plain space character, I'm not sure.
-  //  OK, I've disabled this temporarily, to be honest, I can't rightly remember what the
-  //  original problem was I was trying to solve with it.  I think perhaps that EnterParagraphs
-  //  might solve the problem, whatever the hell it was.  I'm going senile, I'm sure.
-  // @todo : since this part is disabled since a long time, does it still need to be in the source ?
-  if( 0 && Xinha.is_gecko )
-  {
-    var s = this.getSelection();
-    // If the last character in the last text node of the parent tag
-    // and the parent tag is not a block tag
-    if ( s && s.isCollapsed && s.anchorNode &&
-         s.anchorNode.parentNode.tagName.toLowerCase() != 'body' &&
-         s.anchorNode.nodeType == 3 && s.anchorOffset == s.anchorNode.length &&
-         !( s.anchorNode.parentNode.nextSibling && s.anchorNode.parentNode.nextSibling.nodeType == 3 ) &&
-         !Xinha.isBlockElement(s.anchorNode.parentNode) )
-    {
-      // Insert hair-width-space after the close tag if there isn't another text node on the other side
-      // It could also work with zero-width-space (\u200B) but I don't like it so much.
-      // Perhaps this won't work well in various character sets and we should use plain space (20)?
-      try
-      {
-        s.anchorNode.parentNode.parentNode.insertBefore(this._doc.createTextNode('\t'), s.anchorNode.parentNode.nextSibling);
-      }
-      catch(ex) {} // Disregard
-    }
-  }
-
-  // FIXME: this should be using this.firePluginEvent('onUpdateToolbar')
-  //   but we have to make sure that the plugins using that event return false
-  //   if they should let the event fire on other plugins, currently the below
-  //   code doesn't take the return value into account
-  
-  // check if any plugins have registered refresh handlers
-  for ( var indexPlugin in this.plugins )
-  {
-    var plugin = this.plugins[indexPlugin].instance;
-    if ( plugin && typeof plugin.onUpdateToolbar == "function" )
-    {
-      plugin.onUpdateToolbar();
-    }
-  }
-
+  this.firePluginEvent('onUpdateToolbar');
+};
+
+/** Returns a editor object referenced by the id or name of the textarea or the textarea node itself
+ * For example to retrieve the HTML of an editor made out of the textarea with the id "myTextArea" you would do<br />
+ * <code>
+ *       var editor = Xinha.getEditor("myTextArea");
+ *   var html = editor.getEditorContent(); 
+ * </code>
+ * @returns {Xinha|null} 
+ * @param {String|DomNode} ref id or name of the textarea or the textarea node itself
+ */
+Xinha.getEditor = function(ref)
+  {
+  for ( var i = __xinhas.length; i--; )
+    {
+    var editor = __xinhas[i];
+    if ( editor && ( editor._textArea.id == ref || editor._textArea.name == ref || editor._textArea == ref ) )
+      {
+      return editor;
+      }
+    }
+  return null;
+};
+/** Sometimes one wants to call a plugin method directly, e.g. from outside the editor.
+ * This function returns the respective editor's instance of a plugin.
+ * For example you might want to have a button to trigger SaveSubmit's save() method:<br />
+ * <code>
+ *       &lt;button type="button" onclick="Xinha.getEditor('myTextArea').getPluginInstance('SaveSubmit').save();return false;"&gt;Save&lt;/button&gt;
+ * </code>
+ * @returns {PluginObject|null} 
+ * @param {String} plugin name of the plugin
+ */
+Xinha.prototype.getPluginInstance = function (plugin)
+  {
+  if (this.plugins[plugin])
+    {
+    return this.plugins[plugin].instance;
+    }
+  else return null;
 };
 
@@ -4850 +4846 @@
   
   // remove disabling of inline event handle inside Xinha iframe
-  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
+  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.parent &amp;&amp; window\.parent\.Xinha\)\{return false\}/gi,'$1');
 
   // Figure out what our server name is, and how it's referenced
@@ -4911 +4907 @@
 
   // disable inline event handle inside Xinha iframe
-  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.parent &amp;&amp; window.parent.Xinha){return false}');
   
   html = this.inwardSpecialReplacements(html);
@@ -5019 +5015 @@
   if ( typeof this.config.stripSelfNamedAnchors != 'undefined' && this.config.stripSelfNamedAnchors )
   {
-    var stripRe = new RegExp("((href|src|background)=\")("+Xinha.escapeStringForRegExp(document.location.href.replace(/&/g,'&amp;')) + ')([#?][^\'" ]*)', 'g');
+    var stripRe = new RegExp("((href|src|background)=\")("+Xinha.escapeStringForRegExp(unescape(document.location.href.replace(/&/g,'&amp;'))) + ')([#?][^\'" ]*)', 'g');
     html = html.replace(stripRe, '$1$4');
   }
@@ -5028 +5024 @@
     if ( typeof this.config.baseHref != 'undefined' && this.config.baseHref !== null )
     {
-      baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref) + ")", 'g' );
+      baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref.replace(/([^\/]\/)(?=.+\.)[^\/]*$/, "$1")) + ")", 'g' );
     }
     else
@@ -5117 +5113 @@
 Xinha._object = null;
 
+/** Arrays are identified as "object" in typeof calls. Adding this tag to the Array prototype allows to distinguish between the two
+ */
+Array.prototype.isArray = true;
+/** RegExps are identified as "object" in typeof calls. Adding this tag to the RegExp prototype allows to distinguish between the two
+ */
+RegExp.prototype.isRegExp = true;
 /** function that returns a clone of the given object
  *  
@@ -5129 +5131 @@
     return null;
   }
-
-  var newObj = {};
-
-  // check for array objects
-  if ( obj.constructor.toString().match( /\s*function Array\(/ ) )
-  {
-    newObj = obj.constructor();
-  }
-
-  // check for function objects (as usual, IE is fucked up)
-  if ( obj.constructor.toString().match( /\s*function Function\(/ ) )
+  var newObj = (obj.isArray ) ? [] : {};
+
+  // check for function and RegExp objects (as usual, IE is fucked up)
+  if ( obj.constructor.toString().match( /\s*function Function\(/ ) || typeof obj == 'function' )
   {
     newObj = obj; // just copy reference to it
+  }
+  else if (  obj.isRegExp )
+  {
+    newObj = eval( obj.toString() ); //see no way without eval
   }
   else
@@ -5339 +5338 @@
     Xinha._removeEvent(el, evs[i], func);
   }
+};
+
+/** Adds a function that is executed in the moment the DOM is ready, but as opposed to window.onload before images etc. have been loaded
+*   http://dean.edwards.name/weblog/2006/06/again/
+*  @public
+*  @author Dean Edwards/Matthias Miller/ John Resig / Raimund Meyer
+*  @param {Function}  func the function to be executed
+*  @param {Window}    scope the window that is listened to
+*/
+Xinha.addOnloadHandler = function (func, scope)
+{
+ scope = scope ? scope : window;
+
+ var init = function ()
+ {
+   // quit if this function has already been called
+   if (arguments.callee.done) return;
+   // flag this function so we don't do the same thing twice
+   arguments.callee.done = true;
+   // kill the timer
+   if (Xinha.onloadTimer) clearInterval(Xinha.onloadTimer);
+
+   func();
+ }
+ if (Xinha.is_ie)
+ {
+   scope.document.write("<sc"+"ript id=__ie_onload defer src=javascript:void(0)><\/script>");
+   var script = scope.document.getElementById("__ie_onload");
+      script.onreadystatechange = function()
+   {
+     if (this.readyState == "loaded") // We want this as early as possible, so I changed 'complete' to 'loaded', because otherwise it fired even after window.onload
+     {
+                this.parentNode.removeChild(script);
+       init(); // call the onload handler
+     }
+   };
+ }
+ else if (/applewebkit|KHTML/i.test(navigator.userAgent) ) /* Safari/WebKit/KHTML */
+ {
+   Xinha.onloadTimer = scope.setInterval(function()
+   {
+     if (/loaded|complete/.test(scope.document.readyState))
+     {
+       init(); // call the onload handler
+     }
+   }, 10);
+ }
+ else /* for Mozilla/Opera9 */
+ {
+   scope.document.addEventListener("DOMContentLoaded", init, false);
+
+ }
+ Xinha._addEvent(scope, 'load', init); // incase anything went wrong
 };
 
@@ -5759 +5811 @@
 {
     var coreCSS = 
-    "<style id=\"XinhaInternalCSS\" type=\"text/css\">"
+    "<style title=\"XinhaInternalCSS\" type=\"text/css\">"
     + ".htmtableborders, .htmtableborders td, .htmtableborders th {border : 1px dashed lightgrey ! important;}\n"
     + "html, body { border: 0px; } \n"
     + "body { background-color: #ffffff; } \n" 
+        + "img, hr { cursor: default } \n"  
     +"</style>\n";
     
@@ -5777 +5830 @@
       return coreCSS;
     }
+}
+/** Allows plugins to add a stylesheet for internal use to the edited document that won't appear in the HTML output
+ *  
+ *  @see Xinha#stripCoreCSS
+ *  @param {String} stylesheet URL of the styleshett to be added
+ */
+Xinha.prototype.addEditorStylesheet = function (stylesheet)
+{
+    var style = this._doc.createElement("link");
+    style.rel = 'stylesheet';
+    style.type = 'text/css';
+    style.title = 'XinhaInternalCSS';
+        style.href = stylesheet;
+    this._doc.getElementsByTagName("HEAD")[0].appendChild(style);
 }
 /** Remove internal styles
@@ -5787 +5854 @@
 Xinha.stripCoreCSS = function(html)
 {
-  return html.replace(/<style[^>]+id="XinhaInternalCSS"(.|\n)*?<\/style>/i, ''); 
+  return html.replace(/<style[^>]+title="XinhaInternalCSS"(.|\n)*?<\/style>/ig, '').replace(/<link[^>]+title="XinhaInternalCSS"(.|\n)*?>/ig, ''); 
 }
 /** Removes one CSS class (that is one of possible more parts 
@@ -6046 +6113 @@
 // Unless somebody already has, make a little function to debug things
 
-if ( typeof dump == 'undefined' )
-{
-  function dump(o)
+if (typeof dumpValues == 'undefined') 
+{
+  function dumpValues(o)
   {
     var s = '';
     for ( var prop in o )
     {
+      if (window.console && typeof window.console.log == 'function') 
+      {
+        if (typeof console.firebug != 'undefined') 
+          console.log(o);
+        else 
+          console.log(prop + ' = ' + o[prop] + '\n');
+      }
+      else 
       s += prop + ' = ' + o[prop] + '\n';
     }
+    if (s) 
+    {
     var x = window.open("", "debugger");
     x.document.write('<pre>' + s + '</pre>');
   }
+}
 }
 if ( !Array.prototype.contains )
@@ -6422 +6500 @@
 
   var editors = {};
+  var textarea;
   for ( var x = 0; x < editor_names.length; x++ )
   {
-    if ( typeof editor_names[x] != 'object' )
-    {
-      var textarea = Xinha.getElementById('textarea', editor_names[x] );
-      if ( !textarea ) continue;
+    if ( typeof editor_names[x] == 'string' ) // the regular case, an id of a textarea
+    {
+      textarea = Xinha.getElementById('textarea', editor_names[x] );
+      if (!textarea) // the id may be specified for a textarea that is maybe on another page; we simply skip it and go on
+      {
+        editor_names[x] = null;
+        continue;
+    }
+    }
+         // make it possible to pass a reference instead of an id, for example from  document.getElementsByTagName('textarea')
+    else if ( typeof editor_names[x] == 'object' && editor_names[x].tagName && editor_names[x].tagName.toLowerCase() == 'textarea' )
+    {
+      textarea =  editor_names[x];
+      if ( !textarea.id ) // we'd like to have the textarea have an id
+      {
+        textarea.id = 'xinha_id_' + x;
+      } 
     }
     var editor = new Xinha(textarea, Xinha.cloneObject(default_config));
     editor.registerPlugins(plugin_names);
-    editors[editor_names[x]] = editor;
+    editors[textarea.id] = editor;
   }
   return editors;
@@ -6722 +6814 @@
   for (var i=0;i<xinha_editors.length;i++)
   {
+     if (!document.getElementById(xinha_editors[i])) continue;
      Xinha.loadingMessages.push(Xinha.createLoadingMessage(Xinha.getElementById('textarea', xinha_editors[i])));
   }
@@ -6738 +6831 @@
   loading_message.className = "loading";
   
-  loading_message.style.left = Xinha.findPosX(textarea) +  'px';
+  loading_message.style.left = (Xinha.findPosX(textarea) + textarea.offsetWidth / 2) - 106 +  'px';
   loading_message.style.top = (Xinha.findPosY(textarea) + textarea.offsetHeight / 2) - 50 +  'px';
-  loading_message.style.width =  textarea.offsetWidth +  'px';
-  
   // main static message
   var loading_main = document.createElement("div");
@@ -6751 +6842 @@
   loading_sub.className = "loading_sub";
   loading_sub.id = "loading_sub_" + textarea.id;
-  text = text ? text : Xinha._lc("Constructing object");
+  text = text ? text : Xinha._lc("Loading Core");
   loading_sub.appendChild(document.createTextNode(text));
   loading_message.appendChild(loading_main);
@@ -6795 +6886 @@
   for (var i=0;i< xinha_editors.length;i++)
   {
+     if (!document.getElementById(xinha_editors[i])) continue;
      var main = document.getElementById("loading_" + document.getElementById(xinha_editors[i]).id);
      main.parentNode.removeChild(main);
@@ -6999 +7091 @@
   try
   {    
-    if (typeof XMLHttpRequest == "function")
+    if (typeof XMLHttpRequest != "undefined" && typeof XMLHttpRequest.constructor == 'function' ) // Safari's XMLHttpRequest is typeof object
     {
           return new XMLHttpRequest();

branches/ray/XinhaLoader.js

@@ -1 +1 @@
 var Xinha = {};
+
+_editor_url = _editor_url.replace(/\x2f*$/, '/');
+
 Xinha.agt       = navigator.userAgent.toLowerCase();
 Xinha.is_ie    = ((Xinha.agt.indexOf("msie") != -1) && (Xinha.agt.indexOf("opera") == -1));
@@ -5 +8 @@
 Xinha.is_opera  = (Xinha.agt.indexOf("opera") != -1);
 Xinha.is_khtml  = (Xinha.agt.indexOf("khtml") != -1);
+Xinha.is_webkit  = (Xinha.agt.indexOf("applewebkit") != -1);
 Xinha.is_safari  = (Xinha.agt.indexOf("safari") != -1);
 Xinha.opera_version = navigator.appVersion.substring(0, navigator.appVersion.indexOf(" "))*1;
@@ -13 +17 @@
 Xinha.isRunLocally = document.URL.toLowerCase().search(/^file:/) != -1;
 Xinha.is_designMode = (typeof document.designMode != 'undefined' && !Xinha.is_ie); // IE has designMode, but we're not using it
-Xinha.isSupportedBrowser = Xinha.is_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5;
+Xinha.isSupportedBrowser = Xinha.is_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5 || Xinha.is_safari;
 
 Xinha.loadPlugins = function(plugins, callbackIfNotReady)
@@ -108 +112 @@
   for (var i=0;i<xinha_editors.length;i++)
   {
-     Xinha.loadingMessages.push(Xinha.createLoadingMessage(document.getElementById(xinha_editors[i])));
+    if (!document.getElementById(xinha_editors[i]))
+    {
+          continue;
+    }
+    Xinha.loadingMessages.push(Xinha.createLoadingMessage(document.getElementById(xinha_editors[i])));
   }
 }
@@ -170 +178 @@
   }
 }
+Xinha.addOnloadHandler = function (func)
+{
+  // Dean Edwards/Matthias Miller/John Resig 
+  // http://dean.edwards.name/weblog/2006/06/again/
+  
+  var init = function ()
+  {
+    // quit if this function has already been called
+    if (arguments.callee.done) return;
+    // flag this function so we don't do the same thing twice
+    arguments.callee.done = true;
+    // kill the timer
+    if (Xinha.onloadTimer) clearInterval(Xinha.onloadTimer);
+    
+    func.call();
+  }
+  if (Xinha.is_ie)
+  {
+    document.write("<sc"+"ript id=__ie_onload defer src=javascript:void(0)><\/script>");
+    var script = document.getElementById("__ie_onload");
+    script.onreadystatechange = function()
+    {
+      if (this.readyState == "loaded")
+      {
+        init(); // call the onload handler
+      }
+    };
+  }
+  else if (/WebKit/i.test(navigator.userAgent))
+  {
+    Xinha.onloadTimer = setInterval(function()
+    {
+      if (/loaded|complete/.test(document.readyState))
+      {
+        init(); // call the onload handler
+      }
+    }, 10);
+  }
+  else /* for Mozilla/Opera9 */
+  {
+    document.addEventListener("DOMContentLoaded", init, false);  
+  }
+}

branches/ray/contrib/compress.php

@@ -1 +1 @@
 <?
 die("Run this script to batch-compress the current Xinha snapshot. To run the script, open the file and uncomment the die() command");
-
+$repository_url = 'http://svn.xinha.webfactional.com/trunk';
+$version ='';
+$date = date('r');
 error_reporting(E_ALL);
 ini_set('show_errors',1);
 
 $return = array();
-function scan($dir, $durl = '',$min_size="3000")
+function scan($dir, $durl = '',$min_size="0")
 {
         static $seen = array();
@@ -48 +50 @@
 scan("../");
 $cwd = getcwd();
+
+$root_dir = realpath($cwd.'/..');
+
 print "Processing ".count($return)." files<br />";
 
-$prefix = "/* This compressed file is part of Xinha. For uncomressed sources, forum, and bug reports, go to xinha.org */";
+$prefix = "/* This compressed file is part of Xinha. For uncompressed sources, forum, and bug reports, go to xinha.org */";
+if ($version) $prefix .= "\n/* This file is part of version $version released $date */";
+
 $core_prefix = '
   /*--------------------------------------------------------------------------
@@ -58 +65 @@
     --  BSD license)  please read license.txt in this package for details.
     --
-    --  Copyright (c) 2005-2007 Xinha Developer Team and contributors
+    --  Copyright (c) 2005-2008 Xinha Developer Team and contributors
     --  
     --  Xinha was originally based on work by Mihai Bazon which is:
@@ -71 +78 @@
         print "Processed $file<br />";
         flush();
+        $file_url = $repository_url.str_replace($root_dir,'',$file);
+
         copy($file,$file."_uncompr.js");
-
-        exec("echo \"".(preg_match('/XinhaCore.js$/',$file) ? $prefix.$core_prefix : $prefix)."\" > $file && java -jar ${cwd}/dojo_js_compressor.jar -c ${file}_uncompr.js >> $file 2>&1");
+        
+        $file_prefix = $prefix."\n/* The URL of the most recent version of this file is $file_url */";
+        
+        exec("echo \"".(preg_match('/XinhaCore.js$/',$file) ? $file_prefix.$core_prefix : $file_prefix)."\" > $file && java -jar ${cwd}/dojo_js_compressor.jar -c ${file}_uncompr.js >> $file 2>&1");
         if (preg_match('/js: ".*?", line \d+:/',file_get_contents($file)))
         {
@@ -83 +94 @@
                 unlink($file."_uncompr.js");
         }
+
 }
 print "Operation complete."

branches/ray/contrib/php-xinha.php

@@ -24 +24 @@
    */
       
-  function xinha_pass_to_php_backend($Data, $KeyLocation = 'Xinha:BackendKey')
+  function xinha_pass_to_php_backend($Data, $KeyLocation = 'Xinha:BackendKey', $ReturnPHP = FALSE)
   {
    
@@ -58 +58 @@
     $backend_data[session_name()] = session_id();
     
-    echo 'backend_data = ' . xinha_to_js($backend_data) . "; \n";
-    
+    if($ReturnPHP)
+    {      
+      return array('backend_data' => $backend_data);      
+    }
+    else
+    {      
+      echo 'backend_data = ' . xinha_to_js($backend_data) . "; \n";  
+    }                
   }  
    

branches/ray/examples/Newbie.html

@@ -11 +11 @@
     _editor_skin = "silva";   // If you want use skin, add the name here
   </script>
-  <script type="text/javascript" src="../XinhaCore.js"></script>
+  <script type="text/javascript" src="../XinhaLoader.js"></script>
   <script type="text/javascript" src="XinhaConfig.js"></script>
 </head>
@@ -18 +18 @@
 <form action="">
 <div>
-<textarea id="myTextArea" name="myTextArea" rows="10" cols="50" style="width: 100%"></textarea>
+<textarea id="myTextArea" name="myTextArea" rows="25" cols="50" style="width: 100%"></textarea>
 </div>
 </form>

branches/ray/examples/XinhaConfig.js

@@ -16 +16 @@
    * current page will just be skipped.
    ************************************************************************/
-  
+
   xinha_editors = xinha_editors ? xinha_editors :
   [
@@ -38 +38 @@
   [
    'CharacterMap',
-   'ContextMenu',
-   'ListType',
+   'SmartReplace',
    'Stylist',
    'Linker',
@@ -64 +63 @@
 
    xinha_config = xinha_config ? xinha_config() : new Xinha.Config();
-   
         
    // To adjust the styling inside the editor, we can load an external stylesheet like this
@@ -109 +107 @@
 }
 
-Xinha._addEvent(window,'load', xinha_init); // this executes the xinha_init function on page load 
-                                            // and does not interfere with window.onload properties set by other scripts
+Xinha.addOnloadHandler(xinha_init); // this executes the xinha_init function on page load
+                                     // and does not interfere with window.onload properties set by other scripts
+

branches/ray/examples/simple_example.html

@@ -5 +5 @@
 <title>Simple example of Xinha</title>
 <script type="text/javascript">
-/************************************************************************
- * Please refer to http://xinha.python-hosting.com/wiki/NewbieGuide
- ************************************************************************
- * You must set _editor_url to the URL (including trailing slash) where
- * where xinha is installed, it's highly recommended to use an absolute URL
- *  eg: _editor_url = "/path/to/xinha/";
- * You may try a relative URL if you wish]
- *  eg: _editor_url = "../";  
- * in this example we do a little regular expression to find the absolute path.
- ************************************************************************/
 var _editor_url  = document.location.href.replace(/examples\/simple_example\.html.*/, '')
-// And the language we need to use in the editor.
+
 var _editor_lang = "en";
 </script>
@@ -22 +12 @@
 <script type="text/javascript" src="../XinhaCore.js"></script>
 <script type="text/javascript">
-/************************************************************************
- * Plugins you will be using in the editors on this page.
- * List all the plugins you will need, even if not all the editors will
- * use all the plugins.
- ************************************************************************
- * Please refer to http://xinha.python-hosting.com/wiki/Plugins for the
- * list of availables plugins
- ************************************************************************/
+
 var xinha_plugins =
 [
- 'CharacterMap',
- 'ContextMenu',
- 'FullScreen',
- 'ListType',
- 'SpellChecker',
- 'Stylist',
- 'SuperClean',
- 'TableOperations'
+ 'Linker'
 ];
-/************************************************************************
- * Names of the textareas you will be turning into editors
- ************************************************************************/
 var xinha_editors =
 [
@@ -49 +22 @@
   'anotherOne'
 ];
-/************************************************************************
- * Initialisation function
- ************************************************************************/
+
 function xinha_init()
 {
-  // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
   if(!Xinha.loadPlugins(xinha_plugins, xinha_init)) return;
-  /*************************************************************************
-   * We create a default configuration to be used by all the editors.
-   * If you wish to configure some of the editors differently this will be
-   * done later after editors are initiated.
-   ************************************************************************
-   * Please refer to http://xinha.python-hosting.com/wiki/Documentation/Customise
-   * for the configuration parameters
-   ************************************************************************/
+
   var xinha_config = new Xinha.Config();
-  /************************************************************************
-   * We first create editors for the textareas.
-   * You can do this in two ways, either
-   *
-   *   xinha_editors   = Xinha.makeEditors(xinha_editors, xinha_config, xinha_plugins);
-   *
-   * if you want all the editor objects to use the same set of plugins, OR;
-   *
-   *   xinha_editors = Xinha.makeEditors(xinha_editors, xinha_config);
-   *   xinha_editors['myTextArea'].registerPlugins(['Stylist','FullScreen']);
-   *   xinha_editors['anotherOne'].registerPlugins(['CSS','SuperClean']);
-   *
-   * if you want to use a different set of plugins for one or more of the
-   * editors.
-   ************************************************************************/
+
   xinha_editors = Xinha.makeEditors(xinha_editors, xinha_config, xinha_plugins);
-  /************************************************************************
-   * If you want to change the configuration variables of any of the
-   * editors,  this is the place to do that, for example you might want to
-   * change the width and height of one of the editors, like this...
-   ************************************************************************/
-  xinha_editors.myTextArea.config.width = '640px';
-  xinha_editors.myTextArea.config.height = '480px';
-  /************************************************************************
-   * Or remove the statusbar on the other one, like this...
-   * For every possible configuration, please refer to
-   * http://xinha.python-hosting.com/wiki/Documentation/ConfigVariablesList
-   ************************************************************************/
-  xinha_editors.anotherOne.config.statusBar = false;
-  /************************************************************************
-   * Finally we "start" the editors, this turns the textareas into
-   * Xinha editors.
-   ************************************************************************/
+
   Xinha.startEditors(xinha_editors);
 }
-window.onload = xinha_init;
+Xinha.addOnloadHandler(xinha_init);
 </script>
-<link type="text/css" rel="stylesheet" title="blue-look" href="../skins/blue-look/skin.css">
-<link type="text/css" rel="alternate stylesheet" title="green-look" href="../skins/green-look/skin.css">
-<link type="text/css" rel="alternate stylesheet" title="xp-blue" href="../skins/xp-blue/skin.css">
-<link type="text/css" rel="alternate stylesheet" title="xp-green" href="../skins/xp-green/skin.css">
-<link type="text/css" rel="alternate stylesheet" title="inditreuse" href="../skins/inditreuse/skin.css">
-<link type="text/css" rel="alternate stylesheet" title="blue-metallic" href="../skins/blue-metallic/skin.css">
+
 </head>
 
 <body>
 
-<form onsubmit="alert(this.myTextArea.value); alert(this.anotherOne.value); return false;">
-<textarea id="myTextArea" name="myTextArea" rows="10" cols="80" style="width:100%">
+<form onsubmit="alert(this.myTextArea.value); return false;">
+<textarea id="myTextArea" name="myTextArea" rows="25" cols="80">
 &lt;p&gt;Lorem ipsum dolor sit amet, consectetuer adipiscing elit.
 Aliquam et tellus vitae justo varius placerat. Suspendisse iaculis
@@ -122 +50 @@
 Curabitur pharetra bibendum lectus.&lt;/p&gt;
 </textarea>
-<textarea id="anotherOne" name="anotherOne" rows="10" cols="80" style="width:100%">
-&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;
-</textarea>
-<input type="submit">
-</form>
 
 </body>

branches/ray/examples/testbed.html

@@ -1 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+<?xml version="1.0" encoding="UTF-8"?>
+<!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">
@@ -30 +32 @@
     // in this example we do a little regular expression to find the absolute path.
     _editor_url  = document.location.href.replace(/examples\/.*/, '')
-    _editor_lang = "de";      // And the language we need to use in the editor.
+    _editor_lang = "en";      // And the language we need to use in the editor.
   </script>
 
   <!-- Load up the actual editor core -->
-  <script type="text/javascript" src="../XinhaLoader.js"></script>
+  <script type="text/javascript" src="../XinhaCore.js"></script>
 
   <script type="text/javascript">
@@ -46 +48 @@
     {
       /** STEP 1 ***************************************************************
-       * First, specify the textareas that shall be turned into Xinhas. 
-       * For each one add the respective id to the xinha_editors array.
+       * First, what are the plugins you will be using in the editors on this
+       * page.  List all the plugins you will need, even if not all the editors
+       * will use all the plugins.
        ************************************************************************/
       
-      xinha_editors = xinha_editors ? xinha_editors :
+      xinha_plugins = xinha_plugins ? xinha_plugins :
       [
-        'myTextArea'
+        'CharacterMap', 'SpellChecker', 'Linker', 'SmartReplace'
       ];
+             // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
+             if(!Xinha.loadPlugins(xinha_plugins, xinha_init)) return;
     
       /** STEP 2 ***************************************************************
-       * Now, what are the plugins you will be using in the editors on this
-       * page. List all the plugins you will need, even if not all the editors
-       * will use all the plugins.
+       * Now, what are the names of the textareas you will be turning into
+       * editors?
        ************************************************************************/
-       xinha_plugins = xinha_plugins ? xinha_plugins :
+
+      xinha_editors = xinha_editors ? xinha_editors :
        [
-         'CharacterMap', 
-         'Linker',
-         'Stylist',
-         'SmartReplace',
-                 'InsertSnippet'
+        'myTextArea'
        ];
-             // THIS BIT OF JAVASCRIPT LOADS THE PLUGINS, NO TOUCHING  :)
-             if(!Xinha.loadPlugins(xinha_plugins, xinha_init)) return;
              
       /** STEP 3 ***************************************************************
@@ -85 +84 @@
 
        xinha_config = xinha_config ? xinha_config : new Xinha.Config();
-   
-        xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css'));
-         
-      //xinha_config.CharacterMap.mode = 'panel';
-//xinha_config.stylistLoadStylesheet(document.location.href.replace(/[^\/]*\.html/, 'stylist.css'));
-
+       xinha_config.fullPage = true;
+       xinha_config.CharacterMap.mode = 'panel';
 /*
        // We can load an external stylesheet like this - NOTE : YOU MUST GIVE AN ABSOLUTE URL
@@ -113 +108 @@
        *
        *   xinha_editors = Xinha.makeEditors(xinha_editors, xinha_config);
-       *   xinha_editors['myTextArea'].registerPlugins(['Stylist','FullScreen']);
+       *   xinha_editors['myTextArea'].registerPlugins(['Stylist']);
        *   xinha_editors['anotherOne'].registerPlugins(['CSS','SuperClean']);
        *
@@ -143 +138 @@
 
     window.onload   = xinha_init;
-    // window.onunload = Xinha.collectGarbageForIE;
   </script>
 </head>
@@ -149 +143 @@
 <body>
 
-  <form action="" id="editors_here" onsubmit="alert(this.myTextArea.value);">
-<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
-  <textarea id="myTextArea" name="myTextArea" style="width:100%;height:300px;">
-    <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>
+  <form action="javascript:void(0);" id="editors_here" onsubmit="alert(this.myTextArea.value);">
+ <div>
+     <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;span style="color:purple"&gt;
+      &lt;img src="../images/xinha_logo.gif" 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;
 
-<br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br /><br />
+      &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.  &lt;span style="color:green">Aliquam &lt;/span> nisl. Nulla posuere neque non
+        tellus. Morbi vel nibh. &lt;font face="Arial">&lt;font color="#009933">Cum  sociis natoque&lt;/font>&lt;/font&gt; 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 style="color:green"&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;/span&gt;&lt;/body&gt;
+      &lt;/html&gt;
+    </textarea>
+
+    <input type="submit" /> <input type="reset" />
+</div>
   </form>
-  <script language="javascript">
+  <script type="text/javascript">
     document.write(document.compatMode);
   </script>
+<div>
   <a href="#" onclick="xinha_editors.myTextArea.hidePanels();">Hide</a>
   <a href="#" onclick="xinha_editors.myTextArea.showPanels();">Show</a>
+</div>
+
 </body>
 </html>

branches/ray/lang/es.js

@@ -1 +1 @@
 // I18N constants
-
-// LANG: "es", ENCODING: UTF-8
-
+// LANG: "de", ENCODING: UTF-8
 {
   "Bold": "Negrita",
@@ -8 +6 @@
   "Underline": "Subrayado",
   "Strikethrough": "Tachado",
-  "Subscript": "Sub?ndice",
-  "Superscript": "Super?ndice",
-  "Justify Left": "Alinear a la Izquierda",
-  "Justify Center": "Centrar",
-  "Justify Right": "Alinear a la Derecha",
+  "Subscript": "Subíndice",
+  "Superscript": "Superíndice",
+  "Justify Left": "Alinear a la izquierda",
+  "Justify Center": "Alinear al centro",
+  "Justify Right": "Alinear a la derecha",
   "Justify Full": "Justificar",
-  "Ordered List": "Lista Ordenada",
-  "Bulleted List": "Lista No Ordenada",
-  "Decrease Indent": "Aumentar Sangr?a",
-  "Increase Indent": "Disminuir Sangr?a",
-  "Font Color": "Color del Texto",
-  "Background Color": "Color del Fondo",
-  "Horizontal Rule": "L?nea Horizontal",
-  "Insert Web Link": "Insertar Enlace",
-  "Insert/Modify Image": "Insertar Imagen",
-  "Insert Table": "Insertar Tabla",
-  "Toggle HTML Source": "Ver Documento en HTML",
-  "Enlarge Editor": "Ampliar Editor",
-  "About this editor": "Acerca del Editor",
+  "Ordered List": "Lista numerada",
+  "Bulleted List": "Lista no numerada",
+  "Decrease Indent": "Reducir sangría",
+  "Increase Indent": "Aumentar sangría",
+  "Font Color": "Color de la fuente",
+  "Background Color": "Color de fondo",
+  "Horizontal Rule": "Regla horizontal",
+  "Insert Web Link": "Insertar enlace web",
+  "Insert/Modify Image": "Insertar/modificar imagen",
+  "Insert Table": "Insertar una tabla",
+  "Toggle HTML Source": "Ver HTML",
+  "Enlarge Editor": "Editor a pantalla completa",
+  "About this editor": "Sobre este Editor",
   "Help using editor": "Ayuda",
-  "Current style": "Estilo Actual",
+  "Current style": "Estilo actual",
   "Undoes your last action": "Deshacer",
   "Redoes your last action": "Rehacer",
-  "Cut selection": "Cortar selecci?n",
-  "Copy selection": "Copiar selecci?n",
+  "Cut selection": "Cortar",
+  "Copy selection": "Copiar",
   "Paste from clipboard": "Pegar desde el portapapeles",
+  "Direction left to right": "Dirección de izquierda a derecha",
+  "Direction right to left": "Dirección de derecha a izquierda",
+  "Remove formatting": "Borrar formato",
+  "Select all": "Seleccionar todo",
+  "Print document": "Imprimir documento",
+  "Clear MSOffice tags": "Borrar etiquetas de MSOffice",
+  "Clear Inline Font Specifications": "Borrar las etiquetas de fuente",
+  "Would you like to clear font typefaces?": "¿Desea eliminar las definiciaones de tipo de fuente?",
+  "Would you like to clear font sizes?": "¿Desea eliminar las definiciones de tamaño de fuente?",
+  "Would you like to clear font colours?": "¿Desea eliminar las definiciones de color de fuente?",
+  "Split Block": "Dividir el bloque",
+  "Toggle Borders": "Añadir/Quitar bordes",
+  "Save as": "Guardar como",
+  "Insert/Overwrite": "Insertar/Sobreescribir",
+  "— format —": "— formato —",
+  "— font —": "— fuente —",
+  "— size —": "— tamaño —",
+  "Heading 1": "Cabecera 1",
+  "Heading 2": "Cabecera 2",
+  "Heading 3": "Cabecera 3",
+  "Heading 4": "Cabecera 4",
+  "Heading 5": "Cabecera 5",
+  "Heading 6": "Cabecera 6",
+  "Normal": "Normal",
+  "Address": "Dirección",
+  "Formatted": "Formateado",
+
+  //dialogs
   "OK": "Aceptar",
   "Cancel": "Cancelar",
   "Path": "Ruta",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Esta en modo TEXTO. Use el boton [<>] para cambiar a WYSIWIG"
+  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "Se encuentra en MODO TEXTO. Use el botón [<>] para cambiar de nuevo al modo WYSIWYG",
+   "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "El botón de pegar no funciona en los navegadores de Mozilla por motivos de seguridad. Presione CTRL-V en su teclado para pegarlo directamente",
+
+  "You need to select some text before create a link": "Necesita seleccionar algún texto antes de crear un link",
+  "Your Document is not well formed. Check JavaScript console for details.": "Su documento no está bien formado. Compruebe la consola de JavaScript para obtener más detalles",
+
+  "Alignment:": "Alineación:",
+  "Not set": "No definido",
+  "Left": "Izquierda",
+  "Right": "Derecha",
+  "Texttop": "Texto Superior",
+  "Absmiddle": "Medio Absoluto",
+  "Baseline": "Línea base",
+  "Absbottom": "Inferior absoluto",
+  "Bottom": "Inferior",
+  "Middle": "Medio",
+  "Top": "Superior",
+
+  "Layout": "Distribución",
+  "Spacing": "Espaciado",
+  "Horizontal:": "horizontal:",
+  "Horizontal padding": "Relleno horizontal",
+  "Vertical:": "Vertical:",
+  "Vertical padding": "Relleno Vertical",
+  "Border thickness:": "Tamaño del borde:",
+  "Leave empty for no border": "Vacío si no desea ningún borde",
+
+  //Insert Link
+  "Insert/Modify Link": "Insertar/Modificar un enlace",
+  "None (use implicit)": "Vacío ( usar implícito )",
+  "New window (_blank)": "Nueva ventana (_blank)",
+  "Same frame (_self)": "Mismo marco (_self)",
+  "Top frame (_top)": "Marco superior (_top)",
+  "Other": "Otro",
+  "Target:": "Destino:",
+  "Title (tooltip):": "Título (Tooltip):",
+  "URL:": "URL:",
+  "You must enter the URL where this link points to": "Debe introducir la URL a donde apunta este enlace",
+
+  // Insert Table
+  "Insert Table": "Añadir una tabla",
+  "Rows:": "Filas:",
+  "Number of rows": "Número de filas",
+  "Cols:": "Columnas:",
+  "Number of columns": "Número de columnas",
+  "Width:": "Ancho:",
+  "Width of the table": "Ancho de la tabla",
+  "Percent": "Porcentaje",
+  "Pixels": "Pixels",
+  "Em": "Em",
+  "Width unit": "Unidad de anchura",
+  "Fixed width columns": "Columnas de ancho fijo",
+  "Positioning of this table": "Posición de esta tabla",
+  "Cell spacing:": "Espaciado entre celdas:",
+  "Space between adjacent cells": "Espaciado entre celdas adyacentes",
+  "Cell padding:": "Relleno de celdas:",
+  "Space between content and border in cell": "Escapcio entre el contenido y el borde de la celda",
+  "You must enter a number of rows": "Debe introducir un número de filas",
+  "You must enter a number of columns": "Debe introducir un número de columnas",
+
+  // Insert Image
+  "Insert Image": "Insertar una imagen",
+  "Image URL:": "Imagen URL:",
+  "Enter the image URL here": "",
+  "Preview": "Previsualizar",
+  "Preview the image in a new window": "Previsualizar en una nueva ventana",
+  "Alternate text:": "Texto alternativo:",
+  "For browsers that don't support images": "Para navegadores que no soportan imágenes",
+  "Positioning of this image": "Posición de la imagen",
+  "Image Preview:": "Previsualización de la imagen:",
+  "You must enter the URL": "Debe introducir la URL",
+
+  // Editor Help
+  "Keyboard shortcuts": "Atajos de teclado",
+  "The editor provides the following key combinations:": "El editor proporciona las siguientes combinaciones:",
+  "new paragraph": "Nuevo parrafo",
+  "insert linebreak": "Insertar salto de línea",
+  "Set format to paragraph": "EStablecer el formato a parrafo",
+  "Clean content pasted from Word": "Limpiar el contenido pegado desde Word",
+  "Headings": "Cabeceras",
+  "Close": "Cerrar",
+
+  // Loading messages
+  "Loading in progress. Please wait!": "Carga en proceso. Por favor espere.",
+  "Loading plugin $plugin" : "Cargando el plugin $plugin",
+  "Register plugin $plugin" : "Registro de plugin $plugin", 
+  "Constructing object": "Construyendo objeto",
+  "Generate Xinha framework": "Generar Xinha framework",
+  "Init editor size":"Iniciar el tamaño del editor", 
+  "Create Toolbar": "Crear barra de herramientas",
+  "Create Statusbar" : "Crear barra de estado",
+  "Register right panel" : "Registrar panel derecho", 
+  "Register left panel" : "Registrar panel izquierdo", 
+  "Register bottom panel" : "Registar panel inferior", 
+  "Register top panel" : "Registar panel superior", 
+  "Finishing" : "Finalizando",
+  
+  // ColorPicker
+  "Click a color..." : "Seleccione un color...",
+  "Sample" : "Muestra",
+  "Web Safe: " : "Color web: ",
+  "Color: " : "Color: "
 }

branches/ray/lang/fa.js

@@ -1 @@
-// I18N constants
+// I18N constants
 // LANG: "fa", ENCODING: UTF-8
 {
-  "Bold": "ضخیÙ
-",
-  "Italic": "Ù
-ورؚ",
-  "Underline": "زیر خط",
-  "Strikethrough": "رو خط",
-  "Subscript": "زیروند",
-  "Superscript": "ؚالاوند",
-  "Justify Left": "تراز از Ú†ÙŸ",
-  "Justify Center": "تراز در وسط",
-  "Justify Right": "تراز در راست",
-  "Justify Full": "تراز از Ú†ÙŸ و راست",
-  "Ordered List": "فهرست Ù
-رتؚ",
-  "Bulleted List": "فهرست گلوله ای",
-  "Decrease Indent": "کاه؎ سر خط",
-  "Increase Indent": "افزای؎ سر خط",
-  "Font Color": "رنگ فلÙ
-",
-  "Background Color": "رنگ ٟس زÙ
-ینه",
-  "Horizontal Rule": "خط افقی",
-  "Insert Web Link": "افزودن لینک وؚ",
-  "Insert/Modify Image": "افزودن یا ویرای؎ تصویر",
-  "Insert Table": "افزودن جدول",
-  "Toggle HTML Source": "Ù
-؎اهده یا عدÙ
- Ù
-؎اهده Ù
-تن در قالؚ HTML",
-  "Enlarge Editor": "ؚزرگ کردن ویرای؎ گر",
-  "About this editor": "درؚاره این ویرای؎ گر",
-  "Help using editor": "راهنÙ
-ای استفاده ویرای؎ گر",
-  "Current style": "؎یوه کنونی",
-  "Undoes your last action": "ؚرگرداندن آخرین عÙ
-ل",
-  "Redoes your last action": "انجاÙ
- Ù
-جدد آخرین عÙ
-ل",
-  "Cut selection": "ؚریدن انتخاؚ ؎ده",
-  "Copy selection": "Ú©ÙŸÛŒ انتخاؚ ؎ده",
-  "Paste from clipboard": "چسؚاندن از تخته کار",
-  "Direction left to right": "جهت از Ú†ÙŸ ØšÙ‡ راست",
-  "Direction right to left": "جهت از راست ØšÙ‡ Ú†ÙŸ",
-  "Remove formatting": "حذف فرÙ
-ت ؚندی",
-  "Select all": "انتخاؚ هÙ
-ه",
-  "Print document": "چاٟ سند",
-  "Clear MSOffice tags": "ٟاک کردن Ù
-تن از ؚرچسؚ های MSOffice",
-  "Clear Inline Font Specifications": "ٟاک کردن Ù
-تن از Ù
-؎خصات فونت",
-  "Would you like to clear font typefaces?": "آیا تÙ
-ایل دارید ؞اهر فلÙ
- را ٟاک کنید؟",
-  "Would you like to clear font sizes?": "آیا تÙ
-ایل دارید اندازه قلÙ
- را ٟاک کنید",
-  "Would you like to clear font colours?": "آیا تÙ
-ایل دارید رنگ قلÙ
- را ٟاک کنید؟",
-  "Split Block": "ؚلاک جداسازی",
-  "Toggle Borders": "فعال/غیر فعال کردن Ù„ØšÙ‡ ها",
-  "Save as": "ذخیره Ù
-انند...",
-  "Insert/Overwrite": "افزودن/جانویسی",
-  "— format —": "— قالؚ —",
-  "Heading 1": "تیتر 1",
-  "Heading 2": "تیتر 2",
-  "Heading 3": "تیتر 3",
-  "Heading 4": "تیتر 4",
-  "Heading 5": "تیتر 5",
-  "Heading 6": "تیتر 6",
-  "Normal": "Ù
-عÙ
-ولی",
-  "Address": "آدرس",
-  "Formatted": "قالؚ ؚندی ؎ده",
+  "Bold": "ضخیم",
+  "Italic": "مورب",
+  "Underline": "زیر خط",
+  "Strikethrough": "رو خط",
+  "Subscript": "زیروند",
+  "Superscript": "بالاوند",
+  "Justify Left": "تراز از چپ",
+  "Justify Center": "تراز در وسط",
+  "Justify Right": "تراز در راست",
+  "Justify Full": "تراز از چپ و راست",
+  "Ordered List": "فهرست مرتب",
+  "Bulleted List": "فهرست گلوله ای",
+  "Decrease Indent": "کاهش سر خط",
+  "Increase Indent": "افزایش سر خط",
+  "Font Color": "رنگ فلم",
+  "Background Color": "رنگ پس زمینه",
+  "Horizontal Rule": "خط افقی",
+  "Insert Web Link": "افزودن لینک وب",
+  "Insert/Modify Image": "افزودن یا ویرایش تصویر",
+  "Insert Table": "افزودن جدول",
+  "Toggle HTML Source": "مشاهده یا عدم مشاهده متن در قالب HTML",
+  "Enlarge Editor": "بزرگ کردن ویرایش گر",
+  "About this editor": "درباره این ویرایش گر",
+  "Help using editor": "راهنمای استفاده ویرایش گر",
+  "Current style": "شیوه کنونی",
+  "Undoes your last action": "برگرداندن آخرین عمل",
+  "Redoes your last action": "انجام مجدد آخرین عمل",
+  "Cut selection": "بریدن انتخاب شده",
+  "Copy selection": "کپی انتخاب شده",
+  "Paste from clipboard": "چسباندن از تخته کار",
+  "Direction left to right": "جهت از چپ به راست",
+  "Direction right to left": "جهت از راست به چپ",
+  "Remove formatting": "حذف فرمت بندی",
+  "Select all": "انتخاب همه",
+  "Print document": "چاپ سند",
+  "Clear MSOffice tags": "پاک کردن متن از برچسب های MSOffice",
+  "Clear Inline Font Specifications": "پاک کردن متن از مشخصات فونت",
+  "Would you like to clear font typefaces?": "آیا تمایل دارید ظاهر فلم را پاک کنید؟",
+  "Would you like to clear font sizes?": "آیا تمایل دارید اندازه قلم را پاک کنید",
+  "Would you like to clear font colours?": "آیا تمایل دارید رنگ قلم را پاک کنید؟",
+  "Split Block": "بلاک جداسازی",
+  "Toggle Borders": "فعال/غیر فعال کردن لبه ها",
+  "Save as": "ذخیره مانند...",
+  "Insert/Overwrite": "افزودن/جانویسی",
+  "— format —": "— قالب —",
+  "Heading 1": "تیتر 1",
+  "Heading 2": "تیتر 2",
+  "Heading 3": "تیتر 3",
+  "Heading 4": "تیتر 4",
+  "Heading 5": "تیتر 5",
+  "Heading 6": "تیتر 6",
+  "Normal": "معمولی",
+  "Address": "آدرس",
+  "Formatted": "قالب بندی شده",
 
   //dialogs
-  "OK": "ؚله",
-  "Cancel": "انصراف",
-  "Path": "Ù
-سیر",
-  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "در Ù
-د Ù
-تنی هستید.  از دکÙ
-ه [<>] استفاده نÙ
-ایید تا ØšÙ‡ Ù
-د WYSIWYG ؚرگردید.",
-  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "دکÙ
-ه چسؚاندن در Ù
-رورگرهای سری Mozilla کار نÙ
-ی کند (ØšÙ‡ دلایل فنی اÙ
-نیتی).ؚرای چسؚاندن Ù
-ستقیÙ
- ، دکÙ
-ه CTRL-V را در صفحه کلید ؚزنید.",
-  "Your Document is not well formed. Check JavaScript console for details.": "سند ØŽÙ
-ا ؚدرستی قالؚ ؚندی ن؎ده است. ؚرای اطلاعات ؚی؎تر ٟایانه نÙ
-ای؎ جاوااسکریٟت را ؚررسی کنید.",
+  "OK": "بله",
+  "Cancel": "انصراف",
+  "Path": "مسیر",
+  "You are in TEXT MODE.  Use the [<>] button to switch back to WYSIWYG.": "در مد متنی هستید.  از دکمه [<>] استفاده نمایید تا به مد WYSIWYG برگردید.",
+  "The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly.": "دکمه چسباندن در مرورگرهای سری Mozilla کار نمی کند (به دلایل فنی امنیتی).برای چسباندن مستقیم ، دکمه CTRL-V را در صفحه کلید بزنید.",
+  "Your Document is not well formed. Check JavaScript console for details.": "سند شما بدرستی قالب بندی نشده است. برای اطلاعات بیشتر پایانه نمایش جاوااسکریپت را بررسی کنید.",
 
-  "Alignment:": "تراز ؚندی",
-  "Not set": "تن؞یÙ
- ن؎ده",
-  "Left": "Ú†ÙŸ",
-  "Right": "راست",
-  "Texttop": "ؚالای Ù
-تن",
-  "Absmiddle": "دقیقا وسط",
-  "Baseline": "اؚتدای خط",
-  "Absbottom": "دقیقا ٟایین",
-  "Bottom": "ٟایین",
-  "Middle": "وسط",
-  "Top": "ؚالا",
+  "Alignment:": "تراز بندی",
+  "Not set": "تنظیم نشده",
+  "Left": "چپ",
+  "Right": "راست",
+  "Texttop": "بالای متن",
+  "Absmiddle": "دقیقا وسط",
+  "Baseline": "ابتدای خط",
+  "Absbottom": "دقیقا پایین",
+  "Bottom": "پایین",
+  "Middle": "وسط",
+  "Top": "بالا",
 
-  "Layout": "لایه",
-  "Spacing": "فاصله گذاری",
-  "Horizontal:": "افقی",
-  "Horizontal padding": "ٟرکننده افقی",
-  "Vertical:": "عÙ
-ودی",
-  "Vertical padding": "ٟرکننده عÙ
-ودی",
-  "Border thickness:": "ضخاÙ
-ت Ù„ØšÙ‡",
-  "Leave empty for no border": "ؚرای ؚدون Ù„ØšÙ‡ خالی رها کن",
+  "Layout": "لایه",
+  "Spacing": "فاصله گذاری",
+  "Horizontal:": "افقی",
+  "Horizontal padding": "پرکننده افقی",
+  "Vertical:": "عمودی",
+  "Vertical padding": "پرکننده عمودی",
+  "Border thickness:": "ضخامت لبه",
+  "Leave empty for no border": "برای بدون لبه خالی رها کن",
 
   //Insert Link
-  "Insert/Modify Link": "افزودن / ویرای؎ لینک",
-  "None (use implicit)": "هیچکداÙ
- (استفاده از ؚدون ؎رط)",
-  "New window (_blank)": "ٟنجره جدید (_blank)",
-  "Same frame (_self)": "فریÙ
- یکسان (_self)",
-  "Top frame (_top)": "فریÙ
- ؚالایی (_top)",
-  "Other": "سایر",
-  "Target:": "هدف",
-  "Title (tooltip):": "عنوان (راهنÙ
-ای یک خطی)",
+  "Insert/Modify Link": "افزودن / ویرایش لینک",
+  "None (use implicit)": "هیچکدام (استفاده از بدون شرط)",
+  "New window (_blank)": "پنجره جدید (_blank)",
+  "Same frame (_self)": "فریم یکسان (_self)",
+  "Top frame (_top)": "فریم بالایی (_top)",
+  "Other": "سایر",
+  "Target:": "هدف",
+  "Title (tooltip):": "عنوان (راهنمای یک خطی)",
   "URL:": "URL:",
-  "You must enter the URL where this link points to": "ؚاید URLی که این لینک ØšÙ‡ آن ا؎اره دارد را وارد کنید",
-  "You need to select some text before creating a link": "ؚاید Ù‚ØšÙ„ از ساخت لینک ، Ù
-تنی را انتخاؚ نÙ
-ایید",
+  "You must enter the URL where this link points to": "باید URLی که این لینک به آن اشاره دارد را وارد کنید",
+  "You need to select some text before creating a link": "باید قبل از ساخت لینک ، متنی را انتخاب نمایید",
 
   // Insert Table
-  "Insert Table": "افزودن جدول",
-  "Rows:": "ردیف ها",
-  "Number of rows": "تعداد ردیف ها",
-  "Cols:": "ستون ها",
-  "Number of columns": "تعداد ستون ها",
-  "Width:": "طول",
-  "Width of the table": "طول جدول",
-  "Percent": "درصد",
-  "Pixels": "ٟیکسل ها",
+  "Insert Table": "افزودن جدول",
+  "Rows:": "ردیف ها",
+  "Number of rows": "تعداد ردیف ها",
+  "Cols:": "ستون ها",
+  "Number of columns": "تعداد ستون ها",
+  "Width:": "طول",
+  "Width of the table": "طول جدول",
+  "Percent": "درصد",
+  "Pixels": "پیکسل ها",
   "Em": "Em",
-  "Width unit": "واحد طول",
-  "Fixed width columns": "ستون های طول ثاؚت",
-  "Positioning of this table": "Ù
-وقعیت یاؚی این جدول",
-  "Cell spacing:": "فاصله سلول ها",
-  "Space between adjacent cells": "فاصله ؚین سلول های هÙ
-جوار",
-  "Cell padding:": "ٟر کننده سلول",
-  "Space between content and border in cell": "فاصله ؚین Ù
-حتوا و Ù„ØšÙ‡ در سلول",
-  "You must enter a number of rows": "ؚاید تعداد ردیف ها را وارد کنید",
-  "You must enter a number of columns": "ؚاید تعداد ستون ها را وارد کنید",
+  "Width unit": "واحد طول",
+  "Fixed width columns": "ستون های طول ثابت",
+  "Positioning of this table": "موقعیت یابی این جدول",
+  "Cell spacing:": "فاصله سلول ها",
+  "Space between adjacent cells": "فاصله بین سلول های همجوار",
+  "Cell padding:": "پر کننده سلول",
+  "Space between content and border in cell": "فاصله بین محتوا و لبه در سلول",
+  "You must enter a number of rows": "باید تعداد ردیف ها را وارد کنید",
+  "You must enter a number of columns": "باید تعداد ستون ها را وارد کنید",
 
   // Insert Image
-  "Insert Image": "افزودن تصویر",
-  "Image URL:": "URL تصویر",
-  "Enter the image URL here": "URL تصویر را اینجا وارد کنید",
-  "Preview": "ٟی؎ نÙ
-ای؎",
-  "Preview the image in a new window": "ٟی؎ نÙ
-ای؎ تصویر در ٟنجره ای جدید",
-  "Alternate text:": "Ù
-تن جایگزین",
-  "For browsers that don't support images": "ؚرای Ù
-رورگرهایی که از تصاویر ٟ؎تیؚانی نÙ
-ی کنند",
-  "Positioning of this image": "Ù
-وقعیت یاؚی تصویر",
-  "Image Preview:": "ٟی؎ نÙ
-ای؎ تصویر",
-  "You must enter the URL": "ØŽÙ
-ا ؚاید URL را وارد کنید",
+  "Insert Image": "افزودن تصویر",
+  "Image URL:": "URL تصویر",
+  "Enter the image URL here": "URL تصویر را اینجا وارد کنید",
+  "Preview": "پیش نمایش",
+  "Preview the image in a new window": "پیش نمایش تصویر در پنجره ای جدید",
+  "Alternate text:": "متن جایگزین",
+  "For browsers that don't support images": "برای مرورگرهایی که از تصاویر پشتیبانی نمی کنند",
+  "Positioning of this image": "موقعیت یابی تصویر",
+  "Image Preview:": "پیش نمایش تصویر",
+  "You must enter the URL": "شما باید URL را وارد کنید",
 
   // toolbar
+  /*
   "button_bold": "fr/bold.gif",
   "button_underline": "fr/underline.gif",
   "button_strikethrough": "fr/strikethrough.gif",
+  */
 
   // Editor Help
-  "Xinha Help": "راهنÙ
-ای Xinha",
-  "Editor Help": "راهنÙ
-ای ویرای؎گر",
-  "Keyboard shortcuts": "Ù
-یانؚرهای صفحه کلید",
-  "The editor provides the following key combinations:": "ویرای؎گر استفاده از کلید های گروهی زیر را Ù
-سیر Ù
-ی سازد :",
+  "Xinha Help": "راهنمای Xinha",
+  "Editor Help": "راهنمای ویرایشگر",
+  "Keyboard shortcuts": "میانبرهای صفحه کلید",
+  "The editor provides the following key combinations:": "ویرایشگر استفاده از کلید های گروهی زیر را مسیر می سازد :",
   "ENTER": "ENTREE",
-  "new paragraph": "ٟاراگراف جدید",
+  "new paragraph": "پاراگراف جدید",
   "SHIFT-ENTER": "SHIFT+ENTREE",
-  "insert linebreak": "افزودن جدا کننده خط",
-  "Set format to paragraph": "تغییر قالؚ ØšÙ‡ ٟاراگراف",
-  "Clean content pasted from Word": "تÙ
-یز کردن Ù
-حتوای چسؚانده ؎ده از Word",
-  "Headings": "عنوان گذاری",
-  "Close": "ؚستن",
+  "insert linebreak": "افزودن جدا کننده خط",
+  "Set format to paragraph": "تغییر قالب به پاراگراف",
+  "Clean content pasted from Word": "تمیز کردن محتوای چسبانده شده از Word",
+  "Headings": "عنوان گذاری",
+  "Close": "بستن",
 
   // Loading messages
-  "Loading in progress. Please wait !": "ؚارگذاری در حال انجاÙ
- است. لطفا صؚر کنید !",
-  "Constructing main object": "ساختن ؎یء اصلی",
-  "Constructing object": "ساختن ؎یء",
-  "Register panel right": "ثؚت قاؚ راست",
-  "Register panel left": "ثؚت قاؚ Ú†ÙŸ",
-  "Register panel top": "ثؚت قاؚ ؚالا",
-  "Register panel bottom": "ثؚت قاؚ ٟایین",
-  "Create Toolbar": "ساخت نوار اؚزار",
-  "Create StatusBar": "ساخت نوار وضعیت",
-  "Generate Xinha object": "تولید ؎یء Xinha",
-  "Init editor size": "Ù
-قدار دهی اندازه ویرای؎گر",
-  "Init IFrame": "Ù
-قدار دهی IFrame",
-  "Register plugin $plugin": "ثؚت ٟلاگین $plugin"
+  "Loading in progress. Please wait !": "بارگذاری در حال انجام است. لطفا صبر کنید !",
+  "Constructing main object": "ساختن شیء اصلی",
+  "Constructing object": "ساختن شیء",
+  "Register panel right": "ثبت قاب راست",
+  "Register panel left": "ثبت قاب چپ",
+  "Register panel top": "ثبت قاب بالا",
+  "Register panel bottom": "ثبت قاب پایین",
+  "Create Toolbar": "ساخت نوار ابزار",
+  "Create StatusBar": "ساخت نوار وضعیت",
+  "Generate Xinha object": "تولید شیء Xinha",
+  "Init editor size": "مقدار دهی اندازه ویرایشگر",
+  "Init IFrame": "مقدار دهی IFrame",
+  "Register plugin $plugin": "ثبت پلاگین $plugin"
 };

branches/ray/modules/ColorPicker/ColorPicker.js

@@ -105 +105 @@
       Xinha.colorPicker.loadColors();
     }
+        
+        this.is_ie_6 = (Xinha.is_ie && Xinha.ie_version < 7);
     var picker = this;
     var enablepick = false;
@@ -406 +408 @@
         this.table.style.left = left + 'px';
       }
-     // IE ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
-      /*@cc_on
-      this.iframe.style.top = this.table.style.top;
-      this.iframe.style.left = this.table.style.left;
-      @*/
+     // IE6 ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
+      if (this.is_ie_6)
+          {
+        this.iframe.style.top = this.table.style.top;
+        this.iframe.style.left = this.table.style.left;
+      }
     };
 
@@ -713 +716 @@
         function createSavedColors(color)
         {
-          var is_ie = false;
-          /*@cc_on is_ie = true; @*/
+          var is_ie = Xinha.is_ie;
+
           var div = document.createElement('div');
           div.style.width = picker.cellsize + 'px';//13px';
@@ -744 +747 @@
         
         //put an iframe behind the table to mask select lists in ie
-        // IE ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
-        /*@cc_on
-        if ( !this.iframe )
-        {
-        this.iframe = document.createElement('iframe');
-        this.iframe.frameBorder = 0;
-        this.iframe.src = "javascript:;";
-        this.iframe.style.position = "absolute";
-        this.iframe.style.width = this.table.offsetWidth;
-        this.iframe.style.height = this.table.offsetHeight;
-        document.body.insertBefore(this.iframe, this.table);
-        }
-        this.iframe.style.display = '';
-        @*/
+        // IE6 ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
+        if (this.is_ie_6)
+        {
+          if ( !this.iframe )
+          {
+            this.iframe = document.createElement('iframe');
+            this.iframe.frameBorder = 0;
+            this.iframe.src = "javascript:;";
+            this.iframe.style.position = "absolute";
+            this.iframe.style.width = this.table.offsetWidth;
+            this.iframe.style.height = this.table.offsetHeight;
+            document.body.insertBefore(this.iframe, this.table);
+          }
+          this.iframe.style.display = '';
+        }
       }
       else
@@ -799 +803 @@
       Xinha._removeEvent(document.body,'mousedown',closeOnBodyClick);
       this.table.style.display = 'none';
-      // IE ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
-      /*@cc_on
-      if ( this.iframe ) { this.iframe.style.display = 'none'; }
-      @*/
+      // IE6 ONLY - prevent windowed elements (<SELECT>) to render above the colorpicker
+      if (this.is_ie_6)
+      {
+        if ( this.iframe ) { this.iframe.style.display = 'none'; }
+      }
     };
 } // end Xinha.colorPicker

branches/ray/modules/Dialogs/XinhaDialog.js

@@ -43 +43 @@
   
   
-  if (Xinha.is_ie)
+  if (Xinha.is_ie && Xinha.ie_version < 7)
   { // IE6 needs the iframe to hide select boxes
     var backG = document.createElement("iframe");
@@ -259 +259 @@
 
   // unfortunately we have to hide the editor (iframe/caret bug)
-  if (Xinha.is_gecko && modal)
+  if (Xinha.is_ff2 && modal)
   {
     this._restoreTo = [this.editor._textArea.style.display, this.editor._iframe.style.visibility, this.editor.hidePanels()];
@@ -281 +281 @@
 
     //rootElemStyle.display   = '';
-Xinha.Dialog.fadeIn(this.rootElem);
+        Xinha.Dialog.fadeIn(this.rootElem);
     var dialogHeight = rootElem.offsetHeight;
     var dialogWidth = rootElem.offsetWidth;
@@ -372 +372 @@
     var dialog = this;
 
-    if (Xinha.is_gecko && this.modal)
+    if (Xinha.is_ff2 && this.modal)
     {
       this.editor._textArea.style.display = this._restoreTo[0];

branches/ray/modules/Dialogs/dialog.js

@@ -28 +28 @@
                 init = window;  // pass this window object by default
         }
-        Dialog._geckoOpenModal(url, action, init);
+        if (typeof window.showModalDialog == 'function')
+        {
+                Dialog._return = function(retVal) {
+                        if (typeof action == 'function') action (retVal);
+                }
+                var r = window.showModalDialog(url, init, "dialogheight=10;dialogwidth=10;resizable=yes");
+        }
+        else
+        {
+                Dialog._geckoOpenModal(url, action, init);
+        }
 }
 

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

@@ -186 +186 @@
     this._htmlArea.style.left     = e.config.fullScreenMargins[3] + 'px';
     this._htmlArea.style.top      = e.config.fullScreenMargins[0] + 'px';
-    if ( !Xinha.is_ie ) this._htmlArea.style.border   = 'none';
+    if ( !Xinha.is_ie && !Xinha.is_webkit ) this._htmlArea.style.border   = 'none';
     this._isFullScreen = true;
     resetScroll();

branches/ray/modules/Gecko/Gecko.js

@@ -189 +189 @@
 /*  This is now handled by a plugin  
     case 13: // ENTER
-      if( !ev.shiftKey && editor.config.mozParaHandler == 'dirty' )
-      {
-        this.dom_checkInsertP();
-        Xinha._stopEvent(ev);
-      }
+
     break;*/
 
@@ -370 +366 @@
       return true; // Indicate paste is done, stop command being issued to browser by Xinha.prototype.execCommand
     }
+    break;
+    case 'removeformat':
+      var editor = this.editor;
+      var sel = editor.getSelection();
+      var selSave = editor.saveSelection(sel);
+      var range = editor.createRange(sel);
+
+      var els = editor._doc.body.getElementsByTagName('*');
+
+      var start = ( range.startContainer.nodeType == 1 ) ? range.startContainer : range.startContainer.parentNode;
+      var i, el;
+      if (sel.isCollapsed) range.selectNodeContents(editor._doc.body);
+      
+      for (i=0; i<els.length;i++)
+      {
+        el = els[i];
+        if ( range.isPointInRange(el, 0) || (els[i] == start && range.startOffset == 0))
+        {
+          el.removeAttribute('style');
+        }
+      }
+      this.editor._doc.execCommand(cmdID, UI, param);
+      editor.restoreSelection(selSave);
+      return true;
+    break;
   }
   
@@ -396 +417 @@
 Xinha.prototype.insertNodeAtSelection = function(toBeInserted)
 {
+  if ( toBeInserted.ownerDocument != this._doc ) // as of FF3, Gecko is strict regarding the ownerDocument of an element
+  {
+    try 
+        {
+                toBeInserted = this._doc.adoptNode( toBeInserted );
+        } catch (e) {}
+  }
   var sel = this.getSelection();
   var range = this.createRange(sel);
@@ -404 +432 @@
   var pos = range.startOffset;
   var selnode = toBeInserted;
+  
   switch ( node.nodeType )
   {
@@ -616 +645 @@
 {
   var sel = this.getSelection();
+  if (sel.isCollapsed) return '';
   var range = this.createRange(sel);
   return Xinha.getHTML(range.cloneContents(), false, this);
@@ -692 +722 @@
 
 //Control character for retaining edit location when switching modes
-Xinha.prototype.cc = String.fromCharCode(173); 
+Xinha.prototype.cc = String.fromCharCode(8286); 
 
 Xinha.prototype.setCC = function ( target )
@@ -706 +736 @@
       var after = ta.value.substring( index, ta.value.length );
 
-      if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
+      if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, entities, and inside the body)
       {
         var tagEnd = after.indexOf(">") + 1;
@@ -712 +742 @@
       }
       else ta.value = before + cc + after;
+      ta.value = ta.value.replace(new RegExp ('(&[^'+cc+']*?)('+cc+')([^'+cc+']*?;)'), "$1$3$2");
       ta.value = ta.value.replace(new RegExp ('(<script[^>]*>[^'+cc+']*?)('+cc+')([^'+cc+']*?<\/script>)'), "$1$3$2");
       ta.value = ta.value.replace(new RegExp ('^([^'+cc+']*)('+cc+')([^'+cc+']*<body[^>]*>)(.*?)'), "$1$3$2$4");
@@ -718 +749 @@
     {
       var sel = this.getSelection();
-      sel.getRangeAt(0).insertNode( document.createTextNode( cc ) );
+      sel.getRangeAt(0).insertNode( this._doc.createTextNode( cc ) );
     }
   } catch (e) {}
@@ -725 +756 @@
 Xinha.prototype.findCC = function ( target )
 {
-  try 
-  {
-    var findIn = ( target == 'textarea' ) ? window : this._iframe.contentWindow;
-    if( findIn.find( this.cc ) )
-    {
-      if (target == "textarea")
-      {
-        var ta = this._textArea;
-        var start = pos = ta.selectionStart;
-        var end = ta.selectionEnd;
-        var scrollTop = ta.scrollTop;
-        ta.value = ta.value.substring( 0, start ) + ta.value.substring( end, ta.value.length );
-        ta.selectionStart = pos;
-        ta.selectionEnd = pos;
-        ta.scrollTop = scrollTop
-        ta.focus();
-      }
-      else
-      {
-        var sel = this.getSelection();
-        sel.getRangeAt(0).deleteContents();
-        this._iframe.contentWindow.focus();
-      }
-    }
-  } catch (e) {}
+  if ( target == 'textarea' )
+  {
+  var ta = this._textArea;
+  var pos = ta.value.indexOf( this.cc );
+  if ( pos == -1 ) return;
+  var end = pos + this.cc.length;
+  var before =  ta.value.substring( 0, pos );
+  var after = ta.value.substring( end, ta.value.length );
+  ta.value = before ;
+
+  ta.scrollTop = ta.scrollHeight;
+  var scrollPos = ta.scrollTop;
+  
+  ta.value += after;
+  ta.setSelectionRange(pos,pos);
+
+  ta.focus();
+  
+  ta.scrollTop = scrollPos;
+
+  }
+  else
+  {
+    try
+    {
+      this._iframe.contentWindow.find( this.cc );
+      var sel = this.getSelection();
+      sel.getRangeAt(0).deleteContents();
+      this.scrollToElement();
+      this._iframe.contentWindow.focus();
+    } catch (e) {}
+  }
 };
 /*--------------------------------------------------------------------------*/

branches/ray/modules/GetHtml/DOMwalk.js

@@ -38 +38 @@
 // Retrieves the HTML code from the given node.  This is a replacement for
 // getting innerHTML, using standard DOM calls.
-// Wrapper catch a Mozilla-Exception with non well formed html source code
+// Wrapper legacy see #442
 Xinha.getHTML = function(root, outputRoot, editor)
 {
-  try
-  {
-    return Xinha.getHTMLWrapper(root,outputRoot,editor);
-  }
-  catch(ex)
-  {   
-    alert(Xinha._lc('Your Document is not well formed. Check JavaScript console for details.'));
-    return editor._iframe.contentWindow.document.body.innerHTML;
-  }
+  return Xinha.getHTMLWrapper(root,outputRoot,editor);
 };
 
@@ -155 +147 @@
           }
           var name = a.nodeName.toLowerCase();
-          if ( /_moz_editor_bogus_node/.test(name) )
+          if ( /_moz_editor_bogus_node/.test(name) || ( name == 'class' && a.nodeValue == 'webkit-block-placeholder') )
           {
             html = "";
@@ -189 +181 @@
             {
               value = a.nodeValue;
+                          if (name == 'class')
+                          {
+                                value = value.replace(/Apple-style-span/,'');
+                                if (!value) continue;
+                          }
               // IE seems not willing to return the original values - it converts to absolute
               // links using a.nodeValue, a.value, a.stringValue, root.getAttribute("href")

branches/ray/modules/GetHtml/TransformInnerHTML.js

@@ -34 +34 @@
 
 Xinha.RegExpCache = [
-/*00*/  new RegExp().compile(/<\s*\/?([^\s\/>]+)[\s*\/>]/gi),//lowercase tags
-/*01*/  new RegExp().compile(/(\s+)_moz[^=>]*=[^\s>]*/gi),//strip _moz attributes
-/*02*/  new RegExp().compile(/\s*=\s*(([^'"][^>\s]*)([>\s])|"([^"]+)"|'([^']+)')/g),// find attributes
-/*03*/  new RegExp().compile(/\/>/g),//strip singlet terminators
-/*04*/  new RegExp().compile(/<(br|hr|img|input|link|meta|param|embed|area)((\s*\S*="[^"]*")*)>/g),//terminate singlet tags
-/*05*/  new RegExp().compile(/(<\w+\s+(\w*="[^"]*"\s+)*)(checked|compact|declare|defer|disabled|ismap|multiple|no(href|resize|shade|wrap)|readonly|selected)([\s>])/gi),//expand singlet attributes
-/*06*/  new RegExp().compile(/(="[^']*)'([^'"]*")/),//check quote nesting
-/*07*/  new RegExp().compile(/&(?=(?!(#[0-9]{2,5};|[a-zA-Z0-9]{2,6};|#x[0-9a-fA-F]{2,4};))[^<]*>)/g),//expand query ampersands not in html entities
-/*08*/  new RegExp().compile(/<\s+/g),//strip tagstart whitespace
-/*09*/  new RegExp().compile(/\s+(\/)?>/g),//trim whitespace
-/*10*/  new RegExp().compile(/\s{2,}/g),//trim extra whitespace
-/*11*/  new RegExp().compile(/\s+([^=\s]+)((="[^"]+")|([\s>]))/g),// lowercase attribute names
-/*12*/  new RegExp().compile(/\s+contenteditable(=[^>\s\/]*)?/gi),//strip contenteditable
-/*13*/  new RegExp().compile(/((href|src)=")([^\s]*)"/g), //find href and src for stripBaseHref()
-/*14*/  new RegExp().compile(/<\/?(div|p|h[1-6]|table|tr|td|th|ul|ol|li|blockquote|object|br|hr|img|embed|param|pre|script|html|head|body|meta|link|title|area|input|form|textarea|select|option)[^>]*>/g),
-/*15*/  new RegExp().compile(/<\/(div|p|h[1-6]|table|tr|ul|ol|blockquote|object|html|head|body|script|form|select)( [^>]*)?>/g),//blocklevel closing tag
-/*16*/  new RegExp().compile(/<(div|p|h[1-6]|table|tr|ul|ol|blockquote|object|html|head|body|script|form|select)( [^>]*)?>/g),//blocklevel opening tag
-/*17*/  new RegExp().compile(/<(td|th|li|option|br|hr|embed|param|pre|meta|link|title|area|input|textarea)[^>]*>/g),//singlet tag or output on 1 line
-/*18*/  new RegExp().compile(/(^|<\/(pre|script)>)(\s|[^\s])*?(<(pre|script)[^>]*>|$)/g),//find content NOT inside pre and script tags
-/*19*/  new RegExp().compile(/(<pre[^>]*>)([\s\S])*?(<\/pre>)/g),//find content inside pre tags
-/*20*/  new RegExp().compile(/(^|<!--[\s\S]*?-->)([\s\S]*?)(?=<!--[\s\S]*?-->|$)/g),//find content NOT inside comments
-/*21*/  new RegExp().compile(/\S*=""/g), //find empty attributes
-/*22*/  new RegExp().compile(/<!--[\s\S]*?-->|<\?[\s\S]*?\?>|<\/?\w[^>]*>/g), //find all tags, including comments and php
-/*23*/  new RegExp().compile(/(^|<\/script>)[\s\S]*?(<script[^>]*>|$)/g) //find content NOT inside script tags
+/*00*/  /<\s*\/?([^\s\/>]+)[\s*\/>]/gi,//lowercase tags
+/*01*/  /(\s+)_moz[^=>]*=[^\s>]*/gi,//strip _moz attributes
+/*02*/  /\s*=\s*(([^'"][^>\s]*)([>\s])|"([^"]+)"|'([^']+)')/g,// find attributes
+/*03*/  /\/>/g,//strip singlet terminators
+/*04*/  /<(br|hr|img|input|link|meta|param|embed|area)((\s*\S*="[^"]*")*)>/g,//terminate singlet tags
+/*05*/  /(<\w+\s+(\w*="[^"]*"\s+)*)(checked|compact|declare|defer|disabled|ismap|multiple|no(href|resize|shade|wrap)|readonly|selected)([\s>])/gi,//expand singlet attributes
+/*06*/  /(="[^']*)'([^'"]*")/,//check quote nesting
+/*07*/  /&(?=(?!(#[0-9]{2,5};|[a-zA-Z0-9]{2,6};|#x[0-9a-fA-F]{2,4};))[^<]*>)/g,//expand query ampersands not in html entities
+/*08*/  /<\s+/g,//strip tagstart whitespace
+/*09*/  /\s+(\/)?>/g,//trim whitespace
+/*10*/  /\s{2,}/g,//trim extra whitespace
+/*11*/  /\s+([^=\s]+)((="[^"]+")|([\s>]))/g,// lowercase attribute names
+/*12*/  /\s+contenteditable(=[^>\s\/]*)?/gi,//strip contenteditable
+/*13*/  /((href|src)=")([^\s]*)"/g, //find href and src for stripBaseHref()
+/*14*/  /<\/?(div|p|h[1-6]|table|tr|td|th|ul|ol|li|blockquote|object|br|hr|img|embed|param|pre|script|html|head|body|meta|link|title|area|input|form|textarea|select|option)[^>]*>/g,
+/*15*/  /<\/(div|p|h[1-6]|table|tr|ul|ol|blockquote|object|html|head|body|script|form|select)( [^>]*)?>/g,//blocklevel closing tag
+/*16*/  /<(div|p|h[1-6]|table|tr|ul|ol|blockquote|object|html|head|body|script|form|select)( [^>]*)?>/g,//blocklevel opening tag
+/*17*/  /<(td|th|li|option|br|hr|embed|param|pre|meta|link|title|area|input|textarea)[^>]*>/g,//singlet tag or output on 1 line
+/*18*/  /(^|<\/(pre|script)>)(\s|[^\s])*?(<(pre|script)[^>]*>|$)/g,//find content NOT inside pre and script tags
+/*19*/  /(<pre[^>]*>)([\s\S])*?(<\/pre>)/g,//find content inside pre tags
+/*20*/  /(^|<!--[\s\S]*?-->)([\s\S]*?)(?=<!--[\s\S]*?-->|$)/g,//find content NOT inside comments
+/*21*/  /\S*=""/g, //find empty attributes
+/*22*/  /<!--[\s\S]*?-->|<\?[\s\S]*?\?>|<\/?\w[^>]*>/g, //find all tags, including comments and php
+/*23*/  /(^|<\/script>)[\s\S]*?(<script[^>]*>|$)/g //find content NOT inside script tags
 ];
-
+// compile for performance; WebKit doesn't support this
+if (typeof RegExp.prototype.compile == 'function') {
+        for (var i=0; i<Xinha.RegExpCache.length;i++ ) {
+                Xinha.RegExpCache[i] = new RegExp().compile(Xinha.RegExpCache[i]);
+        }
+}
 /** 
   * Cleans HTML into wellformed xhtml
@@ -74 +79 @@
                 replace(c[3], '>').//strip singlet terminators
                 replace(c[9], '$1>').//trim whitespace
-                replace(c[5], '$1$3="$3"$4').//expand singlet attributes
+                replace(c[5], '$1$3="$3"$5').//expand singlet attributes
                 replace(c[4], '<$1$2 />').//terminate singlet tags
                 replace(c[6], '$1$2').//check quote nesting

branches/ray/modules/InternetExplorer/InternetExplorer.js

@@ -158 +158 @@
 }
 
+InternetExplorer.prototype.onExecCommand = function(cmdID, UI, param)
+{   
+  switch(cmdID)
+  {
+    // #645 IE only saves the initial content of the iframe, so we create a temporary iframe with the current editor contents
+    case 'saveas':
+        var doc = null;
+        var editor = this.editor;
+        var iframe = document.createElement("iframe");
+        iframe.src = "about:blank";
+        iframe.style.display = 'none';
+        document.body.appendChild(iframe);
+        try
+        {
+          if ( iframe.contentDocument )
+          {
+            doc = iframe.contentDocument;        
+          }
+          else
+          {
+            doc = iframe.contentWindow.document;
+          }
+        }
+        catch(ex)
+        { 
+          //hope there's no exception
+        }
+        
+        doc.open("text/html","replace");
+        var html = '';
+        if ( editor.config.browserQuirksMode === false )
+        {
+          var doctype = '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">';
+        }
+        else if ( editor.config.browserQuirksMode === true )
+        {
+           var doctype = '';
+        }
+        else
+        {
+           var doctype = Xinha.getDoctype(document);
+        }
+        if ( !editor.config.fullPage )
+        {
+          html += doctype + "\n";
+          html += "<html>\n";
+          html += "<head>\n";
+          html += "<meta http-equiv=\"Content-Type\" content=\"text/html; charset=" + editor.config.charSet + "\">\n";
+          if ( typeof editor.config.baseHref != 'undefined' && editor.config.baseHref !== null )
+          {
+            html += "<base href=\"" + editor.config.baseHref + "\"/>\n";
+          }
+          
+          if ( typeof editor.config.pageStyleSheets !== 'undefined' )
+          {
+            for ( var i = 0; i < editor.config.pageStyleSheets.length; i++ )
+            {
+              if ( editor.config.pageStyleSheets[i].length > 0 )
+              {
+                html += "<link rel=\"stylesheet\" type=\"text/css\" href=\"" + editor.config.pageStyleSheets[i] + "\">";
+                //html += "<style> @import url('" + editor.config.pageStyleSheets[i] + "'); </style>\n";
+              }
+            }
+          }
+          
+          if ( editor.config.pageStyle )
+          {
+            html += "<style type=\"text/css\">\n" + editor.config.pageStyle + "\n</style>";
+          }
+          
+          html += "</head>\n";
+          html += "<body>\n";
+          html += editor.getEditorContent();
+          html += "</body>\n";
+          html += "</html>";
+        }
+        else
+        {
+          html = editor.getEditorContent();
+          if ( html.match(Xinha.RE_doctype) )
+          {
+            editor.setDoctype(RegExp.$1);
+          }
+        }
+        doc.write(html);
+        doc.close();
+        doc.execCommand(cmdID, UI, param);
+        document.body.removeChild(iframe);
+      return true;
+    break;
+    case 'removeformat':
+      var editor = this.editor;
+      var sel = editor.getSelection();
+      var selSave = editor.saveSelection(sel);
+
+      var i, el, els;
+
+      function clean (el)
+      {
+        if (el.nodeType != 1) return;
+        el.removeAttribute('style');
+        for (var j=0; j<el.childNodes.length;j++)
+        {
+          clean(el.childNodes[j]);
+        }
+        if ( (el.tagName.toLowerCase() == 'span' && !el.attributes.length ) || el.tagName.toLowerCase() == 'font')
+        {
+          el.outerHTML = el.innerHTML;
+        }
+      }
+      if ( editor.selectionEmpty(sel) )
+      {
+        els = editor._doc.body.childNodes;
+        for (i = 0; i < els.length; i++) 
+        {
+          el = els[i];
+          if (el.nodeType != 1) continue;
+          if (el.tagName.toLowerCase() == 'span')
+          {
+            newNode = editor.convertNode(el, 'div');
+            el.parentNode.replaceChild(newNode, el);
+            el = newNode;
+          }
+          clean(el);
+        }
+      } 
+      editor._doc.execCommand(cmdID, UI, param);
+
+      editor.restoreSelection(selSave);
+      return true;
+    break;
+  }
+  
+  return false;
+};
 /*--------------------------------------------------------------------------*/
 /*------- IMPLEMENTATION OF THE ABSTRACT "Xinha.prototype" METHODS ---------*/
@@ -298 +433 @@
 Xinha.prototype.saveSelection = function()
 {
-  return this.createRange(this._getSelection())
+  return this.createRange(this.getSelection())
 }
 /** 
@@ -360 +495 @@
 {
   var sel = this.getSelection();
+  if (this.selectionEmpty) return '';
   var range = this.createRange(sel);
   
@@ -393 +529 @@
 Xinha.prototype.createRange = function(sel)
 {
+  if (!sel) sel = this.getSelection();
   return sel.createRange();
 };
@@ -447 +584 @@
     var after  = ta.value.substring( index + cc.length , ta.value.length );
     
-    if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
+    if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, entities, and inside the body)
     {
       var tagEnd = after.indexOf(">") + 1;
@@ -453 +590 @@
     }
     else ta.value = before + cc + after;
+    ta.value = ta.value.replace(new RegExp ('(&[^'+cc+']*?)('+cc+')([^'+cc+']*?;)'), "$1$3$2");
     ta.value = ta.value.replace(new RegExp ('(<script[^>]*>[^'+cc+']*?)('+cc+')([^'+cc+']*?<\/script>)'), "$1$3$2");
     ta.value = ta.value.replace(new RegExp ('^([^'+cc+']*)('+cc+')([^'+cc+']*<body[^>]*>)(.*?)'), "$1$3$2$4");

branches/ray/plugins/ExtendedFileManager/Classes/ExtendedFileManager.php

@@ -810 +810 @@
                         break;
                         case 'moveFile':
-                                $src = Files::makePath($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
-                                $dest = Files::makePath($this->getImagesDir(), $_GET['dir'].$_GET['file']);
+                                $src = Files::makeFile($this->getImagesDir(), $_GET['srcdir'].$_GET['file']);
+                                $dest = Files::makeFile($this->getImagesDir(), $_GET['dir'].$_GET['file']);
                                 return Files::rename($src,$dest);
                         break;

branches/ray/plugins/ExtendedFileManager/assets/EditorContent.js

@@ -4 +4 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 04-11-2007 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -47 +48 @@
    if(el) {e=(document.layers)?el:el.style;
    var xx=parseInt(x+ox+a),yy=parseInt(y+oy+b);
-   //alert(xx+":"+yy);
    if(navigator.appName=="Netscape" && parseInt(navigator.appVersion)>4){xx+="px";yy+="px";}
    if(navigator.appVersion.indexOf("MSIE 5")>-1 && navigator.appVersion.indexOf("Mac")>-1){
@@ -53 +53 @@
     xx+="px";yy+="px";}e.left=xx;e.top=yy;}
     pic_x = parseInt(xx); pic_y = parseInt(yy);
-    //alert(xx+":"+yy);
     }
 }
@@ -65 +64 @@
 function init_resize()
 {
-    if(mode == "scale")
-    {
+    //if(mode == "scale")
+    //{
         P7_Snap('theImage','ant',0,0);
 
@@ -88 +87 @@
         drawBoundHandle();
         jg_doc.paint();
-    }
+    //}
 }
 
@@ -99 +98 @@
     if (markerImg.src.indexOf("img/t_white.gif")>0)
         toggleMarker() ;
+        var theImage = document.getElementById('theImage');
+        theImage._width = theImage.width;
+        theImage._height = theImage.height;
 }
 
@@ -141 +143 @@
 function toggleMarker()
 {
-    //alert("Toggle");
     if (ant == null)
         ant = MM_findObj("ant");
@@ -163 +164 @@
     if (dragapproved)
     {
-        //z.style.left=ns6? temp1+e.clientX-x: temp1+event.clientX-x
-        //z.style.top=ns6? temp2+e.clientY-y : temp2+event.clientY-y
-        var w = ns6? temp1+e.clientX - x : temp1+event.clientX - x;
-        var h = ns6? temp2+e.clientY - y : temp2+event.clientY - y;
-
-        //alert(canvas.style.left);
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" w:"+w+" h:"+h+" can_h:"+pic_height;
-            status.innerHTML += " can_w:"+pic_width+" px:"+pic_x+" py:"+pic_y;
-            status.innerHTML += " pix:"+image.style.left+" piy:"+image.style.top+" obj:"+obj.id;
-        }*/
-
-        /*jg_doc.clear();
-        jg_doc.fillRectPattern(0,0,Math.abs(w),Math.abs(h),pattern);
-        jg_doc.paint();
-*/
+        var w = ns6? temp1+e.pageX - x : temp1+event.clientX + document.body.scrollLeft- x;
+        var h = ns6? temp2+e.pageY - y : temp2+event.clientY  + document.body.scrollTop - y;
+
         if (ant != null)
         {
@@ -218 +205 @@
         var dy =ns6? oa_y + e.clientY-y : oa_y + event.clientY-y
 
-        /*if (status !=null)
-        {
-            status.innerHTML  = "x:"+x+" y:"+y+" dx:"+dx+" dy:"+dy;
-        }*/
-
         ant.style.left = dx;
         ant.style.top = dy;
@@ -232 +214 @@
 }
 
-//Code add for constraints by Frédéric Klee <fklee@isuisse.com>
+//Code add for constraints by Frédéric Klee <fklee@isuisse.com>
 function moveHandle(e)
 {
@@ -370 +352 @@
                 content.height = 0;
             }
-            //alert(content.width+":"+content.height);
         }
         resizeHandle = firedobj.id;
-
-        /*if(status!=null) {
-            status.innerHTML  = " obj:"+firedobj.id;
-        }*/
 
         x=ns6? e.clientX: event.clientX
@@ -411 +388 @@
                 content.height = 0;
             }
-            //alert(content.width+":"+content.height);
         }
 
@@ -440 +416 @@
         temp1=parseInt(z.style.left+0)
         temp2=parseInt(z.style.top+0)
-        x=ns6? e.clientX: event.clientX
-        y=ns6? e.clientY: event.clientY
+          
+        x=ns6? e.pageX: event.clientX + document.body.scrollLeft
+        y=ns6? e.pageY: event.clientY + document.body.scrollTop
         document.onmousemove=move
         return false
@@ -453 +430 @@
                 canvas = MM_findObj("imgCanvas");
 
-            x=ns6? e.clientX: event.clientX
-            y=ns6? e.clientY: event.clientY
-
-                //jg_doc.draw
+            x=ns6? e.pageX: event.clientX + document.body.scrollLeft
+            y=ns6? e.pageY: event.clientY + document.body.scrollTop
+
             dragapproved=true
             document.onmousemove=measure
@@ -468 +444 @@
     if (dragapproved)
     {
-        mx2 = ns6? e.clientX : event.clientX;
-        my2 = ns6? e.clientY : event.clientY;
+        mx2 = ns6? e.pageX : event.clientX + document.body.scrollLeft;
+        my2 = ns6? e.pageY : event.clientY + document.body.scrollTop;
 
         jg_doc.clear();
@@ -569 +545 @@
     jg_doc.drawHandleBox(ax-4, ay+ah/2-4,8,8,"w-resize"); //left middle
     jg_doc.drawHandleBox(ax+aw-4, ay+ah/2-4,8,8,"e-resize"); //right middle
-
-    //jg_doc.paint();
 }
 
@@ -578 +552 @@
         return false;
     }
-
+    var zoom = 100 / parseInt( window.parent.document.getElementById('zoom').value, 10 );
     if(mode == "measure") {
-        //alert(pic_x);
+
         mx1 = x - pic_x;
         my1 = y - pic_y;
@@ -599 +573 @@
 
         if (m_sx != null && !isNaN(mx1))
-            m_sx.value = mx1+"px";
+            m_sx.value = mx1 * zoom +"px";
         if (m_sy != null && !isNaN(my1))
-            m_sy.value = my1+"px";
+            m_sy.value = my1 * zoom+"px";
         if(m_w != null && !isNaN(mw))
-            m_w.value = mw + "px";
+            m_w.value = mw * zoom + "px";
         if(m_h != null && !isNaN(mh))
-            m_h.value = mh + "px";
+            m_h.value = mh * zoom + "px";
 
         if(m_d != null && !isNaN(md))
-            m_d.value = md + "px";
+            m_d.value = md * zoom + "px";
         if(m_a != null && !isNaN(ma))
             m_a.value = ma + "";
@@ -615 +589 @@
             r_ra.value = ma;
 
-        //alert("mx1:"+mx1+" my1"+my1);
         return false;
     }
@@ -644 +617 @@
     if(mode == 'crop') {
         if(t_cx != null)
-            t_cx.value = cx;
+            t_cx.value = cx * zoom ;
         if (t_cy != null)
-            t_cy.value = cy;
+            t_cy.value = cy * zoom ;
         if(t_cw != null)
-            t_cw.value = cw;
+            t_cw.value = cw * zoom ;
         if (t_ch != null)
-            t_ch.value = ch;
+            t_ch.value = ch * zoom ;
     }
     else if(mode == 'scale') {
@@ -662 +635 @@
         }
         if (s_sw != null)
-            s_sw.value = sw;
+            s_sw.value = sw * zoom ;
         if (s_sh != null)
-            s_sh.value = sh;
-    }
-
+            s_sh.value = sh * zoom ;
+    }
 }
 
@@ -698 +670 @@
                 content.height = ah-1;
             }
-            //alert(content.width+":"+content.height);
         }
         if(mode == "crop") {
@@ -718 +689 @@
         }
         else if(mode == "scale") {
-            //alert("Resizing: iw:"+image.width+" nw:"+aw);
             document.theImage.height = ah;
             document.theImage.width = aw;
@@ -725 +695 @@
 
             P7_Snap('theImage','ant',0,0);
-
-            //alert("After Resizing: iw:"+image.width+" nw:"+aw);
         }
 

branches/ray/plugins/ExtendedFileManager/assets/dialog.js

@@ -16 +16 @@
 
 function Dialog(url, action, init) {
-    if (typeof init == "undefined") {
-        init = window;  // pass this window object by default
-    }
-    Dialog._geckoOpenModal(url, action, init);
+        if (typeof init == "undefined") {
+                init = window;  // pass this window object by default
+        }
+        if (typeof window.showModalDialog == 'function')
+        {
+                Dialog._return = action;
+                var r = window.showModalDialog(url, init, "dialogheight=10;dialogwidth=10;resizable=yes");
+        }
+        else
+        {
+                Dialog._geckoOpenModal(url, action, init);
+        }
 }
 

branches/ray/plugins/ExtendedFileManager/assets/editor.css

@@ -8 +8 @@
                 #indicator
                 {
-                        width: 25px;
+                        width: 20px;
                         height: 20px;
                         background-color: #eef;                 
                         padding: 15px 20px;
-                        position: absolute;
-                        left: 0; top: 0;
                 }
                 * html #indicator
@@ -21 +19 @@
                 #tools
                 {
-                        width: 600px;
-                        height: 50px;
                         background-color: #eef;
                         padding: 0;
-                        position: absolute;
-                        left: 63px;
                         border-left: 1px solid white;
                         border-bottom: 1px solid white;
@@ -32 +26 @@
                 #toolbar
                 {
-                        width: 53px;
-                        height: 435px;
                         background-color: #eef;
-                        float: left;
                         text-align: center;
                         padding: 5px;
-                        position: absolute;
-                        top: 50px;
                         border-top: 1px solid white;
                         border-right: 1px solid white;
+                        vertical-align: top;
+                        width:50px;
                 }
                 
                 #contents
                 {
-                        width: 600px;
-                        height: 445px;
-                        position: absolute;
-                        left: 64px; top: 51px;
+                        position: relative;
                 }
                 
                 #editor
                 {
-                        width: 600px;
-                        height: 445px;
+                        width: 100%;
+                        height: 100%;
                 }
 
@@ -120 +108 @@
                         vertical-align: middle;
                 }
-                #tools #tool_inputs
+                #tools .tool_inputs
                 {
                         padding-top: 10px;

branches/ray/plugins/ExtendedFileManager/assets/editor.js

@@ -4 +4 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  */
 
@@ -40 +40 @@
 
         //constraints on the scale,
-        //code by Frédéric Klee <fklee@isuisse.com>
+        //code by Frédéric Klee <fklee@isuisse.com>
         if(action == 'scale')
         {
             var theImage = editor.window.document.getElementById('theImage');
-            orginal_width = theImage.width ;
-            orginal_height = theImage.height;
+            orginal_width = theImage._width ;
+            orginal_height = theImage._height;
 
             var w = document.getElementById('sw');
@@ -52 +52 @@
             h.value = orginal_height ;
         }
-
+                if ( action == 'save' )
+                {
+                        var formatSelect = document.getElementById('save_format');
+                        var format = document.getElementById('save_filename').value.match(/\.(gif|png|jpe?g)/i)[1].toLowerCase();
+                        switch ( format )
+                        {
+                                case 'png':
+                                        formatSelect.selectedIndex = '3';
+                                break;
+                                case 'gif':
+                                        formatSelect.selectedIndex = '4';
+                                break;
+                                default:
+                                        formatSelect.selectedIndex = '0';
+                                break;
+                        }
+                        formatSelect.onchange();
+                }
     }
 }
@@ -70 +87 @@
 }
 
-//Togggle constraints, by Frédéric Klee <fklee@isuisse.com>
+//Togggle constraints, by Frédéric Klee <fklee@isuisse.com>
 function toggleConstraints()
 {
@@ -92 +109 @@
 }
 
-//check the constraints, by Frédéric Klee <fklee@isuisse.com>
+//check the constraints, by Frédéric Klee <fklee@isuisse.com>
 function checkConstrains(changed)
 {
@@ -133 +150 @@
 }
 
+function rotateSubActionSelect(selection)
+{
+        var value = selection.options[selection.selectedIndex].value;
+        
+        var rotate_preset_select = document.getElementById('rotate_preset_select');
+        var flip = document.getElementById('flip');
+        var angle = document.getElementById('ra').parentNode;
+        
+        switch (value)
+        {
+                case 'rotate':
+                        rotate_preset_select.style.display = '';
+                        flip.style.display = 'none';
+                        angle.style.display = '';
+                break;
+                case 'flip':
+                        rotate_preset_select.style.display = 'none';
+                        flip.style.display = '';
+                        angle.style.display = 'none';
+                break;
+        }
+}
 function rotatePreset(selection)
 {
@@ -148 +187 @@
 
     var values = selected.split(",");
+        if ( values[0] != 'jpeg' ) document.getElementById('slider').style.display = 'none';
+        else document.getElementById('slider').style.display = 'inline';
     if(values.length >1) {
         updateSlider(parseInt(values[1]));
     }
 
+}
+function zoom()
+{
+        var theImage = editor.window.document.getElementById('theImage');
+        var value = document.getElementById('zoom').value;
+        theImage.width = theImage._width * parseInt( value, 10 ) / 100; 
+        theImage.height = theImage._height * parseInt( value, 10 )/ 100;
+        editor.reset();
+        editor.pic_width = null;
+        editor.pic_height = null;
 }
 function addEvent(obj, evType, fn)
@@ -160 +211 @@
 }
 
-init = function()
-{
-    var bottom = document.getElementById('bottom');
+var init = function()
+{
     if(window.opener)
     {
-        __dlg_init(null, {width: 673, height: 531});
+        __xinha_dlg_init();
         __dlg_translate('ExtendedFileManager');
     }
-}
-
-addEvent(window, 'load', init);
+        addEvent(window, 'resize', winOnResize);
+        try { window.moveTo(0,0); } catch (e) {}
+        window.resizeTo(window.screen.availWidth,window.screen.availHeight);
+        winOnResize();
+}
+function winOnResize ()
+{
+        if ( typeof editor.reset == 'function' && typeof editor.ant != 'undefined'  ) editor.reset();
+        var win = Xinha.viewportSize(window);
+        document.getElementById("contents").style.height = win.y - parseInt(document.getElementById("indicator").offsetHeight,10) - 5 + 'px';
+}
+Xinha.addOnloadHandler( init, window );

branches/ray/plugins/ExtendedFileManager/assets/editorFrame.css

@@ -7 +7 @@
 .handleBox{ z-index:105; }
 .error { font-size:large; font-weight:bold; color:#c00; font-family: Helvetica, sans-serif; } 
+
+#n-resize  {cursor: n-resize  }
+#s-resize  {cursor: s-resize  }
+#w-resize  {cursor: w-resize  }
+#e-resize  {cursor: e-resize  }
+#nw-resize {cursor: nw-resize }
+#sw-resize {cursor: sw-resize }
+#ne-resize {cursor: ne-resize }
+#se-resize {cursor: se-resize }

branches/ray/plugins/ExtendedFileManager/assets/editorFrame.js

@@ -4 +4 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -49 +50 @@
     else if (action == 'rotate')
     {
-        var flip = topDoc.getElementById('flip');
+        var rotate_sub_action = topDoc.getElementById('rotate_sub_action');
 
-        if(flip.value == 'hoz' || flip.value == 'ver')
-            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=flip&params="+flip.value;
+        if(rotate_sub_action.value == 'flip')
+            location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=flip&params="+topDoc.getElementById('flip').value;
         else if (isNaN(parseFloat(r_ra.value))==false)
             location.href = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=rotate&params="+parseFloat(r_ra.value);
@@ -69 +70 @@
         {
             var filename = encodeURI(s_file.value);
-            var quality = parseInt(s_quality.value);
-            var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
-            //alert(url);
-            location.href = url;
+                        var quality = parseInt(s_quality.value);
+                        var format = s_format.value.split(",");
+                        var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=save&params="+format[0]+","+quality+"&file="+filename;
+                location.href = url;
         }
     }
+        else if (action == 'preview') {
+                var s_format = topDoc.getElementById('save_format');
+        var s_quality = topDoc.getElementById('quality');
+                var quality = parseInt(s_quality.value);
+                var format = s_format.value.split(",");
+                var url = _backend_url + "__function=editorFrame&img="+currentImageFile+"&action=preview&params="+format[0]+","+quality+"&file="+filename;
+        location.href = url;
+        }
 }
 
@@ -90 +99 @@
     jg_doc = new jsGraphics("imgCanvas"); // draw directly into document
     jg_doc.setColor("#000000"); // black
-
+        
     initEditor();
+        if (window.parent.document.getElementById('zoom').value != '100') window.parent.zoom();
+        reset();
+        window.parent.document.getElementById('filesize').innerHTML = fileSize; 
 };
 

branches/ray/plugins/ExtendedFileManager/assets/imagelist.css

@@ -30 +30 @@
   padding:5px;
   text-decoration:none;
+  overflow:hidden;
 }
 
@@ -42 +43 @@
 }
 
-.listview { width:100% }
+.listview { width:100%; }
 .listview td, .listview th { text-align:left; font-size:small; }
-.listview td.actions { text-align: right; }
+.listview td.actions { text-align: right;width:111px }
 .listview td.actions img { border:0; }
 
-.listview thead th {background-color: ButtonFace; border: 1px solid threedface; border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; padding-top:2px; padding-bottom:2px; padding-left: 5px; padding-right: 5px; font-size: 9pt; font-family: "MS Sans Serif", Geneva, sans-serif;}
-.listview tbody td, .listview tbody th {padding-top:2px; padding-left: 3px; font-size: 9pt; font-family: "MS Sans Serif", Geneva, sans-serif;}
+.listview thead th {background-color: ButtonFace; border: 1px solid threedface; border-color: ButtonHighlight ButtonShadow ButtonShadow ButtonHighlight; padding-top:2px; padding-bottom:2px; padding-left: 5px; padding-right: 5px; font-size: 9pt; font-family: "MS Sans Serif", "Bitstream Vera Sans", Geneva, Sans, sans-serif;font-weight:normal}
+.listview tbody td, .listview tbody th {overflow:hidden; padding-top:2px; padding-left: 3px; font-size: 9pt;  font-family: "MS Sans Serif", "Bitstream Vera Sans", Geneva, Sans, sans-serif;}
 .listview tbody a, listview tbody a:visited { font-weight: normal; text-decoration: none; color: #000; border:0px; padding:2px;}
 .listview tbody a:hover { background-color:#0B256B; color:#fff;}
 
-.listview tbody tr:hover {background-color: rgb(221,221,255);
+.listview tbody tr:hover {background-color: rgb(221,221,255)};

branches/ray/plugins/ExtendedFileManager/assets/manager.css

@@ -10 +10 @@
 .dirs { padding: 1em;   }
 
-.imageFrame { overflow-x:hidden; width: 100%; height: 145px; margin:0px; background-color: #fff;}
+.imageFrame { overflow-x:hidden; width: 100%; height: 155px; margin:0px; background-color: #fff;}
 .smallWidth{ width: 4em; }
 .largelWidth{ width: 30em; }
@@ -18 +18 @@
 .buttons { width: 70px; text-align: center; }
 .clearboth{ clear: both; }
-#messages { position: relative; left: 175px; top: 115px; background-color: white; width:200px;  float: left; margin-top: -52px; border: 1px solid #ccc; text-align: center; padding: 15px; }
+#messages {opacity:0.8;filter:Alpha(opacity=85);position:relative;height:20px;margin-bottom:-30px;background-color: white;  border: none; text-align: center; padding: 5px; }
 #message  { font-size: 15px; font-weight: bold; color: #69c; }
 iframe { border:1px inset; border-right:none; border-left:none; border-bottom:none; }
-
+#controls {padding-bottom:10px;}
 table { margin-top:10px; }
 th, td { padding-right:3px; text-align:left; font-family:small-caption,helvetica,sans-serif; }

branches/ray/plugins/ExtendedFileManager/assets/manager.js

@@ -5 +5 @@
  * Version: Updated on 20-06-2006 by Krzysztof Kotowicz
  * Version: Updated on 17-11-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -46 +47 @@
 }
 
-//initialise the form
-
-if (manager_mode == "link")
-{
-    var offsetForInputs = (Xinha.is_ie) ? 165 : 150;
-}
-else
-{
-    var offsetForInputs = (Xinha.is_ie) ? 230 : 210;
-}   
-
-var h =  100 // space above files 
-       + 250 // files iframe
-       + offsetForInputs; 
-
-var win_dim = {width:650,height:h};
-window.resizeTo(win_dim.width,win_dim.height);
-if (!Xinha.is_ie)
-{
-  var x = opener.screenX + (opener.outerWidth - win_dim.width) / 2;
-  var y = opener.screenY + (opener.outerHeight - win_dim.height) / 2;
-}
-else
-{//IE does not have window.outer... , so center it on the screen at least
-  var x =  (self.screen.availWidth - win_dim.width) / 2;
-  var y =  (self.screen.availHeight - win_dim.height) / 2;      
-}
-window.moveTo(x,y);
-
-init = function ()
-{
-    
-    
-    __dlg_init(null,  {width:650,height:h});
-
+function init ()
+{
+        if (typeof imgManager == 'undefined' )
+        {
+                setTimeout(init,10); // sometimes we are too hasty
+                return;
+        }
+        
+        var w = 650;
+        var h = 600;
+        
+        window.resizeTo(w,h);
+        var page = Xinha.pageSize(window);
+        window.resizeTo(w,h);
+        
+        var dim = Xinha.viewportSize(window);
+
+        window.resizeBy(0, page.y - dim.y + 5);
+
+        dim = Xinha.viewportSize(window);
+        
+        if (!Xinha.is_ie)
+        {
+          var x = opener.screenX + (opener.outerWidth - dim.x) / 2;
+          var y = opener.screenY + (opener.outerHeight - dim.x) / 2;
+        }
+        else
+        {//IE does not have window.outer... , so center it on the screen at least
+          var x =  (self.screen.availWidth - dim.x) / 2;
+          var y =  (self.screen.availHeight - dim.y) / 2;       
+        }
+        window.moveTo(x,y);
+        
+        __xinha_dlg_init();
     __dlg_translate('ExtendedFileManager');
 
@@ -89 +89 @@
 
     var param = window.dialogArguments.param;
-
+    var startDir = null;
+        
     if(manager_mode=="image" && param)
     {
@@ -141 +142 @@
         if (dreg.test(param['f_url']))
         {
-          changeDir(RegExp.$1);
-          var dirPath = document.getElementById('dirPath');
-          for(var i = 0; i < dirPath.options.length; i++)
-          {
-            if(dirPath.options[i].value == encodeURIComponent(RegExp.$1))
-            {
-              dirPath.options[i].selected = true;
-              break;
-            }
-          }
+                  startDir = RegExp.$1;
         }
 
@@ -174 +166 @@
 
         // Locate to the correct directory
-        var startDir;
         var dreg = new RegExp('^(.*/)([^/]+)$');
         if (dreg.test(param['f_href']))
@@ -186 +177 @@
         }
         
-        if (startDir)
-        {
-          changeDir(startDir);
-          var dirPath = document.getElementById('dirPath');
-          for(var i = 0; i < dirPath.options.length; i++)
-          {
-            if(dirPath.options[i].value == encodeURIComponent(RegExp.$1))
-            {
-              dirPath.options[i].selected = true;
-              break;
-            }
-          }
-        }
-
         if (param)
         {
@@ -238 +215 @@
     else if (!param)
     {
-        var startDir = document.cookie.match(new RegExp ("EFMStartDir" + manager_mode + "=(.*?)(;|$)"));
+        startDir = document.cookie.match(new RegExp ("EFMStartDir" + manager_mode + "=(.*?)(;|$)"));
         if (startDir)
         {
                 startDir = startDir[1];
-                changeDir(startDir);
-                var dirPath = document.getElementById('dirPath');
-                for(var i = 0; i < dirPath.options.length; i++)
-                {
-                  if(dirPath.options[i].value == encodeURIComponent(startDir))
-                  {
-                    dirPath.options[i].selected = true;
-                    break;
-                  }
-                }
         }
     }
+        if ( startDir )
+        {
+                iframeUrl += '&dir=' + startDir;
+                var dirPath = document.getElementById('dirPath');
+                for(var i = 0; i < dirPath.options.length; i++)
+                {
+                        if(dirPath.options[i].value == encodeURIComponent(startDir))
+                        {
+                                dirPath.options[i].selected = true;
+                                break;
+                        }
+                }
+        };
+        imgManager.location.replace(iframeUrl);
+
     if (manager_mode == 'image' && typeof Xinha.colorPicker != "undefined" && document.getElementById('f_backgroundColor') && document.getElementById('f_backgroundColor').type == 'text') {
       // Hookup color pickers
@@ -267 +249 @@
       new Xinha.colorPicker.InputBinding(document.getElementById('f_borderColor'),pickerConfig);
     }
+        setTimeout(function() { resize();addEvent(window, 'resize', resize); }, 500);
 }
 
@@ -566 +549 @@
 {
         var win = Xinha.viewportSize(window);
-        document.getElementById('imgManager').style.height = parseInt( win.y - 130 - offsetForInputs, 10 ) + 'px';
-        
+        var m = document.getElementById('messages');
+        var messagesHeight = (m && m.style.display != 'none' ) ?  parseInt( document.getElementById('messages').offsetHeight, 10 ) : 0;
+        document.getElementById('imgManager').style.height = parseInt( win.y - 130 - document.getElementById('controls').offsetHeight, 10 ) - messagesHeight  + 'px';
         return true;
 }
-addEvent(window, 'resize', resize);
-if (Xinha.is_gecko)
-{// this runs the init function (translation) before all the images in the iframe have loaded
-        document.addEventListener("DOMContentLoaded", init, false);
-}
-else
-{
-        addEvent(window, 'load', init);
-}
+
+Xinha.addOnloadHandler( init, window );

branches/ray/plugins/ExtendedFileManager/assets/popup.js

@@ -16 +16 @@
         opener.Dialog._return(null);
 }
+function __dlg_init( bottom, win_dim ) {
+  __xinha_dlg_init(win_dim);
+}
 
+function __xinha_dlg_init( win_dim ) {
+  if(window.__dlg_init_done) return true;
+  
+  if(window.opener._editor_skin) {
+    var head = document.getElementsByTagName("head")[0];
+    var link = document.createElement("link");
+    link.type = "text/css";
+    link.href = window.opener._editor_url + 'skins/' + window.opener._editor_skin + '/skin.css';
+    link.rel = "stylesheet";
+    head.appendChild(link);
+  }
+  if (!window.dialogArguments && opener.Dialog._arguments)
+  {
+    window.dialogArguments = opener.Dialog._arguments;
+  }
+
+  Xinha.addDom0Event(document.body, 'keypress', __dlg_close_on_esc);
+  window.__dlg_init_done = true;
+}
 function __dlg_translate(context) {
     var types = ["span", "option", "td", "th", "button", "div", "label", "a","img", "legend"];

branches/ray/plugins/ExtendedFileManager/assets/wz_jsgraphics.js

@@ -1 +1 @@
 /***********************************************************************
-** Title.........:  Javascript Graphics
-** Version.......:  1.0
-** Author........:  Xiang Wei ZHUO <wei@zhuo.org>
 ** Filename......:  wz_jsgraphics.js
-** Last changed..:  31 Aug 2003  
-** Notes.........:  Modified for Image Editor, added extra commands
+** Last changed..:  2 November 2007 by Raimund Meyer updated to new version  
+** Notes.........:  Modified by Xiang Wei ZHUO <wei@zhuo.org> for Image Editor, added extra commands l. 690-740
 **/ 
 
 /* This notice must be untouched at all times.
 
-wz_jsgraphics.js    v. 2.03
+wz_jsgraphics.js    v. 3.02
 The latest version is available at
 http://www.walterzorn.com
@@ -16 +13 @@
 or http://www.walterzorn.de
 
-Copyright (c) 2002-2003 Walter Zorn. All rights reserved.
-Created 3. 11. 2002 by Walter Zorn <walter@kreuzotter.de>
-Last modified: 11. 6. 2003
+Copyright (c) 2002-2004 Walter Zorn. All rights reserved.
+Created 3. 11. 2002 by Walter Zorn (Web: http://www.walterzorn.com )
+Last modified: 26. 10. 2007
+
+Performance optimizations for Internet Explorer
+by Thomas Frank and John Holdsworth.
+fillPolygon method implemented by Matthieu Haller.
 
 High Performance JavaScript Graphics Library.
 Provides methods
 - to draw lines, rectangles, ellipses, polygons
-  with specifiable line thickness,
-- to fill rectangles and ellipses
+        with specifiable line thickness,
+- to fill rectangles, polygons, ellipses and arcs
 - to draw text.
 NOTE: Operations, functions and branching have rather been optimized
 to efficiency and speed than to shortness of source code.
 
-This program is free software;
-you can redistribute it and/or modify it under the terms of the
-GNU General Public License as published by the Free Software Foundation;
-either version 2 of the License, or (at your option) any later version.
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY;
-without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-See the GNU General Public License
-at http://www.gnu.org/copyleft/gpl.html for more details.
+LICENSE: LGPL
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License (LGPL) as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA,
+or see http://www.gnu.org/copyleft/lesser.html
 */
 
-var jg_ihtm, jg_ie, jg_dom, jg_n4 = (document.layers && typeof document.classes != "undefined");
-
-function chkDHTM(x, i)
-{
-    x = document.body || null;
-    jg_ie = (x && typeof x.insertAdjacentHTML != "undefined");
-    jg_dom = (x && !jg_ie &&
-        typeof x.appendChild != "undefined" &&
-        typeof document.createRange != "undefined" &&
-        typeof (i = document.createRange()).setStartBefore != "undefined" &&
-        typeof i.createContextualFragment != "undefined");
-    jg_ihtm = (!jg_ie && !jg_dom && x && typeof x.innerHTML != "undefined");
-}
-
-function pntDoc()
-{
-    this.wnd.document.write(this.htm);
-    this.htm = '';
-}
-
-function pntCnvDom()
-{
-    var x = document.createRange();
-    x.setStartBefore(this.cnv);
-    x = x.createContextualFragment(this.htm);
-    this.cnv.appendChild(x);
-    this.htm = '';
-}
-
-function pntCnvIe()
-{
-    this.cnv.insertAdjacentHTML("BeforeEnd", this.htm);
-    this.htm = '';
-}
-
-function pntCnvIhtm()
-{
-    this.cnv.innerHTML += this.htm;
-    this.htm = '';
-}
-
-function pntCnv()
-{
-    this.htm = '';
-}
-
-function mkDiv(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-
-    //alert(this.htm);
-}
-
-function mkDivPrint(x, y, w, h)
-{
-    this.htm += '<div style="position:absolute;'+
-        'border-left:' + w + 'px solid ' + this.color + ';'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'width:' + w + 'px;'+
-        'height:' + h + 'px;'+
-        'clip:rect(0,'+w+'px,'+h+'px,0);'+
-        'overflow:hidden;background-color:' + this.color + ';'+
-        '"><\/div>';
-}
-
-function mkLyr(x, y, w, h)
-{
-    this.htm += '<layer '+
-        'left="' + x + '" '+
-        'top="' + y + '" '+
-        'width="' + w + '" '+
-        'height="' + h + '" '+
-        'bgcolor="' + this.color + '"><\/layer>\n';
-}
-
-function mkLbl(txt, x, y)
-{
-    this.htm += '<div style="position:absolute;white-space:nowrap;'+
-        'left:' + x + 'px;'+
-        'top:' + y + 'px;'+
-        'font-family:' +  this.ftFam + ';'+
-        'font-size:' + this.ftSz + ';'+
-        'color:' + this.color + ';' + this.ftSty + '">'+
-        txt +
-        '<\/div>';
-}
-
-function mkLin(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox, 1);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, 1, oy-y+1);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, 1, oy-y2+1);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, 1, y-oy);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, 1, y2-oy+1);
-        }
-    }
-}
-
-function mkLin2D(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1;
-
-
-    var s = this.stroke;
-    if (dx >= dy)
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.ceil(s/2);
-
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx,
-        ox = x;
-        while ((dx--) > 0)
-        {
-            ++x;
-            if (p > 0)
-            {
-                this.mkDiv(ox, y, x-ox+ad, _s);
-                y += yIncr;
-                p += pru;
-                ox = x;
-            }
-            else p += pr;
-        }
-        this.mkDiv(ox, y, x2-ox+ad+1, _s);
-    }
-
-    else
-    {
-        if (s-0x3 > 0)
-        {
-            var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
-            _s = (!(s-0x4)? Math.ceil(_s) : Math.round(_s)) + 1;
-        }
-        else var _s = s;
-        var ad = Math.round(s/2);
-
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy,
-        oy = y;
-        if (y2 <= y1)
-        {
-            ++ad;
-            while ((dy--) > 0)
-            {
-                if (p > 0)
-                {
-                    this.mkDiv(x++, y, _s, oy-y+ad);
-                    y += yIncr;
-                    p += pru;
-                    oy = y;
-                }
-                else
-                {
-                    y += yIncr;
-                    p += pr;
-                }
-            }
-            this.mkDiv(x2, y2, _s, oy-y2+ad);
-        }
-        else
-        {
-            while ((dy--) > 0)
-            {
-                y += yIncr;
-                if (p > 0)
-                {
-                    this.mkDiv(x++, oy, _s, y-oy+ad);
-                    p += pru;
-                    oy = y;
-                }
-                else p += pr;
-            }
-            this.mkDiv(x2, oy, _s, y2-oy+ad+1);
-        }
-    }
-}
-
-function mkLinDott(x1, y1, x2, y2)
-{
-    if (x1 > x2)
-    {
-        var _x2 = x2;
-        var _y2 = y2;
-        x2 = x1;
-        y2 = y1;
-        x1 = _x2;
-        y1 = _y2;
-    }
-    var dx = x2-x1, dy = Math.abs(y2-y1),
-    x = x1, y = y1,
-    yIncr = (y1 > y2)? -1 : 1,
-    drw = true;
-    if (dx >= dy)
-    {
-        var pr = dy<<1,
-        pru = pr - (dx<<1),
-        p = pr-dx;
-        while ((dx--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            if (p > 0)
-            {
-                y += yIncr;
-                p += pru;
-            }
-            else p += pr;
-            ++x;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-
-    else
-    {
-        var pr = dx<<1,
-        pru = pr - (dy<<1),
-        p = pr-dy;
-        while ((dy--) > 0)
-        {
-            if (drw) this.mkDiv(x, y, 1, 1);
-            drw = !drw;
-            y += yIncr;
-            if (p > 0)
-            {
-                ++x;
-                p += pru;
-            }
-            else p += pr;
-        }
-        if (drw) this.mkDiv(x, y, 1, 1);
-    }
-}
-
-function mkOv(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    ox = 0, oy = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1),
-    w, h;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-            tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-            w = x-ox;
-            h = oy-y;
-            if (w&0x2 && h&0x2)
-            {
-                this.mkOvQds(cx, cy, -x+0x2, ox+wod, -oy, oy-1+hod, 1, 1);
-                this.mkOvQds(cx, cy, -x+1, x-1+wod, -y-1, y+hod, 1, 1);
-            }
-            else this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, oy-h+hod, w, h);
-            ox = x;
-            oy = y;
-        }
-        else
-        {
-            tt -= aa*((y<<1)-0x3);
-            st -= (aa<<1)*(--y);
-        }
-    }
-    this.mkDiv(cx-a, cy-oy, a-ox+1, (oy<<1)+hod);
-    this.mkDiv(cx+ox+wod, cy-oy, a-ox+1, (oy<<1)+hod);
-}
-
-function mkOv2D(left, top, width, height)
-{
-    var s = this.stroke;
-    width += s-1;
-    height += s-1;
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = (height&1)+1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa = (a*a)<<1, bb = (b*b)<<1,
-    st = (aa>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa*((b<<1)-1);
-
-
-    if (s-0x4 < 0 && (!(s-0x2) || width-0x33 > 0 && height-0x33 > 0))
-    {
-        var ox = 0, oy = b,
-        w, h,
-        pxl, pxr, pxt, pxb, pxw;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                w = x-ox;
-                h = oy-y;
-
-                if (w-1)
-                {
-                    pxw = w+1+(s&1);
-                    h = s;
-                }
-                else if (h-1)
-                {
-                    pxw = s;
-                    h += 1+(s&1);
-                }
-                else pxw = h = s;
-                this.mkOvQds(cx, cy, -x+1, ox-pxw+w+wod, -oy, -h+oy+hod, pxw, h);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
-        this.mkDiv(cx+a+wod-s+1, cy-oy, s, (oy<<1)+hod);
-    }
-
-
-    else
-    {
-        var _a = (width-((s-1)<<1))>>1,
-        _b = (height-((s-1)<<1))>>1,
-        _x = 0, _y = _b,
-        _aa = (_a*_a)<<1, _bb = (_b*_b)<<1,
-        _st = (_aa>>1)*(1-(_b<<1)) + _bb,
-        _tt = (_bb>>1) - _aa*((_b<<1)-1),
-
-        pxl = new Array(),
-        pxt = new Array(),
-        _pxb = new Array();
-        pxl[0] = 0;
-        pxt[0] = b;
-        _pxb[0] = _b-1;
-        while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - (aa<<1)*(y-1);
-                tt += (bb<<1)*(++x) - aa*(((y--)<<1)-0x3);
-                pxl[pxl.length] = x;
-                pxt[pxt.length] = y;
-            }
-            else
-            {
-                tt -= aa*((y<<1)-0x3);
-                st -= (aa<<1)*(--y);
-            }
-
-            if (_y > 0)
-            {
-                if (_st < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3);
-                    _tt += (_bb<<1)*(++_x);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else if (_tt < 0)
-                {
-                    _st += _bb*((_x<<1)+0x3) - (_aa<<1)*(_y-1);
-                    _tt += (_bb<<1)*(++_x) - _aa*(((_y--)<<1)-0x3);
-                    _pxb[_pxb.length] = _y-1;
-                }
-                else
-                {
-                    _tt -= _aa*((_y<<1)-0x3);
-                    _st -= (_aa<<1)*(--_y);
-                    _pxb[_pxb.length-1]--;
-                }
-            }
-        }
-
-        var ox = 0, oy = b,
-        _oy = _pxb[0],
-        l = pxl.length,
-        w, h;
-        for (var i = 0; i < l; i++)
-        {
-            if (typeof _pxb[i] != "undefined")
-            {
-                if (_pxb[i] < _oy || pxt[i] < oy)
-                {
-                    x = pxl[i];
-                    this.mkOvQds(cx, cy, -x+1, ox+wod, -oy, _oy+hod, x-ox, oy-_oy);
-                    ox = x;
-                    oy = pxt[i];
-                    _oy = _pxb[i];
-                }
-            }
-            else
-            {
-                x = pxl[i];
-                this.mkDiv(cx-x+1, cy-oy, 1, (oy<<1)+hod);
-                this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-                ox = x;
-                oy = pxt[i];
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
-        this.mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
-    }
-}
-
-function mkOvDott(left, top, width, height)
-{
-    var a = width>>1, b = height>>1,
-    wod = width&1, hod = height&1,
-    cx = left+a, cy = top+b,
-    x = 0, y = b,
-    aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-    st = (aa2>>1)*(1-(b<<1)) + bb,
-    tt = (bb>>1) - aa2*((b<<1)-1),
-    drw = true;
-    while (y > 0)
-    {
-        if (st < 0)
-        {
-            st += bb*((x<<1)+0x3);
-            tt += (bb<<1)*(++x);
-        }
-        else if (tt < 0)
-        {
-            st += bb*((x<<1)+0x3) - aa4*(y-1);
-            tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-        }
-        else
-        {
-            tt -= aa2*((y<<1)-0x3);
-            st -= aa4*(--y);
-        }
-        if (drw) this.mkOvQds(cx, cy, -x, x+wod, -y, y+hod, 1, 1);
-        drw = !drw;
-    }
-}
-
-function mkRect(x, y, w, h)
-{
-    var s = this.stroke;
-    this.mkDiv(x, y, w, s);
-    this.mkDiv(x+w, y, s, h);
-    this.mkDiv(x, y+h, w+s, s);
-    this.mkDiv(x, y+s, s, h-s);
-}
-
-function mkRectDott(x, y, w, h)
-{
-    this.drawLine(x, y, x+w, y);
-    this.drawLine(x+w, y, x+w, y+h);
-    this.drawLine(x, y+h, x+w, y+h);
-    this.drawLine(x, y, x, y+h);
+
+var jg_ok, jg_ie, jg_fast, jg_dom, jg_moz;
+
+
+function _chkDHTM(x, i)
+{
+        x = document.body || null;
+        jg_ie = x && typeof x.insertAdjacentHTML != "undefined" && document.createElement;
+        jg_dom = (x && !jg_ie &&
+                typeof x.appendChild != "undefined" &&
+                typeof document.createRange != "undefined" &&
+                typeof (i = document.createRange()).setStartBefore != "undefined" &&
+                typeof i.createContextualFragment != "undefined");
+        jg_fast = jg_ie && document.all && !window.opera;
+        jg_moz = jg_dom && typeof x.style.MozOpacity != "undefined";
+        jg_ok = !!(jg_ie || jg_dom);
+}
+
+function _pntCnvDom()
+{
+        var x = this.wnd.document.createRange();
+        x.setStartBefore(this.cnv);
+        x = x.createContextualFragment(jg_fast? this._htmRpc() : this.htm);
+        if(this.cnv) this.cnv.appendChild(x);
+        this.htm = "";
+}
+
+function _pntCnvIe()
+{
+        if(this.cnv) this.cnv.insertAdjacentHTML("BeforeEnd", jg_fast? this._htmRpc() : this.htm);
+        this.htm = "";
+}
+
+function _pntDoc()
+{
+        this.wnd.document.write(jg_fast? this._htmRpc() : this.htm);
+        this.htm = '';
+}
+
+function _pntN()
+{
+        ;
+}
+
+function _mkDiv(x, y, w, h)
+{
+        this.htm += '<div style="position:absolute;'+
+                'left:' + x + 'px;'+
+                'top:' + y + 'px;'+
+                'width:' + w + 'px;'+
+                'height:' + h + 'px;'+
+                'clip:rect(0,'+w+'px,'+h+'px,0);'+
+                'background-color:' + this.color +
+                (!jg_moz? ';overflow:hidden' : '')+
+                ';"><\/div>';
+}
+
+function _mkDivIe(x, y, w, h)
+{
+        this.htm += '%%'+this.color+';'+x+';'+y+';'+w+';'+h+';';
+}
+
+function _mkDivPrt(x, y, w, h)
+{
+        this.htm += '<div style="position:absolute;'+
+                'border-left:' + w + 'px solid ' + this.color + ';'+
+                'left:' + x + 'px;'+
+                'top:' + y + 'px;'+
+                'width:0px;'+
+                'height:' + h + 'px;'+
+                'clip:rect(0,'+w+'px,'+h+'px,0);'+
+                'background-color:' + this.color +
+                (!jg_moz? ';overflow:hidden' : '')+
+                ';"><\/div>';
+}
+
+var _regex =  /%%([^;]+);([^;]+);([^;]+);([^;]+);([^;]+);/g;
+function _htmRpc()
+{
+        return this.htm.replace(
+                _regex,
+                '<div style="overflow:hidden;position:absolute;background-color:'+
+                '$1;left:$2;top:$3;width:$4;height:$5"></div>\n');
+}
+
+function _htmPrtRpc()
+{
+        return this.htm.replace(
+                _regex,
+                '<div style="overflow:hidden;position:absolute;background-color:'+
+                '$1;left:$2;top:$3;width:$4;height:$5;border-left:$4px solid $1"></div>\n');
+}
+
+function _mkLin(x1, y1, x2, y2)
+{
+        if(x1 > x2)
+        {
+                var _x2 = x2;
+                var _y2 = y2;
+                x2 = x1;
+                y2 = y1;
+                x1 = _x2;
+                y1 = _y2;
+        }
+        var dx = x2-x1, dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        yIncr = (y1 > y2)? -1 : 1;
+
+        if(dx >= dy)
+        {
+                var pr = dy<<1,
+                pru = pr - (dx<<1),
+                p = pr-dx,
+                ox = x;
+                while(dx > 0)
+                {--dx;
+                        ++x;
+                        if(p > 0)
+                        {
+                                this._mkDiv(ox, y, x-ox, 1);
+                                y += yIncr;
+                                p += pru;
+                                ox = x;
+                        }
+                        else p += pr;
+                }
+                this._mkDiv(ox, y, x2-ox+1, 1);
+        }
+
+        else
+        {
+                var pr = dx<<1,
+                pru = pr - (dy<<1),
+                p = pr-dy,
+                oy = y;
+                if(y2 <= y1)
+                {
+                        while(dy > 0)
+                        {--dy;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, y, 1, oy-y+1);
+                                        y += yIncr;
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else
+                                {
+                                        y += yIncr;
+                                        p += pr;
+                                }
+                        }
+                        this._mkDiv(x2, y2, 1, oy-y2+1);
+                }
+                else
+                {
+                        while(dy > 0)
+                        {--dy;
+                                y += yIncr;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, oy, 1, y-oy);
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else p += pr;
+                        }
+                        this._mkDiv(x2, oy, 1, y2-oy+1);
+                }
+        }
+}
+
+function _mkLin2D(x1, y1, x2, y2)
+{
+        if(x1 > x2)
+        {
+                var _x2 = x2;
+                var _y2 = y2;
+                x2 = x1;
+                y2 = y1;
+                x1 = _x2;
+                y1 = _y2;
+        }
+        var dx = x2-x1, dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        yIncr = (y1 > y2)? -1 : 1;
+
+        var s = this.stroke;
+        if(dx >= dy)
+        {
+                if(dx > 0 && s-3 > 0)
+                {
+                        var _s = (s*dx*Math.sqrt(1+dy*dy/(dx*dx))-dx-(s>>1)*dy) / dx;
+                        _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
+                }
+                else var _s = s;
+                var ad = Math.ceil(s/2);
+
+                var pr = dy<<1,
+                pru = pr - (dx<<1),
+                p = pr-dx,
+                ox = x;
+                while(dx > 0)
+                {--dx;
+                        ++x;
+                        if(p > 0)
+                        {
+                                this._mkDiv(ox, y, x-ox+ad, _s);
+                                y += yIncr;
+                                p += pru;
+                                ox = x;
+                        }
+                        else p += pr;
+                }
+                this._mkDiv(ox, y, x2-ox+ad+1, _s);
+        }
+
+        else
+        {
+                if(s-3 > 0)
+                {
+                        var _s = (s*dy*Math.sqrt(1+dx*dx/(dy*dy))-(s>>1)*dx-dy) / dy;
+                        _s = (!(s-4)? Math.ceil(_s) : Math.round(_s)) + 1;
+                }
+                else var _s = s;
+                var ad = Math.round(s/2);
+
+                var pr = dx<<1,
+                pru = pr - (dy<<1),
+                p = pr-dy,
+                oy = y;
+                if(y2 <= y1)
+                {
+                        ++ad;
+                        while(dy > 0)
+                        {--dy;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, y, _s, oy-y+ad);
+                                        y += yIncr;
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else
+                                {
+                                        y += yIncr;
+                                        p += pr;
+                                }
+                        }
+                        this._mkDiv(x2, y2, _s, oy-y2+ad);
+                }
+                else
+                {
+                        while(dy > 0)
+                        {--dy;
+                                y += yIncr;
+                                if(p > 0)
+                                {
+                                        this._mkDiv(x++, oy, _s, y-oy+ad);
+                                        p += pru;
+                                        oy = y;
+                                }
+                                else p += pr;
+                        }
+                        this._mkDiv(x2, oy, _s, y2-oy+ad+1);
+                }
+        }
+}
+
+function _mkLinDott(x1, y1, x2, y2)
+{
+        if(x1 > x2)
+        {
+                var _x2 = x2;
+                var _y2 = y2;
+                x2 = x1;
+                y2 = y1;
+                x1 = _x2;
+                y1 = _y2;
+        }
+        var dx = x2-x1, dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        yIncr = (y1 > y2)? -1 : 1,
+        drw = true;
+        if(dx >= dy)
+        {
+                var pr = dy<<1,
+                pru = pr - (dx<<1),
+                p = pr-dx;
+                while(dx > 0)
+                {--dx;
+                        if(drw) this._mkDiv(x, y, 1, 1);
+                        drw = !drw;
+                        if(p > 0)
+                        {
+                                y += yIncr;
+                                p += pru;
+                        }
+                        else p += pr;
+                        ++x;
+                }
+        }
+        else
+        {
+                var pr = dx<<1,
+                pru = pr - (dy<<1),
+                p = pr-dy;
+                while(dy > 0)
+                {--dy;
+                        if(drw) this._mkDiv(x, y, 1, 1);
+                        drw = !drw;
+                        y += yIncr;
+                        if(p > 0)
+                        {
+                                ++x;
+                                p += pru;
+                        }
+                        else p += pr;
+                }
+        }
+        if(drw) this._mkDiv(x, y, 1, 1);
+}
+
+function _mkOv(left, top, width, height)
+{
+        var a = (++width)>>1, b = (++height)>>1,
+        wod = width&1, hod = height&1,
+        cx = left+a, cy = top+b,
+        x = 0, y = b,
+        ox = 0, oy = b,
+        aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+        st = (aa2>>1)*(1-(b<<1)) + bb2,
+        tt = (bb2>>1) - aa2*((b<<1)-1),
+        w, h;
+        while(y > 0)
+        {
+                if(st < 0)
+                {
+                        st += bb2*((x<<1)+3);
+                        tt += bb4*(++x);
+                }
+                else if(tt < 0)
+                {
+                        st += bb2*((x<<1)+3) - aa4*(y-1);
+                        tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                        w = x-ox;
+                        h = oy-y;
+                        if((w&2) && (h&2))
+                        {
+                                this._mkOvQds(cx, cy, x-2, y+2, 1, 1, wod, hod);
+                                this._mkOvQds(cx, cy, x-1, y+1, 1, 1, wod, hod);
+                        }
+                        else this._mkOvQds(cx, cy, x-1, oy, w, h, wod, hod);
+                        ox = x;
+                        oy = y;
+                }
+                else
+                {
+                        tt -= aa2*((y<<1)-3);
+                        st -= aa4*(--y);
+                }
+        }
+        w = a-ox+1;
+        h = (oy<<1)+hod;
+        y = cy-oy;
+        this._mkDiv(cx-a, y, w, h);
+        this._mkDiv(cx+ox+wod-1, y, w, h);
+}
+
+function _mkOv2D(left, top, width, height)
+{
+        var s = this.stroke;
+        width += s+1;
+        height += s+1;
+        var a = width>>1, b = height>>1,
+        wod = width&1, hod = height&1,
+        cx = left+a, cy = top+b,
+        x = 0, y = b,
+        aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+        st = (aa2>>1)*(1-(b<<1)) + bb2,
+        tt = (bb2>>1) - aa2*((b<<1)-1);
+
+        if(s-4 < 0 && (!(s-2) || width-51 > 0 && height-51 > 0))
+        {
+                var ox = 0, oy = b,
+                w, h,
+                pxw;
+                while(y > 0)
+                {
+                        if(st < 0)
+                        {
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0)
+                        {
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                w = x-ox;
+                                h = oy-y;
+
+                                if(w-1)
+                                {
+                                        pxw = w+1+(s&1);
+                                        h = s;
+                                }
+                                else if(h-1)
+                                {
+                                        pxw = s;
+                                        h += 1+(s&1);
+                                }
+                                else pxw = h = s;
+                                this._mkOvQds(cx, cy, x-1, oy, pxw, h, wod, hod);
+                                ox = x;
+                                oy = y;
+                        }
+                        else
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                        }
+                }
+                this._mkDiv(cx-a, cy-oy, s, (oy<<1)+hod);
+                this._mkDiv(cx+a+wod-s, cy-oy, s, (oy<<1)+hod);
+        }
+
+        else
+        {
+                var _a = (width-(s<<1))>>1,
+                _b = (height-(s<<1))>>1,
+                _x = 0, _y = _b,
+                _aa2 = (_a*_a)<<1, _aa4 = _aa2<<1, _bb2 = (_b*_b)<<1, _bb4 = _bb2<<1,
+                _st = (_aa2>>1)*(1-(_b<<1)) + _bb2,
+                _tt = (_bb2>>1) - _aa2*((_b<<1)-1),
+
+                pxl = new Array(),
+                pxt = new Array(),
+                _pxb = new Array();
+                pxl[0] = 0;
+                pxt[0] = b;
+                _pxb[0] = _b-1;
+                while(y > 0)
+                {
+                        if(st < 0)
+                        {
+                                pxl[pxl.length] = x;
+                                pxt[pxt.length] = y;
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0)
+                        {
+                                pxl[pxl.length] = x;
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                pxt[pxt.length] = y;
+                        }
+                        else
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                        }
+
+                        if(_y > 0)
+                        {
+                                if(_st < 0)
+                                {
+                                        _st += _bb2*((_x<<1)+3);
+                                        _tt += _bb4*(++_x);
+                                        _pxb[_pxb.length] = _y-1;
+                                }
+                                else if(_tt < 0)
+                                {
+                                        _st += _bb2*((_x<<1)+3) - _aa4*(_y-1);
+                                        _tt += _bb4*(++_x) - _aa2*(((_y--)<<1)-3);
+                                        _pxb[_pxb.length] = _y-1;
+                                }
+                                else
+                                {
+                                        _tt -= _aa2*((_y<<1)-3);
+                                        _st -= _aa4*(--_y);
+                                        _pxb[_pxb.length-1]--;
+                                }
+                        }
+                }
+
+                var ox = -wod, oy = b,
+                _oy = _pxb[0],
+                l = pxl.length,
+                w, h;
+                for(var i = 0; i < l; i++)
+                {
+                        if(typeof _pxb[i] != "undefined")
+                        {
+                                if(_pxb[i] < _oy || pxt[i] < oy)
+                                {
+                                        x = pxl[i];
+                                        this._mkOvQds(cx, cy, x, oy, x-ox, oy-_oy, wod, hod);
+                                        ox = x;
+                                        oy = pxt[i];
+                                        _oy = _pxb[i];
+                                }
+                        }
+                        else
+                        {
+                                x = pxl[i];
+                                this._mkDiv(cx-x, cy-oy, 1, (oy<<1)+hod);
+                                this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
+                                ox = x;
+                                oy = pxt[i];
+                        }
+                }
+                this._mkDiv(cx-a, cy-oy, 1, (oy<<1)+hod);
+                this._mkDiv(cx+ox+wod, cy-oy, 1, (oy<<1)+hod);
+        }
+}
+
+function _mkOvDott(left, top, width, height)
+{
+        var a = (++width)>>1, b = (++height)>>1,
+        wod = width&1, hod = height&1, hodu = hod^1,
+        cx = left+a, cy = top+b,
+        x = 0, y = b,
+        aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+        st = (aa2>>1)*(1-(b<<1)) + bb2,
+        tt = (bb2>>1) - aa2*((b<<1)-1),
+        drw = true;
+        while(y > 0)
+        {
+                if(st < 0)
+                {
+                        st += bb2*((x<<1)+3);
+                        tt += bb4*(++x);
+                }
+                else if(tt < 0)
+                {
+                        st += bb2*((x<<1)+3) - aa4*(y-1);
+                        tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                }
+                else
+                {
+                        tt -= aa2*((y<<1)-3);
+                        st -= aa4*(--y);
+                }
+                if(drw && y >= hodu) this._mkOvQds(cx, cy, x, y, 1, 1, wod, hod);
+                drw = !drw;
+        }
+}
+
+function _mkRect(x, y, w, h)
+{
+        var s = this.stroke;
+        this._mkDiv(x, y, w, s);
+        this._mkDiv(x+w, y, s, h);
+        this._mkDiv(x, y+h, w+s, s);
+        this._mkDiv(x, y+s, s, h-s);
+}
+
+function _mkRectDott(x, y, w, h)
+{
+        this.drawLine(x, y, x+w, y);
+        this.drawLine(x+w, y, x+w, y+h);
+        this.drawLine(x, y+h, x+w, y+h);
+        this.drawLine(x, y, x, y+h);
 }
 
 function jsgFont()
 {
-    this.PLAIN = 'font-weight:normal;';
-    this.BOLD = 'font-weight:bold;';
-    this.ITALIC = 'font-style:italic;';
-    this.ITALIC_BOLD = this.ITALIC + this.BOLD;
-    this.BOLD_ITALIC = this.ITALIC_BOLD;
+        this.PLAIN = 'font-weight:normal;';
+        this.BOLD = 'font-weight:bold;';
+        this.ITALIC = 'font-style:italic;';
+        this.ITALIC_BOLD = this.ITALIC + this.BOLD;
+        this.BOLD_ITALIC = this.ITALIC_BOLD;
 }
 var Font = new jsgFont();
@@ -622 +626 @@
 function jsgStroke()
 {
-    this.DOTTED = -1;
-}
-
+        this.DOTTED = -1;
+}
 var Stroke = new jsgStroke();
 
-function jsGraphics(id, wnd)
-{
-    this.setColor = new Function('arg', 'this.color = arg;');
-
-
+function jsGraphics(cnv, wnd)
+{
+        this.setColor = function(x)
+        {
+                this.color = x.toLowerCase();
+        };
+
+        this.setStroke = function(x)
+        {
+                this.stroke = x;
+                if(!(x+1))
+                {
+                        this.drawLine = _mkLinDott;
+                        this._mkOv = _mkOvDott;
+                        this.drawRect = _mkRectDott;
+                }
+                else if(x-1 > 0)
+                {
+                        this.drawLine = _mkLin2D;
+                        this._mkOv = _mkOv2D;
+                        this.drawRect = _mkRect;
+                }
+                else
+                {
+                        this.drawLine = _mkLin;
+                        this._mkOv = _mkOv;
+                        this.drawRect = _mkRect;
+                }
+        };
+
+        this.setPrintable = function(arg)
+        {
+                this.printable = arg;
+                if(jg_fast)
+                {
+                        this._mkDiv = _mkDivIe;
+                        this._htmRpc = arg? _htmPrtRpc : _htmRpc;
+                }
+                else this._mkDiv = arg? _mkDivPrt : _mkDiv;
+        };
+
+        this.setFont = function(fam, sz, sty)
+        {
+                this.ftFam = fam;
+                this.ftSz = sz;
+                this.ftSty = sty || Font.PLAIN;
+        };
+
+        this.drawPolyline = this.drawPolyLine = function(x, y)
+        {
+                for (var i=x.length - 1; i;)
+                {--i;
+                        this.drawLine(x[i], y[i], x[i+1], y[i+1]);
+                }
+        };
+/************** Xinha added *******************************************/
+        
+        this.setColor = new Function('arg', 'this.color = arg;');
     this.getColor = new Function('return this.color');
 
-    this.setStroke = function(x)
-    {
-        this.stroke = x;
-        if (!(x+1))
-        {
-            this.drawLine = mkLinDott;
-            this.mkOv = mkOvDott;
-            this.drawRect = mkRectDott;
-        }
-        else if (x-1 > 0)
-        {
-            this.drawLine = mkLin2D;
-            this.mkOv = mkOv2D;
-            this.drawRect = mkRect;
-        }
-        else
-        {
-            this.drawLine = mkLin;
-            this.mkOv = mkOv;
-            this.drawRect = mkRect;
-        }
-    };
-
-
-
-    this.setPrintable = function(arg)
-    {
-        this.printable = arg;
-        this.mkDiv = jg_n4? mkLyr : arg? mkDivPrint : mkDiv;
-    };
-
-
-
-    this.setFont = function(fam, sz, sty)
-    {
-        this.ftFam = fam;
-        this.ftSz = sz;
-        this.ftSty = sty || Font.PLAIN;
-    };
-
-
-
-    this.drawPolyline = this.drawPolyLine = function(x, y, s)
-    {
-        var i = x.length-1; while (i >= 0)
-            this.drawLine(x[i], y[i], x[--i], y[i]);
-    };
-
-
-
-    this.fillRect = function(x, y, w, h)
-    {
-        this.mkDiv(x, y, w, h);
-    };
-
-
+        this.fillRect = function(x, y, w, h)
+        {
+                this._mkDiv(x, y, w, h);
+        };
+        
     this.fillRectPattern = function(x, y, w, h, url)
     {
@@ -704 +709 @@
             'z-index:100;"><\/div>';
         //alert(this.htm);
-    }
+    };
 
     this.drawHandle = function(x, y, w, h, cursor)
@@ -718 +723 @@
         "cursor: '" + cursor + "';"+
         '" class="handleBox" id="' + cursor + '" ><\/div>';
-    }
-
-    this.drawHandleBox = function(x, y, w, h, cursor)
+    };
+        
+        this.drawHandleBox = function(x, y, w, h, cursor)
     {
         
@@ -732 +737 @@
         "cursor: '" + cursor + "';"+
         '" class="handleBox" id="' + cursor + '" ><\/div>';
-
-        
-    }
-
-    this.drawPolygon = function(x, y)
-    {
-        this.drawPolyline(x, y);
-        this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
     };
 
-
-
-    this.drawEllipse = this.drawOval = function(x, y, w, h)
-    {
-        this.mkOv(x, y, w, h);
-    };
-
-
-
-    this.fillEllipse = this.fillOval = function(left, top, w, h)
-    {
-        var a = (w -= 1)>>1, b = (h -= 1)>>1,
-        wod = (w&1)+1, hod = (h&1)+1,
-        cx = left+a, cy = top+b,
-        x = 0, y = b,
-        ox = 0, oy = b,
-        aa2 = (a*a)<<1, aa4 = aa2<<1, bb = (b*b)<<1,
-        st = (aa2>>1)*(1-(b<<1)) + bb,
-        tt = (bb>>1) - aa2*((b<<1)-1),
-        pxl, dw, dh;
-        if (w+1) while (y > 0)
-        {
-            if (st < 0)
-            {
-                st += bb*((x<<1)+0x3);
-                tt += (bb<<1)*(++x);
-            }
-            else if (tt < 0)
-            {
-                st += bb*((x<<1)+0x3) - aa4*(y-1);
-                pxl = cx-x;
-                dw = (x<<1)+wod;
-                tt += (bb<<1)*(++x) - aa2*(((y--)<<1)-0x3);
-                dh = oy-y;
-                this.mkDiv(pxl, cy-oy, dw, dh);
-                this.mkDiv(pxl, cy+oy-dh+hod, dw, dh);
-                ox = x;
-                oy = y;
-            }
-            else
-            {
-                tt -= aa2*((y<<1)-0x3);
-                st -= aa4*(--y);
-            }
-        }
-        this.mkDiv(cx-a, cy-oy, w+1, (oy<<1)+hod);
-    };
-
-    this.drawString = mkLbl;
-
-    this.clear = function()
-    {
-        this.htm = "";
-        if (this.cnv) this.cnv.innerHTML = this.defhtm;
-        
-    };
-
-    this.mkOvQds = function(cx, cy, xl, xr, yt, yb, w, h)
-    {
-        this.mkDiv(xr+cx, yt+cy, w, h);
-        this.mkDiv(xr+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yb+cy, w, h);
-        this.mkDiv(xl+cx, yt+cy, w, h);
-    };
-
-    this.setStroke(1);
-    this.setPrintable(false);
-    this.setFont('verdana,geneva,helvetica,sans-serif', String.fromCharCode(0x31, 0x32, 0x70, 0x78), Font.PLAIN);
-    this.color = '#000000';
-    this.htm = '';
-    this.wnd = wnd || window;
-
-    if (!(jg_ie || jg_dom || jg_ihtm)) chkDHTM();
-    if (typeof id != 'string' || !id) this.paint = pntDoc;
-    else
-    {
-        this.cnv = document.all? (this.wnd.document.all[id] || null)
-            : document.getElementById? (this.wnd.document.getElementById(id) || null)
-            : null;
-        this.defhtm = (this.cnv && this.cnv.innerHTML)? this.cnv.innerHTML : '';
-        this.paint = jg_dom? pntCnvDom : jg_ie? pntCnvIe : jg_ihtm? pntCnvIhtm : pntCnv;
-    }
-}
+/************** end Xinha added *******************************************/
+        this.drawPolygon = function(x, y)
+        {
+                this.drawPolyline(x, y);
+                this.drawLine(x[x.length-1], y[x.length-1], x[0], y[0]);
+        };
+
+        this.drawEllipse = this.drawOval = function(x, y, w, h)
+        {
+                this._mkOv(x, y, w, h);
+        };
+
+        this.fillEllipse = this.fillOval = function(left, top, w, h)
+        {
+                var a = w>>1, b = h>>1,
+                wod = w&1, hod = h&1,
+                cx = left+a, cy = top+b,
+                x = 0, y = b, oy = b,
+                aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+                st = (aa2>>1)*(1-(b<<1)) + bb2,
+                tt = (bb2>>1) - aa2*((b<<1)-1),
+                xl, dw, dh;
+                if(w) while(y > 0)
+                {
+                        if(st < 0)
+                        {
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0)
+                        {
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                xl = cx-x;
+                                dw = (x<<1)+wod;
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                dh = oy-y;
+                                this._mkDiv(xl, cy-oy, dw, dh);
+                                this._mkDiv(xl, cy+y+hod, dw, dh);
+                                oy = y;
+                        }
+                        else
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                        }
+                }
+                this._mkDiv(cx-a, cy-oy, w, (oy<<1)+hod);
+        };
+
+        this.fillArc = function(iL, iT, iW, iH, fAngA, fAngZ)
+        {
+                var a = iW>>1, b = iH>>1,
+                iOdds = (iW&1) | ((iH&1) << 16),
+                cx = iL+a, cy = iT+b,
+                x = 0, y = b, ox = x, oy = y,
+                aa2 = (a*a)<<1, aa4 = aa2<<1, bb2 = (b*b)<<1, bb4 = bb2<<1,
+                st = (aa2>>1)*(1-(b<<1)) + bb2,
+                tt = (bb2>>1) - aa2*((b<<1)-1),
+                // Vars for radial boundary lines
+                xEndA, yEndA, xEndZ, yEndZ,
+                iSects = (1 << (Math.floor((fAngA %= 360.0)/180.0) << 3))
+                                | (2 << (Math.floor((fAngZ %= 360.0)/180.0) << 3))
+                                | ((fAngA >= fAngZ) << 16),
+                aBndA = new Array(b+1), aBndZ = new Array(b+1);
+                
+                // Set up radial boundary lines
+                fAngA *= Math.PI/180.0;
+                fAngZ *= Math.PI/180.0;
+                xEndA = cx+Math.round(a*Math.cos(fAngA));
+                yEndA = cy+Math.round(-b*Math.sin(fAngA));
+                _mkLinVirt(aBndA, cx, cy, xEndA, yEndA);
+                xEndZ = cx+Math.round(a*Math.cos(fAngZ));
+                yEndZ = cy+Math.round(-b*Math.sin(fAngZ));
+                _mkLinVirt(aBndZ, cx, cy, xEndZ, yEndZ);
+
+                while(y > 0)
+                {
+                        if(st < 0) // Advance x
+                        {
+                                st += bb2*((x<<1)+3);
+                                tt += bb4*(++x);
+                        }
+                        else if(tt < 0) // Advance x and y
+                        {
+                                st += bb2*((x<<1)+3) - aa4*(y-1);
+                                ox = x;
+                                tt += bb4*(++x) - aa2*(((y--)<<1)-3);
+                                this._mkArcDiv(ox, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+                                oy = y;
+                        }
+                        else // Advance y
+                        {
+                                tt -= aa2*((y<<1)-3);
+                                st -= aa4*(--y);
+                                if(y && (aBndA[y] != aBndA[y-1] || aBndZ[y] != aBndZ[y-1]))
+                                {
+                                        this._mkArcDiv(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+                                        ox = x;
+                                        oy = y;
+                                }
+                        }
+                }
+                this._mkArcDiv(x, 0, oy, cx, cy, iOdds, aBndA, aBndZ, iSects);
+                if(iOdds >> 16) // Odd height
+                {
+                        if(iSects >> 16) // Start-angle > end-angle
+                        {
+                                var xl = (yEndA <= cy || yEndZ > cy)? (cx - x) : cx;
+                                this._mkDiv(xl, cy, x + cx - xl + (iOdds & 0xffff), 1);
+                        }
+                        else if((iSects & 0x01) && yEndZ > cy)
+                                this._mkDiv(cx - x, cy, x, 1);
+                }
+        };
+
+/* fillPolygon method, implemented by Matthieu Haller.
+This javascript function is an adaptation of the gdImageFilledPolygon for Walter Zorn lib.
+C source of GD 1.8.4 found at http://www.boutell.com/gd/
+
+THANKS to Kirsten Schulz for the polygon fixes!
+
+The intersection finding technique of this code could be improved
+by remembering the previous intertersection, and by using the slope.
+That could help to adjust intersections to produce a nice
+interior_extrema. */
+        this.fillPolygon = function(array_x, array_y)
+        {
+                var i;
+                var y;
+                var miny, maxy;
+                var x1, y1;
+                var x2, y2;
+                var ind1, ind2;
+                var ints;
+
+                var n = array_x.length;
+                if(!n) return;
+
+                miny = array_y[0];
+                maxy = array_y[0];
+                for(i = 1; i < n; i++)
+                {
+                        if(array_y[i] < miny)
+                                miny = array_y[i];
+
+                        if(array_y[i] > maxy)
+                                maxy = array_y[i];
+                }
+                for(y = miny; y <= maxy; y++)
+                {
+                        var polyInts = new Array();
+                        ints = 0;
+                        for(i = 0; i < n; i++)
+                        {
+                                if(!i)
+                                {
+                                        ind1 = n-1;
+                                        ind2 = 0;
+                                }
+                                else
+                                {
+                                        ind1 = i-1;
+                                        ind2 = i;
+                                }
+                                y1 = array_y[ind1];
+                                y2 = array_y[ind2];
+                                if(y1 < y2)
+                                {
+                                        x1 = array_x[ind1];
+                                        x2 = array_x[ind2];
+                                }
+                                else if(y1 > y2)
+                                {
+                                        y2 = array_y[ind1];
+                                        y1 = array_y[ind2];
+                                        x2 = array_x[ind1];
+                                        x1 = array_x[ind2];
+                                }
+                                else continue;
+
+                                 //  Modified 11. 2. 2004 Walter Zorn
+                                if((y >= y1) && (y < y2))
+                                        polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
+
+                                else if((y == maxy) && (y > y1) && (y <= y2))
+                                        polyInts[ints++] = Math.round((y-y1) * (x2-x1) / (y2-y1) + x1);
+                        }
+                        polyInts.sort(_CompInt);
+                        for(i = 0; i < ints; i+=2)
+                                this._mkDiv(polyInts[i], y, polyInts[i+1]-polyInts[i]+1, 1);
+                }
+        };
+
+        this.drawString = function(txt, x, y)
+        {
+                this.htm += '<div style="position:absolute;white-space:nowrap;'+
+                        'left:' + x + 'px;'+
+                        'top:' + y + 'px;'+
+                        'font-family:' +  this.ftFam + ';'+
+                        'font-size:' + this.ftSz + ';'+
+                        'color:' + this.color + ';' + this.ftSty + '">'+
+                        txt +
+                        '<\/div>';
+        };
+
+/* drawStringRect() added by Rick Blommers.
+Allows to specify the size of the text rectangle and to align the
+text both horizontally (e.g. right) and vertically within that rectangle */
+        this.drawStringRect = function(txt, x, y, width, halign)
+        {
+                this.htm += '<div style="position:absolute;overflow:hidden;'+
+                        'left:' + x + 'px;'+
+                        'top:' + y + 'px;'+
+                        'width:'+width +'px;'+
+                        'text-align:'+halign+';'+
+                        'font-family:' +  this.ftFam + ';'+
+                        'font-size:' + this.ftSz + ';'+
+                        'color:' + this.color + ';' + this.ftSty + '">'+
+                        txt +
+                        '<\/div>';
+        };
+
+        this.drawImage = function(imgSrc, x, y, w, h, a)
+        {
+                this.htm += '<div style="position:absolute;'+
+                        'left:' + x + 'px;'+
+                        'top:' + y + 'px;'+
+                        'width:' +  w + 'px;'+
+                        'height:' + h + 'px;">'+
+                        '<img src="' + imgSrc + '" width="' + w + '" height="' + h + '"' + (a? (' '+a) : '') + '>'+
+                        '<\/div>';
+        };
+
+        this.clear = function()
+        {
+                this.htm = "";
+                if(this.cnv) this.cnv.innerHTML = "";
+        };
+
+        this._mkOvQds = function(cx, cy, x, y, w, h, wod, hod)
+        {
+                var xl = cx - x, xr = cx + x + wod - w, yt = cy - y, yb = cy + y + hod - h;
+                if(xr > xl+w)
+                {
+                        this._mkDiv(xr, yt, w, h);
+                        this._mkDiv(xr, yb, w, h);
+                }
+                else
+                        w = xr - xl + w;
+                this._mkDiv(xl, yt, w, h);
+                this._mkDiv(xl, yb, w, h);
+        };
+        
+        this._mkArcDiv = function(x, y, oy, cx, cy, iOdds, aBndA, aBndZ, iSects)
+        {
+                var xrDef = cx + x + (iOdds & 0xffff), y2, h = oy - y, xl, xr, w;
+
+                if(!h) h = 1;
+                x = cx - x;
+
+                if(iSects & 0xff0000) // Start-angle > end-angle
+                {
+                        y2 = cy - y - h;
+                        if(iSects & 0x00ff)
+                        {
+                                if(iSects & 0x02)
+                                {
+                                        xl = Math.max(x, aBndZ[y]);
+                                        w = xrDef - xl;
+                                        if(w > 0) this._mkDiv(xl, y2, w, h);
+                                }
+                                if(iSects & 0x01)
+                                {
+                                        xr = Math.min(xrDef, aBndA[y]);
+                                        w = xr - x;
+                                        if(w > 0) this._mkDiv(x, y2, w, h);
+                                }
+                        }
+                        else
+                                this._mkDiv(x, y2, xrDef - x, h);
+                        y2 = cy + y + (iOdds >> 16);
+                        if(iSects & 0xff00)
+                        {
+                                if(iSects & 0x0100)
+                                {
+                                        xl = Math.max(x, aBndA[y]);
+                                        w = xrDef - xl;
+                                        if(w > 0) this._mkDiv(xl, y2, w, h);
+                                }
+                                if(iSects & 0x0200)
+                                {
+                                        xr = Math.min(xrDef, aBndZ[y]);
+                                        w = xr - x;
+                                        if(w > 0) this._mkDiv(x, y2, w, h);
+                                }
+                        }
+                        else
+                                this._mkDiv(x, y2, xrDef - x, h);
+                }
+                else
+                {
+                        if(iSects & 0x00ff)
+                        {
+                                if(iSects & 0x02)
+                                        xl = Math.max(x, aBndZ[y]);
+                                else
+                                        xl = x;
+                                if(iSects & 0x01)
+                                        xr = Math.min(xrDef, aBndA[y]);
+                                else
+                                        xr = xrDef;
+                                y2 = cy - y - h;
+                                w = xr - xl;
+                                if(w > 0) this._mkDiv(xl, y2, w, h);
+                        }
+                        if(iSects & 0xff00)
+                        {
+                                if(iSects & 0x0100)
+                                        xl = Math.max(x, aBndA[y]);
+                                else
+                                        xl = x;
+                                if(iSects & 0x0200)
+                                        xr = Math.min(xrDef, aBndZ[y]);
+                                else
+                                        xr = xrDef;
+                                y2 = cy + y + (iOdds >> 16);
+                                w = xr - xl;
+                                if(w > 0) this._mkDiv(xl, y2, w, h);
+                        }
+                }
+        };
+
+        this.setStroke(1);
+        this.setFont("verdana,geneva,helvetica,sans-serif", "12px", Font.PLAIN);
+        this.color = "#000000";
+        this.htm = "";
+        this.wnd = wnd || window;
+
+        if(!jg_ok) _chkDHTM();
+        if(jg_ok)
+        {
+                if(cnv)
+                {
+                        if(typeof(cnv) == "string")
+                                this.cont = document.all? (this.wnd.document.all[cnv] || null)
+                                        : document.getElementById? (this.wnd.document.getElementById(cnv) || null)
+                                        : null;
+                        else if(cnv == window.document)
+                                this.cont = document.getElementsByTagName("body")[0];
+                        // If cnv is a direct reference to a canvas DOM node
+                        // (option suggested by Andreas Luleich)
+                        else this.cont = cnv;
+                        // Create new canvas inside container DIV. Thus the drawing and clearing
+                        // methods won't interfere with the container's inner html.
+                        // Solution suggested by Vladimir.
+                        this.cnv = this.wnd.document.createElement("div");
+                        this.cnv.style.fontSize=0;
+                        this.cont.appendChild(this.cnv);
+                        this.paint = jg_dom? _pntCnvDom : _pntCnvIe;
+                }
+                else
+                        this.paint = _pntDoc;
+        }
+        else
+                this.paint = _pntN;
+
+        this.setPrintable(false);
+}
+
+function _mkLinVirt(aLin, x1, y1, x2, y2)
+{
+        var dx = Math.abs(x2-x1), dy = Math.abs(y2-y1),
+        x = x1, y = y1,
+        xIncr = (x1 > x2)? -1 : 1,
+        yIncr = (y1 > y2)? -1 : 1,
+        p,
+        i = 0;
+        if(dx >= dy)
+        {
+                var pr = dy<<1,
+                pru = pr - (dx<<1);
+                p = pr-dx;
+                while(dx > 0)
+                {--dx;
+                        if(p > 0)    //  Increment y
+                        {
+                                aLin[i++] = x;
+                                y += yIncr;
+                                p += pru;
+                        }
+                        else p += pr;
+                        x += xIncr;
+                }
+        }
+        else
+        {
+                var pr = dx<<1,
+                pru = pr - (dy<<1);
+                p = pr-dy;
+                while(dy > 0)
+                {--dy;
+                        y += yIncr;
+                        aLin[i++] = x;
+                        if(p > 0)    //  Increment x
+                        {
+                                x += xIncr;
+                                p += pru;
+                        }
+                        else p += pr;
+                }
+        }
+        for(var len = aLin.length, i = len-i; i;)
+                aLin[len-(i--)] = x;
+};
+
+function _CompInt(x, y)
+{
+        return(x - y);
+}
+

branches/ray/plugins/ExtendedFileManager/config.inc.php

@@ -26 +26 @@
  */
 
-if(empty($insertMode))
-    $insertMode="image";
+if(isset($_REQUEST['mode'])) $insertMode=$_REQUEST['mode'];
+        if(!isset($insertMode)) $insertMode="image";
 
 /**
@@ -65 +65 @@
 /*
  The URL to the above path, the web browser needs to be able to see it.
- It can be protected via .htaccess on apache or directory permissions on IIS,
- check you web server documentation for futher information on directory protection
- If this directory needs to be publicly accessiable, remove scripting capabilities
- for this directory (i.e. disable PHP, Perl, CGI). We only want to store assets
- in this directory and its subdirectories.
+ Please remove scripting capabilities in this directory
+ for this directory (i.e. disable PHP, Perl, CGI; see .htaccess file in demo_images folder).
 */
 $IMConfig['images_url'] = str_replace( array("backend.php","manager.php"), "", $_SERVER["PHP_SELF"] ) . $IMConfig['images_dir'];
 //$IMConfig['files_url'] = 'url/to/files_dir';
 
+/*
+  Format of the Date Modified in list view.
+  It has to be a string understood by the PHP date() function (for possible values see http://http://php.net/manual/en/function.date.php)
+*/
+$IMConfig['date_format'] = "d.m.y H:i";
 /*
   Possible values: true, false
@@ -123 +125 @@
  GD does not require the following definition.
 */
-define('IMAGE_TRANSFORM_LIB_PATH', 'C:/"Program Files"/ImageMagick-5.5.7-Q16/');
+define('IMAGE_TRANSFORM_LIB_PATH', '/usr/bin/');
+//define('IMAGE_TRANSFORM_LIB_PATH', 'C:/"Program Files"/ImageMagick-5.5.7-Q16/');
 
 
@@ -288 +291 @@
   "max"  - the maximum allowed by the server (the value is retrieved from the server configuration).
 */
-$IMConfig['max_filesize_kb_image'] = 2000000;
+$IMConfig['max_filesize_kb_image'] = 200;
 
 $IMConfig['max_filesize_kb_link'] = 5000;

branches/ray/plugins/ExtendedFileManager/editorFrame.php

@@ -5 +5 @@
  * Version: Updated on 08-01-2005 by Afru
  * Version: Updated on 21-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  * http://www.afrusoft.com/htmlarea
  */
@@ -38 +39 @@
 
         var mode = "<?php echo $editor->getAction(); ?>" //crop, scale, measure
-
-var currentImageFile = "<?php if(count($imageInfo)>0) echo rawurlencode($imageInfo['file']); ?>";
+        var currentImageFile = "<?php if(count($imageInfo)>0) echo rawurlencode($imageInfo['file']); ?>";
+        var fileSize = "<?php echo (round($imageInfo['filesize'] / 1024,1)).' KB' ?>";
+        
 
 <?php if ($editor->isFileSaved() == 1) { ?>

branches/ray/plugins/ExtendedFileManager/extended-file-manager.js

@@ -1 +1 @@
 /**
  * ExtendedFileManager extended-file-manager.js file.
- * Authors: Wei Zhuo, Afru
+ * Authors: Wei Zhuo, Afru, Krzysztof Kotowicz, Raimund Meyer
  * Modified by: Krzysztof Kotowicz <koto@webworkers.pl>
  * Version: Updated on 08-01-2005 by Afru
  * Version: Modified on 20-06-2006 by Krzysztof Kotowicz
- * Package: ExtendedFileManager (EFM 1.1.1)
- * http://www.afrusoft.com/htmlarea
+ * Version: Updated on 29-10-2006 by Raimund Meyer
+ * Version: Updated on 20-01-2008 by Raimund Meyer
+ * Package: ExtendedFileManager (EFM 1.4)
  */
 
@@ -35 +36 @@
         cfg.addToolbarElement("linkfile", "createlink", 1);
         };
-    }
+
+    var manager = editor.config.ExtendedFileManager.backend + '__function=manager';
+    if(cfg.ExtendedFileManager.backend_config != null)
+    {
+      manager += '&backend_config='
+        + encodeURIComponent(cfg.ExtendedFileManager.backend_config);
+      manager += '&backend_config_hash='
+        + encodeURIComponent(cfg.ExtendedFileManager.backend_config_hash);
+      manager += '&backend_config_secret_key_location='
+        + encodeURIComponent(cfg.ExtendedFileManager.backend_config_secret_key_location);
+    }
+
+    if(cfg.ExtendedFileManager.backend_data != null)
+    {
+        for ( var i in cfg.ExtendedFileManager.backend_data )
+        {
+            manager += '&' + i + '=' + encodeURIComponent(cfg.ExtendedFileManager.backend_data[i]);
+        }
+    }
+    cfg.ExtendedFileManager.manager = manager;
+}
 
 ExtendedFileManager._pluginInfo = {
     name          : "ExtendedFileManager",
-    version       : "1.1.1",
-    developer     : "Afru, Krzysztof Kotowicz",
-    developer_url : "http://www.afrusoft.com/htmlarea/",
+    version       : "1.4",
+    developer     : "Afru, Krzysztof Kotowicz, Raimund Meyer",
+    developer_url : "http://xinha.org",
     license       : "htmlArea"
 };
@@ -97 +118 @@
 
     }
-
-    var manager = editor.config.ExtendedFileManager.backend + '__function=manager';
-    if(editor.config.ExtendedFileManager.backend_config != null)
-    {
-      manager += '&backend_config='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config);
-      manager += '&backend_config_hash='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_hash);
-      manager += '&backend_config_secret_key_location='
-        + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_secret_key_location);
-    }
-
-    if(editor.config.ExtendedFileManager.backend_data != null)
-    {
-        for ( var i in editor.config.ExtendedFileManager.backend_data )
-        {
-            manager += '&' + i + '=' + encodeURIComponent(editor.config.ExtendedFileManager.backend_data[i]);
-        }
-    }
-
-    Dialog(manager, function(param){
+    Dialog(this.config.ExtendedFileManager.manager, function(param){
         if (!param)
         {   // user must have pressed Cancel
@@ -247 +248 @@
         };
 
-    var manager = _editor_url + 'plugins/ExtendedFileManager/manager.php?mode=link';
-    if(editor.config.ExtendedFileManager.backend_config != null)
-    {
-       manager += '&backend_config='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config);
-       manager += '&backend_config_hash='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_hash);
-       manager += '&backend_config_secret_key_location='
-               + encodeURIComponent(editor.config.ExtendedFileManager.backend_config_secret_key_location);
-    }
-
-    if(editor.config.ExtendedFileManager.backend_data != null)
-    {
-        for ( var i in editor.config.ExtendedFileManager.backend_data )
-        {
-            manager += '&' + i + '=' + encodeURIComponent(editor.config.ExtendedFileManager.backend_data[i]);
-        }
-    }
-
-
-    Dialog(manager, function(param){
+    Dialog(this.config.ExtendedFileManager.manager+'&mode=link', function(param){
         if (!param)
             return false;
@@ -304 +285 @@
         editor.updateToolbar();
     }, outparam);
-
 };
 

branches/ray/plugins/ExtendedFileManager/images.php

@@ -6 +6 @@
  * Version: Updated on 04-07-2006 by Krzysztof Kotowicz
  * Version: Updated on 29-10-2006 by Raimund Meyer
- * Package: ExtendedFileManager (EFM 1.1.3)
+ * Version: Updated on 20-01-2008 by Raimund Meyer