Changeset 969

Timestamp:

02/07/08 07:10:47 (4 years ago)

Author:

gogo

Message:

Two part commit for initial Opera 9.2 (or better, 9.5) support, see #938 .

Location:

trunk

Files:

• XinhaCore.js (modified) (5 diffs)
• modules/Gecko/paraHandlerBest.js (deleted)
• modules/Opera (copied) (copied from trunk/modules/Gecko)
• modules/Opera/Gecko.js (modified) (16 diffs)
• popups/blank.html (modified) (1 diff)

trunk/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 
@@ -161 +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;
@@ -186 +194 @@
 Xinha.checkSupportedBrowser = function()
 {
-  if ( Xinha.is_opera )
-  {
-    // alert("Sorry, Opera is not yet supported by Xinha.");
-    return false;
-  }
-  return Xinha.is_real_gecko || (Xinha.is_opera && 0 && Xinha.opera_version >= 9.1) || Xinha.ie_version >= 5.5 || Xinha.webkit_version >= 522;
+  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
@@ -2057 +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)
   {
@@ -2341 +2353 @@
   editor._iframeLoadDone = false;
   if (Xinha.is_opera)
-    {
-      Xinha._addEvent(
-        this._iframe.contentWindow,
-        'load',
-        function(e)
-        {
-          if ( !editor._iframeLoadDone )
-          {
-             editor._iframeLoadDone = true;
-             editor.initIframe();
-          }
-          return true;
-        }
-      )
+    {       
+      editor.initIframe();      
     }
   else

trunk/modules/Opera/Gecko.js

@@ -11 +11 @@
     --      This copyright notice MUST stay intact for use.
     --
-    -- This is the Gecko compatability plugin, part of the Xinha core.
+    -- This is the Opera compatability plugin, part of the Xinha core.
     --
     --  The file is loaded as a special plugin by the Xinha Core when
-    --  Xinha is being run under a Gecko based browser with the Midas
+    --  Xinha is being run under an Opera based browser with the Midas
     --  editing API.
     --
@@ -22 +22 @@
     --  Design Notes::
     --   Most methods here will simply be overriding Xinha.prototype.<method>
-    --   and should be called that, but methods specific to Gecko should 
-    --   be a part of the Gecko.prototype, we won't trample on namespace
+    --   and should be called that, but methods specific to Opera should 
+    --   be a part of the Opera.prototype, we won't trample on namespace
     --   that way.
     --
@@ -32 +32 @@
     --------------------------------------------------------------------------*/
                                                     
-Gecko._pluginInfo = {
-  name          : "Gecko",
+Opera._pluginInfo = {
+  name          : "Opera",
   origin        : "Xinha Core",
   version       : "$LastChangedRevision$".replace(/^[^:]*: (.*) \$$/, '$1'),
   developer     : "The Xinha Core Developer Team",
   developer_url : "$HeadURL$".replace(/^[^:]*: (.*) \$$/, '$1'),
-  sponsor       : "",
-  sponsor_url   : "",
+  sponsor       : "Gogo Internet Services Limited",
+  sponsor_url   : "http://www.gogo.co.nz/",
   license       : "htmlArea"
 };
 
-function Gecko(editor) {
+function Opera(editor) {
   this.editor = editor;  
-  editor.Gecko = this;
-}
-
-/** Allow Gecko to handle some key events in a special way.
- */
-  
-Gecko.prototype.onKeyPress = function(ev)
+  editor.Opera = this;
+}
+
+/** Allow Opera to handle some key events in a special way.
+ */
+  
+Opera.prototype.onKeyPress = function(ev)
 {
   var editor = this.editor;
@@ -285 +285 @@
 }
 
-/** When backspace is hit, the Gecko onKeyPress will execute this method.
+/** When backspace is hit, the Opera onKeyPress will execute this method.
  *  I don't remember what the exact purpose of this is though :-(
  */
  
-Gecko.prototype.handleBackspace = function()
+Opera.prototype.handleBackspace = function()
 {
   var editor = this.editor;
@@ -326 +326 @@
 };
 
-Gecko.prototype.inwardHtml = function(html)
-{
-   // Midas uses b and i internally instead of strong and em
-   // Xinha will use strong and em externally (see Xinha.prototype.outwardHtml)   
-   html = html.replace(/<(\/?)strong(\s|>|\/)/ig, "<$1b$2");
-   html = html.replace(/<(\/?)em(\s|>|\/)/ig, "<$1i$2");    
-   
-   // Both IE and Gecko use strike internally instead of del (#523)
+Opera.prototype.inwardHtml = function(html)
+{
+   // Both IE and Opera use strike internally instead of del (#523)
    // Xinha will present del externally (see Xinha.prototype.outwardHtml
    html = html.replace(/<(\/?)del(\s|>|\/)/ig, "<$1strike$2");
@@ -340 +335 @@
 }
 
-Gecko.prototype.outwardHtml = function(html)
-{
-  // ticket:56, the "greesemonkey" plugin for Firefox adds this junk,
-  // so we strip it out.  Original submitter gave a plugin, but that's
-  // a bit much just for this IMHO - james
-  html = html.replace(/<script[\s]*src[\s]*=[\s]*['"]chrome:\/\/.*?["']>[\s]*<\/script>/ig, '');
+Opera.prototype.outwardHtml = function(html)
+{
 
   return html;
 }
 
-Gecko.prototype.onExecCommand = function(cmdID, UI, param)
+Opera.prototype.onExecCommand = function(cmdID, UI, param)
 {   
-  try
-  {
-    // useCSS deprecated & replaced by styleWithCSS
-    this.editor._doc.execCommand('useCSS', false, true); //switch useCSS off (true=off)
-    this.editor._doc.execCommand('styleWithCSS', false, false); //switch styleWithCSS off     
-  } catch (ex) {}
     
   switch(cmdID)
   {
-    case 'paste':
+    
+    /*case 'paste':
     {
       alert(Xinha._lc("The Paste button does not work in Mozilla based web browsers (technical security reasons). Press CTRL-V on your keyboard to paste directly."));
       return true; // Indicate paste is done, stop command being issued to browser by Xinha.prototype.execCommand
     }
-    break;
+    break;*/
+    
     case 'removeformat':
       var editor = this.editor;
@@ -391 +378 @@
       return true;
     break;
+    
   }
   
   return false;
 }
-Gecko.prototype.onMouseDown = function(ev)
+
+Opera.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);
-  }
+  
 }
 
@@ -411 +394 @@
 /*--------------------------------------------------------------------------*/
 
+
+
 /** Insert a node at the current selection point. 
  * @param toBeInserted DomNode
@@ -417 +402 @@
 Xinha.prototype.insertNodeAtSelection = function(toBeInserted)
 {
-  if ( toBeInserted.ownerDocument != this._doc ) // as of FF3, Gecko is strict regarding the ownerDocument of an element
+  if ( toBeInserted.ownerDocument != this._doc )
   {
     try 
-        {
-                toBeInserted = this._doc.adoptNode( toBeInserted );
-        } catch (e) {}
-  }
-  var sel = this.getSelection();
+    {
+      toBeInserted = this._doc.adoptNode( toBeInserted );
+    } catch (e) {}
+  }
+  
+  this.focusEditor();
+  
+  var sel = this.getSelection();      
   var range = this.createRange(sel);
-  // remove the current selection
-  sel.removeAllRanges();
+    
   range.deleteContents();
+  
   var node = range.startContainer;
   var pos = range.startOffset;
   var selnode = toBeInserted;
+  
+  sel.removeAllRanges();
   
   switch ( node.nodeType )
@@ -458 +448 @@
       }
     break;
+    
     case 1: // Node.ELEMENT_NODE
       if ( toBeInserted.nodeType == 11 /* Node.DOCUMENT_FRAGMENT_NODE */ )
@@ -654 +645 @@
 Xinha.prototype.getSelection = function()
 {
-  return this._iframe.contentWindow.getSelection();
+  var sel = this._iframe.contentWindow.getSelection();
+  if(sel && sel.focusNode && sel.focusNode.tagName && sel.focusNode.tagName == 'HTML')
+  { // Bad news batman, this selection is wonky  
+    var bod = this._doc.getElementsByTagName('body')[0];
+    var rng = this.createRange();
+    rng.selectNodeContents(bod);
+    sel.removeAllRanges();
+    sel.addRange(rng);
+    sel.collapseToEnd();    
+  }
+  return sel; 
 };
   
@@ -717 +718 @@
 };
 
