Changeset 765

Timestamp:

03/04/07 04:45:14 (5 years ago)

Author:

ray

Message:

see #938 -- restored [736] with fix for #972

Files:

• trunk/XinhaCore.js (modified) (8 diffs)

trunk/XinhaCore.js

@@ -111 +111 @@
 Xinha.ie_version= parseFloat(Xinha.agt.substring(Xinha.agt.indexOf("msie")+5));
 Xinha.is_opera  = (Xinha.agt.indexOf("opera") != -1);
+Xinha.opera_version = navigator.appVersion.substring(0, navigator.appVersion.indexOf(" "))*1;
 Xinha.is_mac       = (Xinha.agt.indexOf("mac") != -1);
 Xinha.is_mac_ie = (Xinha.is_ie && Xinha.is_mac);
@@ -116 +117 @@
 Xinha.is_gecko  = (navigator.product == "Gecko");
 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
 if ( Xinha.isRunLocally )
 {
@@ -385 +387 @@
 
   // CharSet of the iframe, default is the charset of the document
-  this.charSet = Xinha.is_gecko ? document.characterSet : document.charset;
+  this.charSet = (typeof document.characterSet != 'undefined') ? document.characterSet : document.charset;
 
   // URL-s
@@ -1824 +1826 @@
   // Add an event to initialize the iframe once loaded.
   editor._iframeLoadDone = false;
-  Xinha._addEvent(
-    this._iframe,
-    'load',
-    function(e)
-    {
-      if ( !editor._iframeLoadDone )
-      {
-        editor._iframeLoadDone = true;
-        editor.initIframe();
-      }
-      return true;
-    }
-  );
+  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(
+      this._iframe,
+      'load',
+      function(e)
+      {
+        if ( !editor._iframeLoadDone )
+        {
+          editor._iframeLoadDone = true;
+          editor.initIframe();
+        }
+        return true;
+      }
+    );
 
 };
@@ -2228 +2247 @@
   try
   {
-    return Xinha.is_gecko? this._doc.designMode == 'on' : this._doc.body.contentEditable;
+    return Xinha.is_designMode ? this._doc.designMode == 'on' : this._doc.body.contentEditable;
   }
   catch (ex)
@@ -2250 +2269 @@
   }
 
-  if ( Xinha.is_gecko && this._doc.designMode != 'on' )
+  if ( Xinha.is_designMode && this._doc.designMode != 'on' )
   {
     try
@@ -2286 +2305 @@
   this.disableToolbar();
 
-  if ( Xinha.is_gecko && this._doc.designMode != 'off' )
+  if ( Xinha.is_designMode && this._doc.designMode != 'off' )
   {
     try
@@ -4371 +4390 @@
     }
   }
-  return Xinha.is_gecko || Xinha.ie_version >= 5.5;
+  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;
 };