Changeset 954

Timestamp:

01/30/08 18:52:48 (5 years ago)

Author:

ray

Message:

some fixes

Location:

trunk

Files:

• XinhaCore.js (modified) (2 diffs)
• XinhaLoader.js (modified) (2 diffs)
• plugins/ExtendedFileManager/assets/manager.js (modified) (1 diff)

trunk/XinhaCore.js

@@ -5379 +5379 @@
    arguments.callee.done = true;
    // kill the timer
-   if (_timer) clearInterval(_timer);
+   if (Xinha.onloadTimer) clearInterval(Xinha.onloadTimer);
 
    func();
@@ -5398 +5398 @@
  else if (/applewebkit|KHTML/i.test(navigator.userAgent) ) /* Safari/WebKit/KHTML */
  {
-   var _timer = scope.setInterval(function()
+   Xinha.onloadTimer = scope.setInterval(function()
    {
      if (/loaded|complete/.test(scope.document.readyState))

trunk/XinhaLoader.js

@@ -186 +186 @@
     arguments.callee.done = true;
     // kill the timer
-    if (_timer) clearInterval(_timer);
+    if (Xinha.onloadTimer) clearInterval(Xinha.onloadTimer);
     
     func.call();
@@ -204 +204 @@
   else if (/WebKit/i.test(navigator.userAgent))
   {
-    var _timer = setInterval(function()
+    Xinha.onloadTimer = setInterval(function()
     {
       if (/loaded|complete/.test(document.readyState))

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -219 +219 @@
         }
     }
-        iframeUrl = window.location.href.replace(_backend_url ,iframeUrl );
         if ( startDir )
         {