Changeset 428

Timestamp:

11/28/05 03:54:34 (7 years ago)

Author:

gogo

Message:

This branch contains preliminary work for supporting Opera.

Opera technology preview which includes Rich Editing (designMode
style) may be downloaded at http://snapshot.opera.com/

Currently with only a few modifications (and identifing as Gecko for the
time being) Xinha actually works to a useful degree.

Location:

branches/opera

Files:

• . (copied) (copied from trunk)
• htmlarea.js (modified) (11 diffs)
• plugins/ImageManager/Classes/GD.php (modified) (2 diffs)
• plugins/ImageManager/Classes/IM.php (modified) (1 diff)
• plugins/ImageManager/Classes/NetPBM.php (modified) (1 diff)
• popups/blank.html (modified) (1 diff)

branches/opera/htmlarea.js

@@ -72 +72 @@
 HTMLArea.is_win_ie = (HTMLArea.is_ie && !HTMLArea.is_mac);
 HTMLArea.is_gecko  = (navigator.product == "Gecko");
+HTMLArea.is_designMode = (typeof document.designMode != 'undefined');
 
 // Creates a new HTMLArea object.  Tries to replace the textarea with the given
@@ -275 +276 @@
 
   // CharSet of the iframe, default is the charset of the document
-  this.charSet = HTMLArea.is_gecko ? document.characterSet : document.charset;
+  this.charSet = (typeof document.characterSet != 'undefined') ? document.characterSet : document.charset;
 
   // URL-s
@@ -1389 +1390 @@
   // Add an event to initialize the iframe once loaded.
   editor._iframeLoadDone = false;
+  
+  // Opera doesn't work with the event on the iframe, we have the blank page that gets
+  //  loaded tell us when ready.
+  if(this._iframe.contentWindow && this._iframe.contentWindow.xinhaReadyToRoll)
+  {
+    editor._iframeLoadDone = true;
+    editor.initIframe();
+    return;
+  }
+  
   HTMLArea._addEvent
   (
@@ -1403 +1414 @@
     }
   );
-
+  
 };
 
@@ -1764 +1775 @@
   HTMLArea.prototype.editorIsActivated = function() {
     try {
-      if (HTMLArea.is_gecko) return (this._doc.designMode == 'on');
+      if (HTMLArea.is_designMode) return (this._doc.designMode == 'on');
       else return (this._doc.body.contentEditable);
     } catch (e)
@@ -1783 +1794 @@
     }
 
-    if (HTMLArea.is_gecko && this._doc.designMode != 'on')
+    if (HTMLArea.is_designMode && this._doc.designMode != 'on')
     {
       try
@@ -1819 +1830 @@
     this.disableToolbar();
 
-    if (HTMLArea.is_gecko && this._doc.designMode != 'off')
+    if (HTMLArea.is_designMode && this._doc.designMode != 'off')
     {
       try {this._doc.designMode = 'off';} catch (e) {}
@@ -1841 +1852 @@
 
   HTMLArea.prototype.initIframe = function()
-  {
+  {        
     this.disableToolbar();
     var doc = null;
@@ -1857 +1868 @@
       doc = this._doc;      
       if (!doc) { // try later
-        if (HTMLArea.is_gecko) {
+        if (0 && HTMLArea.is_gecko) {
           setTimeout(function() { editor.initIframe()}, 50);
           return false;
@@ -1868 +1879 @@
     { // try later
       setTimeout(function() { editor.initIframe()}, 50);
+      return false;
     }
     
@@ -4362 +4374 @@
     }
   }
-  return HTMLArea.is_gecko || HTMLArea.is_ie;
+ 
+  return HTMLArea.is_ie || HTMLArea.is_designMode;
 };
 

branches/opera/plugins/ImageManager/Classes/GD.php

@@ -333 +333 @@
     * better result.
     *
-    * @param $new_x int  new width
-    * @param $new_y int  new height
+    * @param int  $new_x new width
+    * @param int  $new_y new height
     *
     * @return true on success or pear error
@@ -438 +438 @@
      * Save the image file
      *
-     * @param $filename string  the name of the file to write to
-     * @param $quality  int     output DPI, default is 85
-     * @param $types    string  define the output format, default
+     * @param string  $filename the name of the file to write to
+     * @param int     $quality  output DPI, default is 85
+     * @param string  $types    define the output format, default
      *                          is the current used format
      *

branches/opera/plugins/ImageManager/Classes/IM.php

@@ -183 +183 @@
      * Save the image file
      *
-     * @param $filename string  the name of the file to write to
-     * @param $quality  quality image dpi, default=75
-     * @param $type     string  (JPG,PNG...)
+     * @param string  $filename the name of the file to write to
+     * @param quality $quality  image dpi, default=75
+     * @param string  $type     (JPG,PNG...)
      *
      * @return none

branches/opera/plugins/ImageManager/Classes/NetPBM.php

@@ -206 +206 @@
      * Save the image file
      *
-     * @param $filename string the name of the file to write to
+     * @param string $filename the name of the file to write to
      * @param string $type (jpeg,png...);
      * @param int $quality 75

branches/opera/popups/blank.html

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