Changeset 911

Timestamp:

10/22/07 19:22:22 (6 years ago)

Author:

ray

Message:

uupdate branch with changes from trunk

Location:

branches/ray

Files:

• XinhaCore.js (modified) (3 diffs)
• contrib/compress.php (modified) (3 diffs)
• examples/Extended.html (modified) (1 diff)
• examples/ext_example-menu.php (modified) (1 diff)
• modules/ColorPicker/ColorPicker.js (modified) (3 diffs)
• modules/Gecko/Gecko.js (modified) (6 diffs)
• modules/GetHtml/TransformInnerHTML.js (modified) (2 diffs)
• modules/InsertImage/insert_image.js (modified) (2 diffs)
• modules/InternetExplorer/InternetExplorer.js (modified) (3 diffs)
• plugins/SaveSubmit/save-submit.js (modified) (1 diff)
• popups/about.html (modified) (2 diffs)
• release-notes.txt (modified) (1 diff)

branches/ray/XinhaCore.js

@@ -1 +1 @@
  
   /*--------------------------------------:noTabs=true:tabSize=2:indentSize=2:--
-    --  Xinha (is not htmlArea) - http://xinha.gogo.co.nz/
+    --  Xinha (is not htmlArea) - http://xinha.org
     --
     --  Use of Xinha is granted by the terms of the htmlArea License (based on
     --  BSD license)  please read license.txt in this package for details.
     --
+    --  Copyright (c) 2005-2007 Xinha Developer Team and contributors
+    --  
     --  Xinha was originally based on work by Mihai Bazon which is:
     --      Copyright (c) 2003-2004 dynarch.com.
@@ -4848 +4850 @@
   
   // remove disabling of inline event handle inside Xinha iframe
-  html = html.replace(/(<[^>]*onclick=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
-  html = html.replace(/(<[^>]*onmouseover=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
-  html = html.replace(/(<[^>]*onmouseout=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
-  html = html.replace(/(<[^>]*onmousedown=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
-  html = html.replace(/(<[^>]*onmouseup=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
-
+  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=['"])if\(window\.top &amp;&amp; window\.top\.Xinha\)\{return false\}/gi,'$1');
 
   // Figure out what our server name is, and how it's referenced
@@ -4914 +4911 @@
 
   // disable inline event handle inside Xinha iframe
-  html = html.replace(/(<[^>]*onclick=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
-  html = html.replace(/(<[^>]*onmouseover=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
-  html = html.replace(/(<[^>]*onmouseout=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
-  html = html.replace(/(<[^>]*onmouseodown=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
-  html = html.replace(/(<[^>]*onmouseup=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
+  html = html.replace(/(<[^>]*on(click|mouse(over|out|up|down))=["'])/gi,'$1if(window.top &amp;&amp; window.top.Xinha){return false}');
   
   html = this.inwardSpecialReplacements(html);

branches/ray/contrib/compress.php

@@ -28 +28 @@
                         $url  = $durl . '/' . $file;
 
-                        if(preg_match("/.svn|lang/",$path)) continue;
+                        if(preg_match("/\.svn|lang/",$path)) continue;
                         
                         if(is_dir($path))
@@ -49 +49 @@
 $cwd = getcwd();
 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 */";
