Changeset 918 for trunk/plugins/ExtendedFileManager/assets

Timestamp:

10/30/07 23:31:54 (13 years ago)

Author:

ray

Message:

#1100 Extended File Manager - Error after opening window

File:

• trunk/plugins/ExtendedFileManager/assets/manager.js (modified) (5 diffs)

trunk/plugins/ExtendedFileManager/assets/manager.js

@@ -89 +89 @@
 
     var param = window.dialogArguments.param;
-
+    var startDir = null;
+        
     if(manager_mode=="image" && param)
     {
@@ -141 +142 @@
         if (dreg.test(param['f_url']))
         {
-          changeDir(RegExp.$1);
-          var dirPath = document.getElementById('dirPath');
-          for(var i = 0; i < dirPath.options.length; i++)
-          {
-            if(dirPath.options[i].value == encodeURIComponent(RegExp.$1))
-            {
-              dirPath.options[i].selected = true;
-              break;
-            }
-          }
+                  startDir = RegExp.$1;
         }
 
@@ -174 +166 @@
 
         // Locate to the correct directory
-        var startDir;
         var dreg = new RegExp('^(.*/)([^/]+)$');
         if (dreg.test(param['f_href']))
@@ -186 +177 @@
         }
         
-        if (startDir)
-        {
-          changeDir(startDir);
-          var dirPath = document.getElementById('dirPath');
-          for(var i = 0; i < dirPath.options.length; i++)
-          {
-            if(dirPath.options[i].value == encodeURIComponent(RegExp.$1))
-            {
-              dirPath.options[i].selected = true;
-              break;
-            }
-          }
-        }
-
         if (param)
         {
@@ -238 +215 @@
     else if (!param)
     {
-        var startDir = document.cookie.match(new RegExp ("EFMStartDir" + manager_mode + "=(.*?)(;|$)"));
+        startDir = document.cookie.match(new RegExp ("EFMStartDir" + manager_mode + "=(.*?)(;|$)"));
         if (startDir)
         {
                 startDir = startDir[1];
-                changeDir(startDir);
-                var dirPath = document.getElementById('dirPath');
-                for(var i = 0; i < dirPath.options.length; i++)
-                {
-                  if(dirPath.options[i].value == encodeURIComponent(startDir))
-                  {
-                    dirPath.options[i].selected = true;
-                    break;
-                  }
-                }
         }
+    }
+        if ( startDir )
+    {
+         Xinha._addEvent(imgManager,'load', function () {
+                changeDir(startDir);
+                var dirPath = document.getElementById('dirPath');
+                for(var i = 0; i < dirPath.options.length; i++)
+                {
+                    if(dirPath.options[i].value == encodeURIComponent(startDir))
+                    {
+                        dirPath.options[i].selected = true;
+                        break;
+                    }
+                }
+            } );
     }
     if (manager_mode == 'image' && typeof Xinha.colorPicker != "undefined" && document.getElementById('f_backgroundColor') && document.getElementById('f_backgroundColor').type == 'text') {