Changeset 877 for trunk


Ignore:
Timestamp:
08/12/07 15:50:03 (12 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:
3 edited

Legend:

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

    r856 r877  
    8181      // Locate to the correct directory 
    8282      var dreg = new RegExp('^(.*/)([^/]+)$'); 
    83       if(dreg.test(param['f_url'])) 
     83      if(dreg.test(param['f_url']) && !(new RegExp('^https?://','i')).test(param['f_url'])) 
    8484      { 
    8585        changeDir(RegExp.$1); 
     
    212212        { 
    213213                if(typeof imgManager != 'undefined') 
    214                         imgManager.changeDir(newDir); 
     214    {       
     215            imgManager.changeDir(newDir); 
     216    } 
    215217        } 
    216218 
     
    336338                } 
    337339        } 
     340   
    338341        addEvent(window, 'load', init); 
  • trunk/plugins/ImageManager/images.php

    r677 r877  
    210210 
    211211        if(window.top) 
    212                 HTMLArea = window.top.HTMLArea; 
     212    HTMLArea = Xinha    = window.top.Xinha; 
    213213 
    214214        function hideMessage() 
     
    275275</script> 
    276276<script type="text/javascript" src="<?php print $IMConfig['base_url'];?>assets/images.js"></script> 
     277<script type="text/javascript" src="../../popups/popup.js"></script> 
    277278<script type="text/javascript" src="assets/popup.js"></script> 
    278279</head> 
  • trunk/popups/popup.js

    r797 r877  
    1111// 
    1212// $Id$ 
    13 Xinha = window.opener.Xinha; 
     13if(typeof Xinha == 'undefined') 
     14  Xinha = window.opener.Xinha; 
     15 
    1416// Backward compatibility will be removed some time or not? 
    15 HTMLArea = window.opener.Xinha; 
     17HTMLArea = Xinha; 
    1618 
    1719function getAbsolutePos(el) { 
Note: See TracChangeset for help on using the changeset viewer.