-//Control character for retaining edit location when switching modes
-Xinha.prototype.cc = String.fromCharCode(8286); 
-
+
+/* Caret position remembering when switch between text and html mode.
+ * Largely this is the same as for Gecko except:
+ *
+ * Opera does not have window.find() so we use instead an element with known
+ * id (<span id="XinhaOperaCaretMarker">MARK</span>) so that we can 
+ * do _doc.getElementById() on it.
+ * 
+ * Opera for some reason will not set the insert point (flashing caret)
+ * anyway though, in theory, the iframe is focused (in findCC below) and then
+ * the selection (containing the span above) is collapsed, it should show
+ * caret.  I don't know why not.  Seems to require user to actually
+ * click to get the caret to show (or type anything without it acting wierd)? 
+ * Very annoying.
+ *
+ */ 
+ 
 Xinha.prototype.setCC = function ( target )
 {
-  var cc = this.cc;
+  // Do a two step caret insertion, first a single char, then we'll replace that with the 
+  // id'd span.
+  var cc = String.fromCharCode(8286);
+  
   try
   {
@@ -741 +759 @@
       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");
+      
+      ta.value = ta.value.replace(cc, '<span id="XinhaOperaCaretMarker">MARK</span>');
     }
     else
     {
       var sel = this.getSelection();
-      sel.getRangeAt(0).insertNode( this._doc.createTextNode( cc ) );
+      
+      var mark =  this._doc.createElement('span');
+      mark.id  = 'XinhaOperaCaretMarker';
+      sel.getRangeAt(0).insertNode( mark );
+      
     }
   } catch (e) {}
