Changeset 961

Timestamp:

02/02/08 18:30:42 (5 years ago)

Author:

ray

Message:

#1143 add Safari support

Location:

trunk

Files:

• XinhaCore.js (modified) (12 diffs)
• XinhaLoader.js (modified) (3 diffs)
• modules/FullScreen/full-screen.js (modified) (1 diff)
• modules/Gecko/lang (deleted)
• modules/GetHtml/DOMwalk.js (modified) (2 diffs)
• modules/GetHtml/TransformInnerHTML.js (modified) (1 diff)
• modules/WebKit (added)
• modules/WebKit/WebKit.js (added)
• plugins/SmartReplace/smart-replace.js (modified) (5 diffs)
• skins/silva/skin.css (modified) (1 diff)

trunk/XinhaCore.js

@@ -139 +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 
@@ -155 +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);
 /** File is opened locally opened ("file://" protocol)
  * @type string
@@ -2037 +2042 @@
     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';
@@ -2856 +2871 @@
     } 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;
@@ -4427 +4442 @@
      editor._doc.execCommand('useCSS', false, false); // useCSS deprecated & replaced by styleWithCSS 
      editor._doc.execCommand('styleWithCSS', false, true); 
-     
+
     } catch (ex) {}
-  }
+    }
   
   var btn = editor._toolbarObjects[cmdID].element;
@@ -4580 +4595 @@
     case 'justifyleft'  :
     case 'justifyright' :
-    {
       cmdID.match(/^justify(.*)$/);
       var ae = this.activeElement(this.getSelection());      
@@ -4591 +4605 @@
         this._doc.execCommand(cmdID, UI, param);
       }
-    }    
     break;
     
@@ -5089 +5102 @@
 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
  *  
@@ -5101 +5120 @@
     return null;
   }
-
-  var newObj = {};
-
-  // check for array objects
-  if ( obj.constructor.toString().match( /\s*function Array\(/ ) )
-  {
-    newObj = obj.constructor();
-  }
+  var newObj = (obj.isArray ) ? [] : {};
 
   // check for function and RegExp objects (as usual, IE is fucked up)
-  if ( obj.constructor.toString().match( /\s*function Function\(/ ) )
+  if ( obj.constructor.toString().match( /\s*function Function\(/ ) || typeof obj == 'function' )
   {
     newObj = obj; // just copy reference to it
   }
-  else if (  obj.constructor.toString().match( /\s*function RegExp\(/ ) )
+  else if (  obj.isRegExp )
   {
     newObj = eval( obj.toString() ); //see no way without eval
@@ -5791 +5803 @@
     + ".htmtableborders, .htmtableborders td, .htmtableborders th {border : 1px dashed lightgrey ! important;}\n"
     + "html, body { border: 0px; } \n"
-    + "body { background-color: #ffffff; } \n" 
+    + "body { background-color: #ffffff; } \n"
+        + "img, hr { cursor: default } \n"  
     +"</style>\n";
     
@@ -6090 +6103 @@
 // 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 )
-    {
-                 s += prop + ' = ' + o[prop] + '\n';
-          }
-    var x = window.open("", "debugger");
-    x.document.write('<pre>' + s + '</pre>');
-  }
-    }
+    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 )
 {
@@ -7057 +7081 @@
   try
   {    
-    if (typeof XMLHttpRequest == "function")
+    if (typeof XMLHttpRequest != "undefined" && typeof XMLHttpRequest.constructor == 'function' ) // Safari's XMLHttpRequest is typeof object
     {
           return new XMLHttpRequest();

trunk/XinhaLoader.js

@@ -8 +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;
@@ -16 +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)
@@ -189 +190 @@
     arguments.callee.done = true;
     // kill the timer
+        
     if (Xinha.onloadTimer) clearInterval(Xinha.onloadTimer);
     

trunk/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();

trunk/modules/GetHtml/DOMwalk.js

@@ -147 +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 = "";
@@ -181 +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")

trunk/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

trunk/plugins/SmartReplace/smart-replace.js

@@ -107 +107 @@
         var editor = this.editor;
         var charCode =  Xinha.is_ie ? ev.keyCode : ev.charCode;
-        
+
         var key = String.fromCharCode(charCode);
 
@@ -138 +138 @@
                 
         var sel = editor.getSelection();
-        
+
         if (Xinha.is_ie)
         {
@@ -161 +161 @@
         else
         {
-                if (!sel.isCollapsed)
+                var r = editor.createRange(sel);
+
+                if (!r.collapsed)
                 {
                         editor.insertNodeAtSelection(document.createTextNode(''));
                 }
-                if (sel.anchorOffset > 0) sel.extend(sel.anchorNode,sel.anchorOffset-1);
+                if (r.startOffset > 0) r.setStart(r.startContainer, r.startOffset -1);
+
                 
-                if(sel.toString().match(/\S/))
-                {
-                        sel.collapse(sel.anchorNode,sel.anchorOffset);
+                if(r.toString().match(/[^\s\xA0]/))
+                {
+                        r.collapse(false);
                         editor.insertNodeAtSelection(document.createTextNode(closing));
                 }
                 else
                 {
-                        sel.collapse(sel.anchorNode,sel.anchorOffset);
-                        editor.insertNodeAtSelection(document.createTextNode(opening));
-                }
+                        r.deleteContents();
+                        editor.insertNodeAtSelection(document.createTextNode(' '+opening));                             
+                }
+                editor.getSelection().collapseToEnd();
         }
 }
@@ -184 +188 @@
         var editor = this.editor;
         var sel = this.editor.getSelection();
+        var r = this.editor.createRange(sel);
+        
         if (Xinha.is_ie)
         {
-                var r = this.editor.createRange(sel);
                 r.moveStart('character', -2);
                 
@@ -196 +201 @@
         else
         {
-                sel.extend(sel.anchorNode,sel.anchorOffset-2);
-                if(sel.toString().match(/^-/))
-                {
+                if (r.startOffset > 1) r.setStart(r.startContainer, r.startOffset -2);
+
+                if(r.toString().match(/^ -/))
+                {
+                        r.deleteContents();
                         this.editor.insertNodeAtSelection(document.createTextNode(' '+String.fromCharCode(8211)));
                 }
-                sel.collapse(sel.anchorNode,sel.anchorOffset);
+                editor.getSelection().collapseToEnd();
         }
 }

trunk/skins/silva/skin.css

@@ -76 +76 @@
   border-right: none;
   width: 1px;
-  height: 18px;
+  height: 11px;
   padding: 0px;
 }