Changeset 954 for trunk


Ignore:
Timestamp:
01/30/08 18:52:48 (11 years ago)
Author:
ray
Message:

some fixes

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/XinhaCore.js

    r951 r954  
    53795379   arguments.callee.done = true; 
    53805380   // kill the timer 
    5381    if (_timer) clearInterval(_timer); 
     5381   if (Xinha.onloadTimer) clearInterval(Xinha.onloadTimer); 
    53825382 
    53835383   func(); 
     
    53985398 else if (/applewebkit|KHTML/i.test(navigator.userAgent) ) /* Safari/WebKit/KHTML */ 
    53995399 { 
    5400    var _timer = scope.setInterval(function() 
     5400   Xinha.onloadTimer = scope.setInterval(function() 
    54015401   { 
    54025402     if (/loaded|complete/.test(scope.document.readyState)) 
  • trunk/XinhaLoader.js

    r943 r954  
    186186    arguments.callee.done = true; 
    187187    // kill the timer 
    188     if (_timer) clearInterval(_timer); 
     188    if (Xinha.onloadTimer) clearInterval(Xinha.onloadTimer); 
    189189     
    190190    func.call(); 
     
    204204  else if (/WebKit/i.test(navigator.userAgent)) 
    205205  { 
    206     var _timer = setInterval(function() 
     206    Xinha.onloadTimer = setInterval(function() 
    207207    { 
    208208      if (/loaded|complete/.test(document.readyState)) 
  • trunk/plugins/ExtendedFileManager/assets/manager.js

    r939 r954  
    219219        } 
    220220    } 
    221         iframeUrl = window.location.href.replace(_backend_url ,iframeUrl ); 
    222221        if ( startDir ) 
    223222        { 
Note: See TracChangeset for help on using the changeset viewer.