Changeset 9473


Ignore:
Timestamp:
Mar 2, 2011, 12:08:33 PM (10 years ago)
Author:
cljosse
Message:

[Autosize][beta] fix default scale to 1
.


Location:
extensions/Autosize
Files:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • extensions/Autosize/admin/template/header_2_1.tpl

    r8912 r9473  
    11{known_script id="jquery" src = $ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=0}
    22{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    3 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/ui.core.js"}
    4 {known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/ui.resizable.js"}
    5 {known_script id="jquery.ui.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/ui.slider.js"}
    6 {known_script id="jquery.ui.draggable" src=$ROOT_URL|@cat:"themes/default/js/ui/ui.draggable.js"}
     3{known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/minified/ui.core.min.js"}
    74
    85{known_script id="conflit_script" src = $AUTOSIZE_PATH|@cat:"js/conflit.js"  }
  • extensions/Autosize/admin/template/header_2_2.tpl

    r8913 r9473  
    1 {combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.js"}
     1{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "}
    22{combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
    33 {combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"}
    44 {combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"}
    5  
    6 {combine_script id="jquery.ui" path=$ROOT_URL|@cat:"themes/default/js/ui/ui.core.js" require="jquery"}
    7 {combine_script id="jquery.ui.resizable" path=$ROOT_URL|@cat:"themes/default/js/ui/ui.resizable.js" require="jquery,jquery.ui"}
    8 {combine_script id="jquery.ui.slider" path=$ROOT_URL|@cat:"themes/default/js/ui/ui.slider.js" require="jquery,jquery.ui"}
    9 {combine_script id="jquery.ui.draggable" path=$ROOT_URL|@cat:"themes/default/js/ui/ui.draggable.js" require="jquery,jquery.ui"}
     5{combine_script id="jquery.ui" path=$ROOT_URL|@cat:"themes/default/js/ui/minified/jquery.ui.core.min.js" require="jquery"}
  • extensions/Autosize/autosize.inc.php

    r9225 r9473  
    305305$my_para->mini_width2=(isset($_POST['mini_width2']))? $_POST['mini_width2']: ((isset($my_para->mini_width2)) ? $my_para->mini_width2:  '300') ;
    306306
    307 $my_para->echelle_max=(isset($_POST['echelle_max']))? $_POST['echelle_max'] : ((isset($my_para->echelle_max)) ? $my_para->echelle_max :  '1.2');
     307$my_para->echelle_max=(isset($_POST['echelle_max']))? $_POST['echelle_max'] : ((isset($my_para->echelle_max)) ? $my_para->echelle_max :  '1.0');
    308308$my_para->marge_basse=(isset($_POST['marge_basse']))? $_POST['marge_basse']: ((isset($my_para->marge_basse)) ? $my_para->marge_basse :  '0');
    309 $my_para->fade_in=(isset($_POST['fade_in']))? $_POST['fade_in']: ((isset($my_para->fade_in)) ? $my_para->fade_in :  '200');
     309$my_para->fade_in=(isset($_POST['fade_in']))? $_POST['fade_in']: ((isset($my_para->fade_in)) ? $my_para->fade_in :  '0');
    310310
    311311//===============================================================================       
  • extensions/Autosize/js/Affiche_script.js

    r9292 r9473  
    780780                         wingbo = img_finale.width;
    781781                         heightgbo = img_finale.height;
     782                         if (Type_Img == "panorama") {
     783                             heightgbo = info_theImage.height;
     784                             img_finale.height = info_theImage.height;
     785                         }
     786
    782787                         img_finale.width -= marges_llgbo;
    783788                         if (jQuery("#slideshow").infos().width > 0) {
     
    12521257
    12531258    if (llgboframe.height > 0) {
    1254 
     1259 ll2 = jQuery("#gbo div:last").infos(); 
    12551260        ll1 = jQuery("#gbo div:first").infos();
    1256         ll2 = jQuery("#gbo div:last").infos(); ;
     1261        ll2 ="" ;
     1262        jQuery("#gbo div").each(function (i) {
     1263       
     1264         if (  this.id=="") return ;
     1265ll2=this ;
     1266        });
     1267       ll2 = jQuery(ll2).infos(); 
    12571268        ll1 = ll1.width;
    12581269        ll2 = ll2.width - ll2.borderwidth.left - ll2.borderwidth.right;
  • extensions/Autosize/template/header_2_1.tpl

    r8981 r9473  
    44{known_script id="conflit_script" src = $AUTOSIZE_PATH|@cat:"js/conflit.js" }
    55{known_script id="dimensions" src = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" }
    6 
    7 {known_script
    8 id="cookie" src = $AUTOSIZE_PATH|@cat:"js/jquery.cookie.js" }
     6{known_script id="cookie" src = $AUTOSIZE_PATH|@cat:"js/jquery.cookie.js" }
    97{/html_head}
  • extensions/Autosize/template/header_2_2.tpl

    r9065 r9473  
    1 {combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.js"}
     1{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "}
    22{combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
    33{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"}
Note: See TracChangeset for help on using the changeset viewer.