Changeset 11066


Ignore:
Timestamp:
05/26/11 15:56:13 (9 years ago)
Author:
cljosse
Message:
  • load jquery.js if is missing
Location:
extensions/Autosize
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • extensions/Autosize/js/Affiche_script.js

    r10913 r11066  
    372372         newResize: function () { 
    373373           // 
    374            //if (options.imageAutosize) return true ;stripped 
     374           if (typeof options != undefined) 
     375             if (options.imageAutosize) 
     376               return true; //stripped 
    375377           if (DEBUG_autosize == "true") { 
    376378             nu_img += 1; 
     
    440442 
    441443               marge = (info_the_page.width - info_HeaderBar.width) / 2; 
    442                marge_right = marge; 
    443                marge_left = marge; 
     444               marge_right = marge + 2; 
     445               marge_left = marge + 2; 
    444446             } else if (info_ToolBar.width > 0) { 
    445447               marge = (info_the_page.width - info_ToolBar.width) / 2; 
     
    10361038             jQuery("#navThumbNext").css({ display: 'none' }); 
    10371039             jQuery("#navThumbPrev").css({ display: 'none' }); 
    1038              jQuery("#theImage").css({ marginTop: info_ToolBar.height+"px", marginLeft: "0px", 
    1039                width: winwidth+"px", 
     1040             jQuery("#theImage").css({ marginTop: info_ToolBar.height + "px", marginLeft: "0px", 
     1041               width: winwidth + "px", 
    10401042               height: winheight + "px" 
    10411043             }); 
     
    11131115             pos = "absolute"; 
    11141116             info_theImageBox = jQuery("#theImageAndTitle").infos(); 
     1117             p1 = jQuery(".randomButtons").infos(); 
     1118             p2=jQuery("#imageHeaderBar").infos(); 
     1119             jQuery("#theImage").width("width", info_theImageBox.width + "px"); 
     1120             jQuery("#theImageAndTitle").css("position", "relative"); 
     1121             jQuery("#theImageAndTitle").css({marginTop: "0px", 
     1122               paddingTop: (p1.top) + "px" 
     1123             }); 
    11151124             t1 = info_theImageBox.top; 
    11161125             l1 = info_theImageBox.left; 
  • extensions/Autosize/template/header_2_2.tpl

    r10913 r11066  
    33 <script  id="pamoorama0.3" src="plugins/paMOOramics/js/pamoorama0.3.js" type="text/jscript"></script> 
    44<script id="mootools" src="plugins/paMOOramics/js/mootools.js" type="text/jscript"></script> 
    5  
    6  
    7 {else}{/if}{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" 
    8 require="jquery" } 
     5{else} 
     6{/if} 
     7{* au ou jquery non défini  *} 
     8{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"} 
     9{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery" } 
    910{combine_script id="conflit_script"  path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery" } 
    1011{combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
    11 {combine_script id="autosize.dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"} 
    12 {combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery"} 
     12{combine_script id="autosize.dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery,conflit_script0"} 
     13{combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery,conflit_script0"} 
    1314 
    1415 
Note: See TracChangeset for help on using the changeset viewer.