+$core_prefix = '
+  /*--------------------------------------------------------------------------
+    --  Xinha (is not htmlArea) - http://xinha.org
+    --
+    --  Use of Xinha is granted by the terms of the htmlArea License (based on
+    --  BSD license)  please read license.txt in this package for details.
+    --
+    --  Copyright (c) 2005-2007 Xinha Developer Team and contributors
+    --  
+    --  Xinha was originally based on work by Mihai Bazon which is:
+    --      Copyright (c) 2003-2004 dynarch.com.
+    --      Copyright (c) 2002-2003 interactivetools.com, inc.
+    --      This copyright notice MUST stay intact for use.
+    -------------------------------------------------------------------------*/
+';
 foreach ($return as $file)
 {
@@ -55 +72 @@
         flush();
         copy($file,$file."_uncompr.js");
-        exec("java -jar ${cwd}/dojo_js_compressor.jar -c ${file}_uncompr.js > $file 2>&1");
+
+        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");
         if (preg_match('/js: ".*?", line \d+:/',file_get_contents($file)))
         {

branches/ray/examples/Extended.html

@@ -1 @@
-<html>
+<html>
 
 <head>

branches/ray/examples/ext_example-menu.php

@@ -1 @@
-<?PHP
+<?php
   $LocalPluginPath = dirname(dirname(__FILE__)).DIRECTORY_SEPARATOR.'plugins';
   $LocalSkinPath = dirname(dirname(__File__)).DIRECTORY_SEPARATOR.'skins';

branches/ray/modules/ColorPicker/ColorPicker.js

@@ -687 +687 @@
         but.style.cursor = 'pointer';
         but.onclick = function() { Xinha.colorPicker.remember(picker.chosenColor.value, picker.savecolors); picker.callback(picker.chosenColor.value); picker.close(); };
-        but.appendChild(document.createTextNode('OK'));
+        but.appendChild(document.createTextNode(Xinha._lc('OK')));
         but.align = 'center';
         div.appendChild(but);
@@ -804 +804 @@
       @*/
     };
-  }
+} // end Xinha.colorPicker
 
 // array of the saved colors
@@ -847 +847 @@
 };
 
-Xinha.colorPicker._lc = function(string) {
-  return Xinha._lc(string);
-}
 
 

branches/ray/modules/Gecko/Gecko.js

@@ -167 +167 @@
           if (RE_date.test(matchData))
           {
-            if (!RE_ip.test(matchData)) 
+            break; //ray: disabling linking of IP numbers because of general bugginess (see Ticket #1085)
+            /*if (!RE_ip.test(matchData)) 
             {
               break;
-            }
+            }*/
           } 
           var leftTextUrl  = s.anchorNode;
@@ -255 +256 @@
 
             var m = s.anchorNode.data.match(Xinha.RE_url);
