Changeset 984

Timestamp:

03/22/08 12:37:20 (5 years ago)

Author:

ray

Message:

updated branch with changes frum trunk

Location:

branches/ray

Files:

• Xinha.css (modified) (1 diff)
• XinhaCore.js (modified) (11 diffs)
• modules/ColorPicker/ColorPicker.js (modified) (18 diffs)
• modules/Dialogs/dialog.js (modified) (2 diffs)
• modules/Gecko/Gecko.js (modified) (1 diff)
• modules/InternetExplorer/InternetExplorer.js (modified) (2 diffs)
• plugins/InsertAnchor/insert-anchor.css (modified) (1 diff)
• plugins/InsertAnchor/insert-anchor.js (modified) (5 diffs)
• plugins/SmartReplace/smart-replace.js (modified) (4 diffs)

branches/ray/Xinha.css

@@ -1 +1 @@
 .htmlarea { background: #fff; }
 .htmlarea td { margin:0;padding:0; }
+
+.htmlarea .toolbarRow {
+  width:1px;
+}
 
 .htmlarea .toolbar {

branches/ray/XinhaCore.js

@@ -134 +134 @@
 @type string 
 */
-Xinha.opera_version = navigator.appVersion.substring(0, navigator.appVersion.indexOf(" "))*1;
+if(Xinha.is_opera && Xinha.agt.match(/opera[\/ ]([0-9.]+)/))
+{
+  Xinha.opera_version = parseFloat(RegExp.$1);
+}
+else
+{
+  Xinha.opera_version = 0;
+}
 /** Browserengine is KHTML (Konqueror, Safari)
 @type string 
@@ -143 +150 @@
 */
 Xinha.is_webkit  = (Xinha.agt.indexOf("applewebkit") != -1);
+Xinha.webkit_version = parseInt(navigator.appVersion.replace(/.*?AppleWebKit\/([\d]).*?/,'$1'));
+
 /** Browser is Safari
 @type string 
@@ -159 +168 @@
 */
 Xinha.is_win_ie = (Xinha.is_ie && !Xinha.is_mac);
-/** Browserengine is Gecko (Mozilla), applies also to Safari
+/** Browser engine is Gecko (Mozilla), applies also to Safari and Opera which work
+ *  largely similar.
 @type string 
 */
-Xinha.is_gecko  = (navigator.product == "Gecko");
+Xinha.is_gecko  = (navigator.product == "Gecko") || Xinha.is_opera;
 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";
+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)
@@ -184 +194 @@
 Xinha.checkSupportedBrowser = function()
 {
-  if ( Xinha.is_opera )
-  {
-    // alert("Sorry, Opera is not yet supported by Xinha.");
-      return false;
-    }
-  return Xinha.is_gecko || (Xinha.is_opera && 0 && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5;
+  return Xinha.is_real_gecko || (Xinha.is_opera && Xinha.opera_version >= 9.2) || Xinha.ie_version >= 5.5 || Xinha.webkit_version >= 522;
 };
 /** Cache result of checking for browser support
@@ -454 +459 @@
 * @type RegExp
 */
-Xinha.RE_email    = /[_a-z\d\-\.]{3,}@[_a-z\d\-]{2,}(\.[_a-z\d\-]{2,})+/i;
+Xinha.RE_email    = /^[_a-z\d\-\.]{3,}@[_a-z\d\-]{2,}(\.[_a-z\d\-]{2,})+$/i;
 /** Identifies URLs
 * @type RegExp
@@ -2055 +2060 @@
     editor._browserSpecificPlugin = editor.registerPlugin('WebKit');
   }
+  else if (Xinha.is_opera)
+  {
+    url = _editor_url + 'modules/Opera/Opera.js';
+    if ( !Xinha.loadPlugins(["Opera"], function() { editor.generate(); }, url ) )
+    {            
+      return false;
+    }
+    editor._browserSpecificPlugin = editor.registerPlugin('Opera');
+  }
   else if (Xinha.is_gecko)
   {
@@ -2135 +2149 @@
     editor.registerPlugin('EnterParagraphs');
   }
+  //TEMPORARY FIX FOR IE8 see #1175
+  if (Xinha.ie_version == 8)
+  {
+    this.config.getHtmlMethod = 'TransformInnerHTML';
+  }
 
   switch (this.config.getHtmlMethod)
@@ -2340 +2359 @@
   if (Xinha.is_opera)
     {
-      Xinha._addEvent(
-        this._iframe.contentWindow,
-        'load',
-        function(e)
-        {
-          if ( !editor._iframeLoadDone )
-          {
-             editor._iframeLoadDone = true;
              editor.initIframe();
           }
-          return true;
-        }
-      )
-    }
   else
     Xinha._addEvent(
@@ -5024 +5031 @@
     if ( typeof this.config.baseHref != 'undefined' && this.config.baseHref !== null )
     {
-      baseRe = new RegExp( "((href|src|background)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref.replace(/([^\/]\/)(?=.+\.)[^\/]*$/, "$1")) + ")", 'g' );
+      baseRe = new RegExp( "((href|src|background|action)=\")(" + Xinha.escapeStringForRegExp(this.config.baseHref.replace(/([^\/]\/)(?=.+\.)[^\/]*$/, "$1")) + ")", 'g' );
     }
     else
     {
-      baseRe = new RegExp( "((href|src|background)=\")(" +  Xinha.escapeStringForRegExp(document.location.href.replace( /^(https?:\/\/[^\/]*)(.*)/, '$1' )) + ")", 'g' );
+      baseRe = new RegExp( "((href|src|background|action)=\")(" +  Xinha.escapeStringForRegExp(document.location.href.replace( /^(https?:\/\/[^\/]*)(.*)/, '$1' )) + ")", 'g' );
     }
 
@@ -6128 +6135 @@
       }
       else 
+      {
       s += prop + ' = ' + o[prop] + '\n';
     }
+
+    }
     if (s) 
     {
+      if (document.getElementById('errors'))
+      {
+        document.getElementById('errors').value += s;
+      }
+      else
+      {
     var x = window.open("", "debugger");
     x.document.write('<pre>' + s + '</pre>');
   }
+}
 }
 }
@@ -7137 +7154 @@
 Xinha.init();
 
-if (Xinha.is_ie)
+if ( Xinha.ie_version < 8 )
 {
   Xinha.addDom0Event(window,'unload',Xinha.collectGarbageForIE);

branches/ray/modules/ColorPicker/ColorPicker.js

@@ -90 +90 @@
   function ColorPicker() 
   {
-        // dummy function for Xinha plugin api, note the different names
+  // dummy function for Xinha plugin api, note the different names
   }
-  if (window.opener && window.opener.Xinha)
-  { // this prevents that the Xinha.colorPicker object of the opening window is replaced by the one loaded in the popup
-        var openerColorPicker = window.opener.Xinha.colorPicker;
-        Xinha._addEvent(window,'unload', function() {Xinha.colorPicker = openerColorPicker;});
-  }
+  try {
+    if (window.opener && window.opener.Xinha)
+    { // this prevents that the Xinha.colorPicker object of the opening window is replaced by the one loaded in the popup
+      var openerColorPicker = window.opener.Xinha.colorPicker;
+      Xinha._addEvent(window,'unload', function() {Xinha.colorPicker = openerColorPicker;});
+    }
+  } catch(e) {}
   //the actual function is below
   Xinha.colorPicker = function (params)
@@ -105 +107 @@
       Xinha.colorPicker.loadColors();
     }
-        
-        this.is_ie_6 = (Xinha.is_ie && Xinha.ie_version < 7);
+
+    this.is_ie_6 = (Xinha.is_ie && Xinha.ie_version < 7);
     var picker = this;
     var enablepick = false;
@@ -128 +130 @@
     this.table.onmouseup = function()
     {
-         enablepick = false;
-         enablevalue = false;
+      enablepick = false;
+      enablevalue = false;
     };
     this.tbody = document.createElement('tbody');
@@ -197 +199 @@
     this.chosenColor.onchange = function()
       {
-        if(/#[0-9a-f]{6,6}/i.test(this.value))
-        {
-              picker.backSample.style.backgroundColor = this.value;
+        if(/#[0-9a-f]{6,6}/i.test(this.value))
+        {
+          picker.backSample.style.backgroundColor = this.value;
           picker.foreSample.style.color = this.value;
-        }
+        }
       };
 
@@ -353 +355 @@
       {
         this.chosenColor.value = initcolor;
-            this.backSample.style.backgroundColor = initcolor;
+        this.backSample.style.backgroundColor = initcolor;
         this.foreSample.style.color = initcolor;
       }
@@ -385 +387 @@
         else
         {
-                  this.table.style.top = 0;
+          this.table.style.top = 0;
         }
       }
@@ -401 +403 @@
         else
         {
-                  this.table.style.left = 0;
+          this.table.style.left = 0;
         }
       }
@@ -410 +412 @@
      // 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;
@@ -422 +424 @@
         picker.foreSample.style.color = cell.colorCode;
         if((cell.hue >= 195  && cell.saturation > 0.5) || 
-                        (cell.hue === 0 && cell.saturation === 0 && cell.value < 0.5) || 
-                        (cell.hue !== 0 && picker.value < 0.75))
+           (cell.hue === 0 && cell.saturation === 0 && cell.value < 0.5) || 
+           (cell.hue !== 0 && picker.value < 0.75))
         {
           cell.style.borderColor = '#fff';
@@ -445 +447 @@
         else
         {
-                  cell.style.borderColor = '#000';
+          cell.style.borderColor = '#000';
         }
         valuerow = cell.thisrow;
@@ -456 +458 @@
     function unpickCell(row,col)
     {
-          picker.saved_cells[row][col].style.borderColor = picker.saved_cells[row][col].colorCode;
+      picker.saved_cells[row][col].style.borderColor = picker.saved_cells[row][col].colorCode;
     }
     
@@ -510 +512 @@
             {
               enablepick = true;
-//               unpickCell(pickrow,pickcol);
+//            unpickCell(pickrow,pickcol);
               picker.saved_cells[pickrow][pickcol].style.borderColor = picker.saved_cells[pickrow][pickcol].colorCode;
               pickCell(this);
@@ -516 +518 @@
             td.onmouseover = function()
             {
-                 if(enablepick)
-                 {
-                        pickCell(this);
-                 }
+              if(enablepick)
+              {
+                pickCell(this);
+              }
             };
             td.onmouseout = function()
             {
-                 if(enablepick)
-                 {
-    //            this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
+              if(enablepick)
+              {
+    //          this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
                 this.style.borderColor = this.colorCode;
-                 }
+              }
             };
             td.ondblclick = function() { Xinha.colorPicker.remember(this.colorCode, picker.savecolors); picker.callback(this.colorCode); picker.close(); };
@@ -566 +568 @@
           {
             enablevalue = true;
-//            unpickCell(valuerow,valuecol);
+//          unpickCell(valuerow,valuecol);
             picker.saved_cells[valuerow][valuecol].style.borderColor = picker.saved_cells[valuerow][valuecol].colorCode;
             picker.value = this.hsv_value; 
@@ -643 +645 @@
    //           this.style.borderColor = picker.saved_cells[this.thisrow][this.thiscol].colorCode;
               this.style.borderColor = this.colorCode;
-                   }
+            }
           };
           td.ondblclick = function() { Xinha.colorPicker.remember(this.colorCode, picker.savecolors); picker.callback(this.colorCode); picker.close(); };
@@ -786 +788 @@
         this.foreSample.style.color = pickcell.colorCode;
         if((pickcell.hue >= 195  && pickcell.saturation > 0.5) || 
-                        (pickcell.hue === 0 && pickcell.saturation === 0 && pickcell.value < 0.5) || 
-                        (pickcell.hue !== 0 && picker.value < 0.75))
+           (pickcell.hue === 0 && pickcell.saturation === 0 && pickcell.value < 0.5) || 
+           (pickcell.hue !== 0 && picker.value < 0.75))
         {
            pickcell.style.borderColor = '#fff';
@@ -793 +795 @@
         else
         {
-                  pickcell.style.borderColor = '#000';
+          pickcell.style.borderColor = '#000';
         }
       }
@@ -892 +894 @@
   { 
     var colPicker = new Xinha.colorPicker(pickerConfig);
-          colPicker.open("",chooser, input.value ); 
+    colPicker.open("",chooser, input.value ); 
   }
   Xinha.freeLater(this,"chooser");

branches/ray/modules/Dialogs/dialog.js

@@ -28 +28 @@
                 init = window;  // pass this window object by default
         }
-        if (typeof window.showModalDialog == 'function')
+        if (typeof window.showModalDialog == 'function' && !Xinha.is_webkit) // webkit easily looses the selection with window.showModalDialog
         {
                 Dialog._return = function(retVal) {
                         if (typeof action == 'function') action (retVal);
                 }
-                var r = window.showModalDialog(url, init, "dialogheight=10;dialogwidth=10;resizable=yes");
+                var r = window.showModalDialog(url, init, "dialogheight=300;dialogwidth=400;resizable=yes");
         }
         else
@@ -61 +61 @@
 // the dialog will read it's args from this variable
 Dialog._arguments = null;
+
+Dialog._selection = null;
 
 Dialog._geckoOpenModal = function(url, action, init) {

branches/ray/modules/Gecko/Gecko.js

@@ -600 +600 @@
   var sel = this.getSelection();
   range = this._doc.createRange();
+  if ( !node )
+  {
+     sel.removeAllRanges();
+     return;
+  }
   // Tables and Images get selected as "objects" rather than the text contents
   if ( collapsed && node.tagName && node.tagName.toLowerCase().match(/table|img|input|textarea|select/) )

branches/ray/modules/InternetExplorer/InternetExplorer.js

@@ -495 +495 @@
 {
   var sel = this.getSelection();
-  if (this.selectionEmpty) return '';
+  if (this.selectionEmpty(sel)) return '';
   var range = this.createRange(sel);
   
@@ -638 +638 @@
 Xinha.getDoctype = function (doc)
 {
-  return (doc.compatMode == "CSS1Compat") ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' : '';
-};
+  return (doc.compatMode == "CSS1Compat" && Xinha.ie_version < 8 ) ? '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">' : '';
+};

branches/ray/plugins/InsertAnchor/insert-anchor.css

@@ -5 +5 @@
   background-repeat: no-repeat;
   background-position: left top;
-  padding-left: 19px;
   border: 1px dotted blue;
 }

branches/ray/plugins/InsertAnchor/insert-anchor.js

@@ -4 +4 @@
   var self = this;
 
+  this.placeholderImg = '<img class="IA_placeholder" src="'+_editor_url+'plugins/InsertAnchor/img/placeholder.gif" />';
+  
   // register the toolbar buttons provided by this plugin
   cfg.registerButton({
@@ -37 +39 @@
 };
 
+InsertAnchor.prototype.inwardHtml = function(html)
+{
+        html= html.replace(/(<a[^>]*class="anchor"[^>]*>)/g,"$1"+this.placeholderImg);
+        return html;
+}
+InsertAnchor.prototype.outwardHtml = function(html)
+{
+        html= html.replace(/(<img[^>]*class="?IA_placeholder"?[^>]*>)/ig,"");
+        return html;
+}
 InsertAnchor.prototype.onGenerateOnce = function()
 {
@@ -101 +113 @@
         var anchor = param['name'];
         var a = this.a;
+        var self = this;
         if (anchor == "" || anchor == null)
         {
                 if (a) 
                 {
-                        var child = a.innerHTML;
+                        var child = self.outwardHtml(a.innerHTML);
                         a.parentNode.removeChild(a);
                         editor.insertHTML(child);
@@ -119 +132 @@
                         a.id = anchor;
                         a.name = anchor;
+                        a.title = anchor;
                         a.className = "anchor";
-                        a.innerHTML = this.selectedHTML;
-                        editor.insertNodeAtSelection(a);
+                        a.innerHTML = self.placeholderImg;
+                        var html = editor.getSelectedHTML();
+                        if (html) a.innerHTML += html;
+                        if (Xinha.is_ie) 
+                        {
+                range.pasteHTML(a.outerHTML);
+                }
+                        else 
+                        {
+                                editor.insertNodeAtSelection(a);
+                        }
                 }
                 else 
@@ -127 +150 @@
                         a.id = anchor;
                         a.name = anchor;
+                        a.title = anchor;
                         a.className = "anchor";
                 }

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

@@ -68 +68 @@
         
         var self = this;
-        Xinha._addEvents(
+        Xinha._addEvent(
         self.editor._doc,
-        [ "keypress"],
+                 "keypress",
         function (event)
         {
@@ -106 +106 @@
         if ( !this.active) return true;
         var editor = this.editor;
-        var charCode =  Xinha.is_ie ? ev.keyCode : ev.charCode;
+        var charCode =  Xinha.is_ie ? ev.keyCode : ev.which;
 
         var key = String.fromCharCode(charCode);
 
-        if (charCode == 32) //space bar
-        {
-                return this.smartDash()
-        }
         if ( key == '"' || key == "'")
         {
                 Xinha._stopEvent(ev);
                 return this.smartQuotes(key);
+        }
+        if (charCode == 32) //space bar
+        {
+                return this.smartReplace(ev, 2, /^\s-/, ' –', false); // space-space -> dash 
+        }
+        if ( key == '.' ) // ... -> ellipsis
+        {
+                return this.smartReplace(ev, 2, /\.\./, '
', true);
         }
         return true;
@@ -177 +181 @@
                 else
                 {
-                        r.deleteContents();
-                        editor.insertNodeAtSelection(document.createTextNode(' '+opening));                             
+                        editor.insertNodeAtSelection(document.createTextNode(opening));                         
                 }
                 editor.getSelection().collapseToEnd();
         }
-}
-
-SmartReplace.prototype.smartDash = function()
+        return false;
+}
+
+SmartReplace.prototype.smartReplace = function(ev, lookback, re, replace, stopEvent)
 {
         var editor = this.editor;
@@ -192 +196 @@
         if (Xinha.is_ie)
         {
-                r.moveStart('character', -2);
+                r.moveStart('character', -lookback);
                 
-                if(r.text.match(/\s-/))
-                {
-                        r.text = ' '+ String.fromCharCode(8211);
+                if(r.text.match(re))
+                {
+                        r.text = replace;
+                        if (stopEvent) 
+                        {
+                                Xinha._stopEvent(ev);
+                                return false
+                        }
                 }
         }
         else
         {
-                if (r.startOffset > 1) r.setStart(r.startContainer, r.startOffset -2);
-
-                if(r.toString().match(/^ -/))
-                {
+                if (r.startOffset > 1) r.setStart(r.startContainer, r.startOffset -lookback);
+
+                if(r.toString().match(re))
+                {
+                        this.editor.insertNodeAtSelection(document.createTextNode(replace));
                         r.deleteContents();
-                        this.editor.insertNodeAtSelection(document.createTextNode(' '+String.fromCharCode(8211)));
+                        r.collapse(true);
+                        if (stopEvent) 
+                        {
+                                Xinha._stopEvent(ev);
+                                return false
+                        }
                 }
                 editor.getSelection().collapseToEnd();
         }
+        return true;
 }