Changeset 939

Timestamp:

01/22/08 21:11:43 (12 years ago)

Author:

ray

Message:

#1115 Dialogs not working on firefox 3 fix for ExtendedFileManager?

Location:

trunk/plugins

Files:

• ExtendedFileManager/assets/manager.js (modified) (1 diff)
• ExtendedFileManager/assets/popup.js (modified) (1 diff)
• PreserveScripts/php.svg (added)

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -55 +55 @@
         }
         
-        var w = 650;
+        var w = 650;
         var h = 200;
         
         window.resizeTo(w,h);
-        var pageSize = Xinha.pageSize (window);
-
-        h = pageSize['y'] + 60;
+        var page = Xinha.pageSize(window);
+        window.resizeTo(w,h);
         
-        window.resizeTo(w,h);
-        if ( Xinha.ie_version == 7 )
-        {
-                window.resizeBy( 0, 40);
-                h += 40;
-        }
+        var dim = Xinha.viewportSize(window);
+
+        window.resizeBy(0, page.y - dim.y + 5);
+
         if (!Xinha.is_ie)
         {

trunk/plugins/ExtendedFileManager/assets/popup.js

@@ -31 +31 @@
     head.appendChild(link);
   }
-        window.dialogArguments = opener.Dialog._arguments;
+  if (!window.dialogArguments && opener.Dialog._arguments)
+  {
+    window.dialogArguments = opener.Dialog._arguments;
+  }
 
-    Xinha.addDom0Event(document.body, 'keypress', __dlg_close_on_esc);
+  Xinha.addDom0Event(document.body, 'keypress', __dlg_close_on_esc);
   window.__dlg_init_done = true;
 }