-            if ( m && a.href.match(s.anchorNode.data.trim()) )
+
+            if ( m && a.href.match(new RegExp( 'http(s)?://' + Xinha.escapeStringForRegExp( s.anchorNode.data.trim() ) ) ) )
             {
               var txtNode = s.anchorNode;
@@ -261 +263 @@
               {
                 // Sometimes m is undefined becase the url is not an url anymore (was www.url.com and become for example www.url)
+                // ray: shouldn't the link be un-linked then?
                 m = txtNode.data.match(Xinha.RE_url);
                 if(m)
@@ -373 +376 @@
 Gecko.prototype.onMouseDown = function(ev)
 {   
-        // Gecko doesn't select hr's on single click
-        if (ev.target.tagName.toLowerCase() == "hr")
-        {
-          var sel = this.editor.getSelection();
-          var range = this.editor.createRange(sel);
-          range.selectNode(ev.target);
-        }
+  // Gecko doesn't select hr's on single click
+  if (ev.target.tagName.toLowerCase() == "hr")
+  {
+    var sel = this.editor.getSelection();
+    var range = this.editor.createRange(sel);
+    range.selectNode(ev.target);
+  }
 }
 
@@ -693 +696 @@
 Xinha.prototype.setCC = function ( target )
 {
+  var cc = this.cc;
   try
   {
@@ -702 +706 @@
       var after = ta.value.substring( index, ta.value.length );
 
-      if ( after.match(/^[^<]*>/) )
+      if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
       {
         var tagEnd = after.indexOf(">") + 1;
-        ta.value = before + after.substring( 0, tagEnd ) + this.cc + after.substring( tagEnd, after.length );
-      }
-      else ta.value = before + this.cc + after;
+        ta.value = before + after.substring( 0, tagEnd ) + cc + after.substring( tagEnd, after.length );
+      }
+      else ta.value = before + cc + after;
+      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");
     }
     else
     {
       var sel = this.getSelection();
-      sel.getRangeAt(0).insertNode( document.createTextNode( this.cc ) );
+      sel.getRangeAt(0).insertNode( document.createTextNode( cc ) );
     }
   } catch (e) {}

branches/ray/modules/GetHtml/TransformInnerHTML.js

@@ -41 +41 @@
 /*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(/&(?=[^<]*>)/g),//expand query ampersands
+/*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
@@ -77 +77 @@
                 replace(c[4], '<$1$2 />').//terminate singlet tags
                 replace(c[6], '$1$2').//check quote nesting
-        //      replace(c[7], '&amp;').//expand query ampersands
+                replace(c[7], '&amp;').//expand query ampersands
                 replace(c[8], '<').//strip tagstart whitespace
                 replace(c[10], ' ');//trim extra whitespace

branches/ray/modules/InsertImage/insert_image.js

@@ -12 +12 @@
     --  This is the Xinha standard implementation of an image insertion plugin
     --
-    --  The file is loaded by the Xinha Core when no alternative method (plugin) is loaded.
+    --  he file is loaded as a special plugin by the Xinha Core when no alternative method (plugin) is loaded.
     --
     --
-    --  $HeadURL$
-    --  $LastChangedDate$
-    --  $LastChangedRevision$
-    --  $LastChangedBy$
+    --  $HeadURL: http://svn.xinha.python-hosting.com/branches/ray/modules/InsertImage/InsertImage.js $
+    --  $LastChangedDate: 2007-03-19 17:27:42 +0100 (Mo, 19 Mrz 2007) $
+    --  $LastChangedRevision: 791 $
+    --  $LastChangedBy: ray $
     --------------------------------------------------------------------------*/
   
@@ -24 +24 @@
   name          : "InsertImage",
   origin        : "Xinha Core",
-  version       : "$LastChangedRevision$".replace(/^[^:]*: (.*) \$$/, '$1'),
+  version       : "$LastChangedRevision: 791 $".replace(/^[^:]*: (.*) \$$/, '$1'),
   developer     : "The Xinha Core Developer Team",
-  developer_url : "$HeadURL$".replace(/^[^:]*: (.*) \$$/, '$1'),
+  developer_url : "$HeadURL: http://svn.xinha.python-hosting.com/branches/ray/modules/InsertImage/InsertImage.js $".replace(/^[^:]*: (.*) \$$/, '$1'),
   sponsor       : "",
   sponsor_url   : "",

branches/ray/modules/InternetExplorer/InternetExplorer.js

@@ -436 +436 @@
 Xinha.prototype.setCC = function ( target )
 {
+  var cc = this.cc;
   if ( target == "textarea" )
   {
@@ -441 +442 @@
     var pos = document.selection.createRange();
     pos.collapse();
-    pos.text = this.cc;
-    var index = ta.value.indexOf( this.cc );
+    pos.text = cc;
+    var index = ta.value.indexOf( cc );
     var before = ta.value.substring( 0, index );
-    var after  = ta.value.substring( index + this.cc.length , ta.value.length );
+    var after  = ta.value.substring( index + cc.length , ta.value.length );
     
-    if ( after.match(/^[^<]*>/) )
+    if ( after.match(/^[^<]*>/) ) // make sure cursor is in an editable area (outside tags, script blocks, and inside the body)
     {
       var tagEnd = after.indexOf(">") + 1;
-      ta.value = before + after.substring( 0, tagEnd ) + this.cc + after.substring( tagEnd, after.length );
-    }
-    else ta.value = before + this.cc + after;
+      ta.value = before + after.substring( 0, tagEnd ) + cc + after.substring( tagEnd, after.length );
+    }
+    else ta.value = before + cc + after;
+    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");
   }
   else
@@ -460 +463 @@
     {
       var control = r.item(0);
-      control.outerHTML += this.cc;
+      control.outerHTML += cc;
     }
     else
     {
       r.collapse();
-      r.text = this.cc;
+      r.text = cc;
     }
   }

branches/ray/plugins/SaveSubmit/save-submit.js

@@ -95 +95 @@
         form.onsubmit();
 
