Changeset 10611


Ignore:
Timestamp:
Apr 25, 2011, 3:51:54 PM (9 years ago)
Author:
Gotcha
Message:

combine_script remplace known_script
bug:2276

Location:
extensions/piclens
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • extensions/piclens/CHANGELOG

    r8903 r10611  
    66Version 0.4.x
    77-------------
     80.4.6 --> combine_script remplace known_script
    890.4.5 (not publish) --> Correct jquery path on config.tpl file
    9100.4.4 --> Résolution du bug:2116 (Bug d'affichage sur le dernier onglet de configuration)
  • extensions/piclens/admin/config.tpl

    r8902 r10611  
     1{include file='include/autosize.inc.tpl'}
    12
    2 {include file='include/autosize.inc.tpl'}
    3 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    4 {known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
    5 <script type="text/javascript">
    6 jQuery().ready(function(){ldelim}
    7   jQuery('.cluetip').cluetip({ldelim}
     3{combine_script id='jquery.packed' path='themes/default/js/jquery.packed.js'}
     4{combine_script id='jquery.cluetip' load='footer' require='jquery' path='themes/default/js/plugins/jquery.cluetip.js'}
     5 
     6{footer_script require='jquery.cluetip'}{literal}
     7jQuery(document).ready(function(){
     8  jQuery('.cluetip').cluetip({
    89    width: 400,
    910    splitTitle: '|'
    1011  });
    1112});
    12 </script>
     13{/literal}{/footer_script}
    1314
    1415{html_head}
    15 {literal}
    1616
    17 <script type="text/javascript">
     17{footer_script}{literal}
    1818
    1919window.onload = load;
     
    3636}
    3737
    38 </script>
     38{/literal}{/footer_script}
    3939
    40 
    41 {/literal}
    4240{/html_head}
    4341
  • extensions/piclens/admin/piclenswallconfig.tpl

    r8789 r10611  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
    3 {known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
     1{combine_script id='jquery.packed' path='themes/default/js/jquery.packed.js'}
    42
    53{html_head}
    64{/html_head}
    7 
    8 
    95
    106<div class="titrePage">
     
    155151               
    156152        </table>
    157 {literal}
    158 <script type="text/javascript">
     153{footer_script require='jquery.ui.core.packed,jquery.ui.resizable.packed'}{literal}
    159154resize = false;
    160155function show_cat_list()
     
    216211}
    217212
    218 </script>
    219 {/literal}
     213{/literal}{/footer_script}
    220214
    221215<br/>
  • extensions/piclens/admin/piclenswallconfig2.tpl

    r8789 r10611  
    1 {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
    2 {known_script id="jquery.ui" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.core.packed.js"}
    3 {known_script id="jquery.ui.resizable" src=$ROOT_URL|@cat:"themes/default/js/ui/packed/ui.resizable.packed.js"}
     1{combine_script id='jquery.packed' path='themes/default/js/jquery.packed.js'}
    42
    53{html_head}
     
    147145        </TABLE>
    148146       
    149 {literal}
    150 <script type="text/javascript" charset="utf-8">
    151  $(document).ready(function() {
    152      var f = $.farbtastic('#colorpicker');
     147{footer_script require='jquery.ui.core.packed,jquery.ui.resizable.packed'}{literal}
     148 jQuery(document).ready(function() {
     149     var f = jQuery.farbtastic('#colorpicker');
    153150     var selected;
    154      $('.colorwell')
     151     jQuery('.colorwell')
    155152       .each(function () { f.linkTo(this);  })
    156153       .focus(function() {
     
    159156       });
    160157  });
    161 </script>
    162 {/literal}
     158{/literal}{/footer_script}
    163159
    164160       
Note: See TracChangeset for help on using the changeset viewer.