@@ -753 +777 @@
 {
   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;
+  {  
+    var ta = this._textArea;
+    var pos = ta.value.search( /(<span\s+id="XinhaOperaCaretMarker"\s*\/?>((\s|(MARK))*<\/span>)?)/ );    
+    if ( pos == -1 ) return;
+    var cc = RegExp.$1;
+    var end = pos + 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 marker = this._doc.getElementById('XinhaOperaCaretMarker');
+    if(marker) 
+    {
+      this.focusEditor();// this._iframe.contentWindow.focus();
+      
+      var rng = this.createRange();
+      rng.selectNode(marker);
+      
       var sel = this.getSelection();
-      sel.getRangeAt(0).deleteContents();
-      this.scrollToElement();
-      this._iframe.contentWindow.focus();
-    } catch (e) {}
-  }
-};
+      sel.addRange(rng); 
+      sel.collapseToStart();
+      
+      this.scrollToElement(marker);
+      
+      marker.parentNode.removeChild(marker);
+      return;
+    }
+  }
+};
+
 /*--------------------------------------------------------------------------*/
 /*------------ EXTEND SOME STANDARD "Xinha.prototype" METHODS --------------*/
 /*--------------------------------------------------------------------------*/
 
+/*
 Xinha.prototype._standardToggleBorders = Xinha.prototype._toggleBorders;
 Xinha.prototype._toggleBorders = function()
 {
   var result = this._standardToggleBorders();
-  
+    
   // flashing the display forces moz to listen (JB:18-04-2005) - #102
   var tables = this._doc.getElementsByTagName('TABLE');
@@ -804 +840 @@
   return result;
 };
+*/
 
 /** Return the doctype of a document, if set
@@ -822 +859 @@
   return d;
 };
+
+Xinha.prototype._standardInitIframe = Xinha.prototype.initIframe;
+Xinha.prototype.initIframe = function()
+{
+  if(!this._iframeLoadDone) 
+  {    
+    if(this._iframe.contentWindow && this._iframe.contentWindow.xinhaReadyToRoll)
+    {
+      this._iframeLoadDone = true;
+      this._standardInitIframe();
+    }
+    else
+    {
+      // Timeout a little (Opera is a bit dodgy about using an event)
+      var editor = this;
+      setTimeout( function() { editor.initIframe() }, 5);
+    }
+  }
+}
+
+// For some reason, Opera doesn't listen to addEventListener for at least select elements with event = change
+// so we will have to intercept those and use a Dom0 event, these are used eg for the fontname/size/format
+// dropdowns in the toolbar
+Xinha._addEventOperaOrig = Xinha._addEvent;
+Xinha._addEvent = function(el, evname, func)
+{
+  if(el.tagName && el.tagName.toLowerCase() == 'select' && evname == 'change')
+  {
+    return Xinha.addDom0Event(el,evname,func);
+  }
+  
+  return Xinha._addEventOperaOrig(el,evname,func);
+}

trunk/popups/blank.html

@@ -1 @@
-<html>
-</html>
+<html><body onload="window.xinhaReadyToRoll = true;"></body></html>