-        var content ='';
-
+        var name, value, content ='';
+        
         for (var i=0;i<form.elements.length;i++)
         {
+                if (( form.elements[i].type == 'checkbox' || form.elements[i].type == 'radio' ) && !form.elements[i].checked ) continue;
+
                 content += ((i>0) ? '&' : '') + form.elements[i].name + '=' + encodeURIComponent(form.elements[i].value);
         }

branches/ray/popups/about.html

@@ -20 +20 @@
 <script type="text/javascript" src="popup.js"></script>
 <script type="text/javascript">
-window.resizeTo(450, 250);
+window.resizeTo(450, 365);
 var TABS = [];
 var CURRENT_TAB = 0;
@@ -199 +199 @@
    Use of Xinha is granted by the terms of the htmlArea License (based on BSD license)
   </p>
+ <pre>
+Copyright (c) 2005-2007 Xinha Developer Team and contributors
+        </pre>
   <p>
     Xinha was originally based on work by Mihai Bazon which is:
   </p>
-  <blockquote><pre>Copyright (c) 2003-2004 dynarch.com.
-    Copyright (c) 2002-2003 interactivetools.com, inc.
-    This copyright notice MUST stay intact for use.</pre></blockquote>
-
+  <pre>
+Copyright (c) 2003-2004 dynarch.com.
+Copyright (c) 2002-2003 interactivetools.com, inc.
+This copyright notice MUST stay intact for use.
+  </pre>
 </div>
 

branches/ray/release-notes.txt

@@ -5 +5 @@
 
 Release History
