Ignore:
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/ExtendedFileManager/assets
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/plugins/ExtendedFileManager/assets/manager.js

    r937 r939  
    5555        } 
    5656         
    57         var w = 650; 
     57        var w = 650; 
    5858        var h = 200; 
    5959         
    6060        window.resizeTo(w,h); 
    61         var pageSize = Xinha.pageSize (window); 
    62  
    63         h = pageSize['y'] + 60; 
     61        var page = Xinha.pageSize(window); 
     62        window.resizeTo(w,h); 
    6463         
    65         window.resizeTo(w,h); 
    66         if ( Xinha.ie_version == 7 ) 
    67         { 
    68                 window.resizeBy( 0, 40); 
    69                 h += 40; 
    70         } 
     64        var dim = Xinha.viewportSize(window); 
     65 
     66        window.resizeBy(0, page.y - dim.y + 5); 
     67 
    7168        if (!Xinha.is_ie) 
    7269        { 
  • trunk/plugins/ExtendedFileManager/assets/popup.js

    r937 r939  
    3131    head.appendChild(link); 
    3232  } 
    33         window.dialogArguments = opener.Dialog._arguments; 
     33  if (!window.dialogArguments && opener.Dialog._arguments) 
     34  { 
     35    window.dialogArguments = opener.Dialog._arguments; 
     36  } 
    3437 
    35     Xinha.addDom0Event(document.body, 'keypress', __dlg_close_on_esc); 
     38  Xinha.addDom0Event(document.body, 'keypress', __dlg_close_on_esc); 
    3639  window.__dlg_init_done = true; 
    3740} 
Note: See TracChangeset for help on using the changeset viewer.