Changeset 877

Timestamp:

08/12/07 15:50:03 (6 years ago)

Author:

gogo

Message:

ImageManager wasn't resizing and also was generating errors because the iframe didn't load popups/popup.js to
define Xinha.*

ticket:1058

Location:

trunk

Files:

• plugins/ImageManager/assets/manager.js (modified) (3 diffs)
• plugins/ImageManager/images.php (modified) (2 diffs)
• popups/popup.js (modified) (1 diff)

trunk/plugins/ImageManager/assets/manager.js

@@ -81 +81 @@
       // Locate to the correct directory
       var dreg = new RegExp('^(.*/)([^/]+)$');
-      if(dreg.test(param['f_url']))
+      if(dreg.test(param['f_url']) && !(new RegExp('^https?://','i')).test(param['f_url']))
       {
         changeDir(RegExp.$1);
@@ -212 +212 @@
         {
                 if(typeof imgManager != 'undefined')
-                        imgManager.changeDir(newDir);
+    {      
+            imgManager.changeDir(newDir);
+    }
         }
 
@@ -336 +338 @@
                 }
         }
+  
         addEvent(window, 'load', init);

trunk/plugins/ImageManager/images.php

@@ -210 +210 @@
 
         if(window.top)
-                HTMLArea = window.top.HTMLArea;
+    HTMLArea = Xinha    = window.top.Xinha;
 
         function hideMessage()
@@ -275 +275 @@
 </script>
 <script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/images.js"></script>
+<script type="text/javascript" src="../../popups/popup.js"></script>
 <script type="text/javascript" src="assets/popup.js"></script>
 </head>

trunk/popups/popup.js

@@ -11 +11 @@
 //
 // $Id$
-Xinha = window.opener.Xinha;
+if(typeof Xinha == 'undefined')
+  Xinha = window.opener.Xinha;
+
 // Backward compatibility will be removed some time or not?
-HTMLArea = window.opener.Xinha;
+HTMLArea = Xinha;
 
 function getAbsolutePos(el) {