+
+Xinha 0.94
+ * Ticket #1093 [InsertSmiley] remove smiley gifs from trunk
+ * fixed Ticket #1019 Cusor not jumping to editable part of window when clicked in IE
+ * [TableOperations] Add config option to not dispaly toolbar buttons
+ * fixed Ticket #1021  Prevent ExtendedFileManager from masking ImageManager
+ * fixed Ticket #1023 [ImageManager] Add config item to allow the advanced image options to be hidden from the user
+ * fixed Ticket #1026 fix problems with loading skins
+ * fixed Tickets #1030 & #1031: slow loading large pages in IE
+ * fixed Ticket #1034 [ExtendedFileManager] Color pickers shown when use_color_pickers is false
+ * fixed Ticket #1035 [TransformInnerHTML] tags corruptedunder certain circumstances
+ * fixed Ticket #1036 [ExtendedFileManager] window is only resized after all thumbnails have benn loaded, which can take quite some time
+ * fixed Ticket #1039 Firefox full page adds multiple paragraphs after view source
+ * fixed Ticket #1019 Cusor not jumping to editable part of window when clicked in IE7
+ * fixed Ticket #1046 Error in IE 6 when switching from text to wysiwyg
+ * [DOMwalk] linebreaks inserted before <br />s
+ * catch error in IE when trying to restore selection on non-displayed area
+ * fixed Ticket #973 Error switching wysiwyg/html including javascript file on the code
+ * fixed Ticket #1028  - [Linker] automatically (attempt to) work around an issue with mod_security being triggered because of the charset on our POST requests
+ * fixed Ticket #1055 [Stylist] Inappropriate styles (for other tags) are shown
+ * added Dutch language files
+ * added new hook 'onBeforeSubmit' for firePluginEvent()
+ * added new hook 'onBeforeUnload' for firePluginEvent()
+ * fixed Ticket #1048 Full Screen plugin doesn't load if many editors on page
+ * fixed Ticket #1053 ListType plugin doesn't work in panel config with multiple editors
+ * fixed Ticket #1026 Skins referenced with <link>-tags don't work anymore
+ * fixed Ticket #1059 [Equation] loosing formula onsubmit
+ * fixed Ticket #1060 [Equation] various updates
+ * [Equation] preserve formula on reload in Mozilla
+ * [Equation] updated ASCIIMathML.js
+ * [Skin:silva] padding and border on textarea make the textmode too wide 
+ * fixed Ticket#1001 Editor loads a bunch of null urls in ie
+ * fixed Ticket #1068 [TranformInnerHTML] newlines added after </script>
+ * fixed Ticket#1069 Editor document URL prefixed to any href that only consists of URL parameters
+ * added Thai translation for core
+ * added complete Portuguese Brazilian translation
+ * updated lc_parse script
+ * fixed Ticket #1071 [ExtendedFileManager] external image URL image inserted with width/height 0, amking it invisible
+ * fixed Ticket #1074 [SuperClean] throws warnings in PHP 5
+ * fixed Ticket #1079 [DynamicCSS] lists Xinha internal CSS
+ * fixed Ticket #1080 Some plugins leave behind stylesheet links in fullpage mode
+ * fixed Ticket #1083 Convert URLs to links - Error
+ * fixed Ticket #1084 URL auto-linking (Gecko): URLs with user:password@domain.tld falsely recognized as email address
+ * fixed Ticket #1085 URL auto-linking (Gecko): IP numbers don't work
+ * fixed Ticket #1081 Control character is not being removed inside SCRIPT tags or HEAD when switching from textmode to htmlmode
+ * fixed Ticket #1078 [InsertImage] spacing attributes: inconsistent behaviour when editing image
+ * fixed Ticket #1089 [Color Picker] Localize OK Label
+ * fixed Ticket #1091 [SaveSubmit] does not correctly submit value of checkboxes and radio buttons
+
+Xinha 0.93
+ - fixed Ticket #967 Font Color Picker stops working after using one of ImageManager, ExtendedFileManager, FullPage, or HorizontalRule
+ - fixed Ticket #965 When switching between Xinhas in the same page, in textmode toolbar stays disabled
+ - fixwd Ticket #963 DOMwalk IE: head tag attributes without quotes and closing slash
+ - Ticket #962 DOMwalk Mozilla: improved source indentation
+ - fixed Ticket #957 If item in in xinha_editors is not a textarea: skip gracefully
+ - fixed Ticket #900: catch an fatal error that occured sometimes when switching between modes in fullpage mode in Mozilla
+ - fixed Ticket #969 DOMwalk Gecko: line breaks rendered as <br>s inside <pre> blocks
+ - fixed Ticket #976 Loading message misplaced in IE7
+ - fixed Ticket #977 TableOperations toolbar off-place in ext_example.html
+ - fixed Ticket #978 defining a padding for <td>s in global css affects Xinha framework
+ - Ticket #979 improve checking for non-supported browsers
+ - fixed Ticket #934 SuperClean plugin returns just quotation when executed on localhost
+ - Ticket #929 Save changes on page unload fixed for Mozilla 
+ - fixed Ticket #980 ImageManager color format bug
+ - fixed Ticket #981 No doctype in iframe content document/ editor always in quirks mode
+ - fixed Ticket #543 Stylist Panel overflow broken
+ - Ticket #983 added id for iframe
+ - fixed Ticket #984 !ExtendedFileManager produces php warning
+ - optimized icon file size
+ - fixed !JavaScript error in !ImageManager/!ExtendedFileManager image editor
+ - Ticket #908* Prompts broken in IE7: fixed for EFM, !ImageManager & !TableOperations
+ - Fixes for TableOperations, tickets #82, #908*, #912 and #947
+ - fixed Ticket #998* whitespace added before and/or after content (in non-fullpage mode)
+ - fixed slow unloading in Mozilla
+ - Fix focus problem when switching from html to wysiwyg in Gecko. See ticket #900.
+ - fixed toolbar floating issue
+ - fixed #1003 HTML length limited to 1024 characters with plugin CharCounter
+ - Ticket #1000 new public methods for getting/setting editor content
+ - fixed #735 - IE eating scripts and comments at the beginning of pages.
+ - Added new config variables to set iframe width if less than editor width (ticket:322) and set alignment of toolbar buttons.
+ - added Basque translation for XinhaCore
+ - prevent an error if server is set to parse .js files as PHP
+ - Ticket #127 plugin HtmlEntities: Entities.js  file corrupt
 
 Xinha 0.92beta