Changeset 9948


Ignore:
Timestamp:
03/31/11 12:16:12 (9 years ago)
Author:
cljosse
Message:

[extensions] autosize compatibility with piwigo 2.2.ORC4

Location:
extensions/Autosize
Files:
6 edited

Legend:

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

    r9473 r9948  
    1 {combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "}  
     1{get_combined_scripts load='header'}  
     2{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js"} 
    23{combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" } 
    3  {combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"}  
    4  {combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"}  
    5 {combine_script id="jquery.ui" path=$ROOT_URL|@cat:"themes/default/js/ui/minified/jquery.ui.core.min.js" require="jquery"} 
     4{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"}  
     5{combine_script id="dimensions" path = $AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js" require="jquery"}  
     6 
  • extensions/Autosize/autosize.inc.php

    r9473 r9948  
    3333  'AUTOSIZE_PATH_ABS',   $AUTOSIZE_PATH_ABS."/" 
    3434); 
    35  
    3635 
    3736 
  • extensions/Autosize/js/Affiche_script.js

    r9473 r9948  
     1 
     2if (typeof (randomPictOpt) == "undefined") { 
     3  var randomPictOpt = { 
     4    fixedHeight: 100, 
     5    delay: 10050, 
     6    showName: "n", 
     7    showComment: "n", 
     8    pictures: [ 
     9          { 
     10            'comment': '', 
     11            'link': "", 
     12            'name': '', 
     13            'thumb': "" 
     14          }           
     15                ] 
     16  }; 
     17} 
    118 
    219 
     
    591608 
    592609                 } 
     610                 MinWidth=jQuery(TheImg).css("minWidth"); 
     611                 if (MinWidth == "0px") 
     612                 MinWidth =mini_width; 
     613                     MinHeight = jQuery(TheImg).css("minHeight"); 
     614                 if (MinHeight == "0px") 
     615                     MinHeight = mini_height; 
     616 
     617                 MaxWidth = jQuery(TheImg).css("maxWidth"); 
     618                 if (MaxWidth == "0px") 
     619                     MaxWidth = winwidth; 
     620                 MaxHeight = jQuery(TheImg).css("maxHeight"); 
     621                 if (MaxHeight == "0px") 
     622                     MaxHeight = mwinheight; 
    593623 
    594624                 //=============== Vérification taille minimale  autorizée ====================== 
    595                  var miniWidth = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-width"), mini_width); 
    596                  var miniHeight = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-height"), mini_height); 
    597  
    598                  var miniWidth2 = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-width"), mini_width2); 
    599                  var miniHeight2 = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("min-height"), mini_height2); 
    600  
    601                  var maxWidth = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("max-width"), winwidth, "0"); 
    602                  maxHeight = jQuery(TheImg).Get_Val_int(jQuery(TheImg).css("max-height"), winheight, "0"); 
     625                 var miniWidth = jQuery(TheImg).Get_Val_int(MinWidth, mini_width); 
     626                 var miniHeight = jQuery(TheImg).Get_Val_int(MinHeight, mini_height); 
     627 
     628                 var miniWidth2 = jQuery(TheImg).Get_Val_int( MinWidth, mini_width2); 
     629                 var miniHeight2 = jQuery(TheImg).Get_Val_int( MinHeight, mini_height2); 
     630 
     631                 var maxWidth = jQuery(TheImg).Get_Val_int(MaxWidth, winwidth, "0"); 
     632                 maxHeight = jQuery(TheImg).Get_Val_int(MaxHeight, winheight, "0"); 
    603633 
    604634 
  • extensions/Autosize/js/conflit.js

    r9283 r9948  
    44//   $_SERVER['HTTP_USER_AGENT'] ; 
    55var OS, version; 
     6 
    67//==============================================================================  
    78browser = detect_browser(); 
  • extensions/Autosize/template/header_2_2.tpl

    r9473 r9948  
    1 {combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "}  
     1{get_combined_scripts load='header'} 
     2{combine_script id="jquery" load="header" path = $ROOT_URL|@cat:"themes/default/js/jquery.min.js "}  
    23{combine_script id="jquery.cluetip" path = $ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.js" require="jquery" }  
    34{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery"} 
  • extensions/Autosize/template/picture_2_2.tpl

    r8911 r9948  
    1 {combine_script id="Affiche_script" path= $AUTOSIZE_PATH|@cat:"js/Affiche_script.js" require='jquery' } 
     1{combine_script id="Affiche_script" path= $AUTOSIZE_PATH|@cat:"js/Affiche_script.js" require='jquery,cookie' } 
Note: See TracChangeset for help on using the changeset viewer.