Changeset 929

Timestamp:

01/09/08 21:10:59 (5 years ago)

Author:

ray

Message:

• #1115 Dialogs not working on firefox 3
  
• #1127 InsertImage? and probably other things using insertNodeAtSelection() not working in FF3
  

Location:

trunk

Files:

• examples/Extended.html (modified) (1 diff)
• examples/ext_example-menu.php (modified) (1 diff)
• modules/Dialogs/dialog.js (modified) (1 diff)
• modules/Gecko/Gecko.js (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/dialog.js (modified) (1 diff)
• plugins/ImageManager/assets/dialog.js (modified) (1 diff)
• popups/popup.js (modified) (1 diff)

trunk/examples/Extended.html

@@ -97 +97 @@
     body_height = pos.y + bottom.offsetHeight;
   }
-  window.dialogArguments = opener.Dialog._arguments;
+  if (!window.dialogArguments && opener.Dialog._arguments)
+  {
+    window.dialogArguments = opener.Dialog._arguments;
+  }
   if (!document.all) {
     window.sizeToContent();

trunk/examples/ext_example-menu.php

@@ -111 +111 @@
 
 function Dialog(url, action, init) {
-  if (typeof init == "undefined") {
-    init = window;      // pass this window object by default
-  }
-  Dialog._geckoOpenModal(url, action, init);
+        if (typeof init == "undefined") {
+                init = window;  // pass this window object by default
+        }
+        if (typeof window.showModalDialog == 'function')
+        {
+                Dialog._return = action;
+                var r = window.showModalDialog(url, init, "dialogheight=10;dialogheight=10;scroll=no;resizable=yes");
+        }
+        else
+        {
+                Dialog._geckoOpenModal(url, action, init);
+        }
 };
 

trunk/modules/Dialogs/dialog.js

@@ -28 +28 @@
                 init = window;  // pass this window object by default
         }
-        Dialog._geckoOpenModal(url, action, init);
+        if (typeof window.showModalDialog == 'function')
+        {
+                Dialog._return = function(retVal) {
+                        if (typeof action == 'function') action (retVal);
+                }
+                var r = window.showModalDialog(url, init, "dialogheight=10;dialogwidth=10;resizable=yes");
+        }
+        else
+        {
+                Dialog._geckoOpenModal(url, action, init);
+        }
 }
 

trunk/modules/Gecko/Gecko.js

@@ -396 +396 @@
 Xinha.prototype.insertNodeAtSelection = function(toBeInserted)
 {
+  if ( toBeInserted.ownerDocument != this._doc ) // as of FF3, Gecko is strict regarding the ownerDocument of an element
+  {
+    try 
+        {
+                toBeInserted = this._doc.adoptNode( toBeInserted );
+        } catch (e) {}
+  }
   var sel = this.getSelection();
   var range = this.createRange(sel);
@@ -404 +411 @@
   var pos = range.startOffset;
   var selnode = toBeInserted;
+  
   switch ( node.nodeType )
   {

trunk/plugins/ExtendedFileManager/assets/dialog.js

@@ -16 +16 @@
 
 function Dialog(url, action, init) {
-    if (typeof init == "undefined") {
-        init = window;  // pass this window object by default
-    }
-    Dialog._geckoOpenModal(url, action, init);
+        if (typeof init == "undefined") {
+                init = window;  // pass this window object by default
+        }
+        if (typeof window.showModalDialog == 'function')
+        {
+                Dialog._return = action;
+                var r = window.showModalDialog(url, init, "dialogheight=10;dialogwidth=10;resizable=yes");
+        }
+        else
+        {
+                Dialog._geckoOpenModal(url, action, init);
+        }
 }
 

trunk/plugins/ImageManager/assets/dialog.js

@@ -19 +19 @@
                 init = window;  // pass this window object by default
         }
-        Dialog._geckoOpenModal(url, action, init);
+        if (typeof window.showModalDialog == 'function')
+        {
+                Dialog._return = action;
+                var r = window.showModalDialog(url, init, "dialogheight=10;dialogwidth=10;resizable=yes");
+        }
+        else
+        {
+                Dialog._geckoOpenModal(url, action, init);
+        }
 }
 

trunk/popups/popup.js

@@ -55 +55 @@
     head.appendChild(link);
   }
-        window.dialogArguments = opener.Dialog._arguments;
+  if (!window.dialogArguments && opener.Dialog._arguments)
+  {
+    window.dialogArguments = opener.Dialog._arguments;
+  }
+  
 
   var page = Xinha.pageSize(window);