Changeset 7353

Timestamp:

Oct 23, 2010, 11:47:25 AM (14 years ago)

Author:

cljosse

Message:

[Autosize][beta] fix bug with Opera.

Location:

extensions/Autosize

Files:

• admin/template/admin.tpl (modified) (2 diffs)
• include/affiche.php (modified) (1 diff)
• js/Affiche_script.js (modified) (7 diffs)
• js/jquery.dimensions.js (added)
• template/autosize.tpl (modified) (3 diffs)

extensions/Autosize/admin/template/admin.tpl

@@ -25 +25 @@
      var normal_height = '{$normal_height}';
      var user_status = '{$user_status}';
-     var user_status = '{$user_status}';
+
      var check_auto_w = '{$check_auto_w}';
 
@@ -42 +42 @@
 {known_script id="jquery.ui.slider" src=$ROOT_URL|@cat:"themes/default/js/ui/ui.slider.js"}
 {known_script id="jquery.ui.draggable" src=$ROOT_URL|@cat:"themes/default/js/ui/ui.draggable.js"}
+{literal}
+<script type="text/javascript">
 
-<script type="text/javascript">
-jQuery().ready(function(){ldelim}
-  jQuery('.cluetip').cluetip({ldelim}
+jQuery().ready(function(){ 
+  jQuery('.cluetip').cluetip({ 
     width: 300,
     splitTitle: '|'
   });
 });
+
 </script>
-
+{/literal}
 <!--============== assign visible =======================-->    
 {assign var="affiche_cde" value="true"}

extensions/Autosize/include/affiche.php

@@ -2 +2 @@
 
 $visible=(isset($visible))?$visible:false;
-
-
-
 $img_width=isset($picture['current']['width'])?$picture['current']['width']:480;
 $img_height=isset($picture['current']['height'])?$picture['current']['height']:320;
 $version=isset($version)?$version:"";
 $theme=$user['theme'];
- $user_status = $user['status'] ;
+$user_status = $user['status'] ;
 
         $template->assign(

extensions/Autosize/js/Affiche_script.js

@@ -1 @@
-/*
-var thumbnail= '{$thumbnail}';
-var theme = '{$theme}';
-var version = '{$version}';
-var scaled_width = '{$SCALED_WIDTH}'; // valeur par defaut
-var scaled_height = '{$SCALED_HEIGHT}'; // valeur par defaut
-var img_width = '{$IMG_WIDTH }'; 
-var img_height = '{ $IMG_HEIGHT }';$picture['current']['height']
-
-var marge_basse = '{ $MARGE_BASSE }';
-var echelle_max = '{ $ECHELLE_MAX }';
-var mini_width = '{ $MINI_WIDTH   }';
-var mini_height = '{ $MINI_HEIGHT   }';
-
-var webmaster_width = '{$webmaster_width   }';
-var webmaster_height = '{ $webmaster_height   }';
-var admin_width = '{ $admin_width   }';
-var admin_height = '{ $admin_height   }';
-var generic_width = '{ $generic_width   }';
-var generic_height = '{ $generic_height   }';
-var guest_width = '{ $guest_width   }';
-var guest_height = '{$guest_height}';
-var normal_width = '{$normal_width}';
-var normal_height = '{$normal_height}';
-var user_status = '{$user_status}';
-var user_status = '{$user_status}';
-var check_auto_w = '{$check_auto_w}';
-var check_desc_v = '{$check_desc_v}';
-*/
-
-
-var img_top = "0";
-var cl_visible = true;
-
-  function Toggle_bp()
+jQuery(document).ready(
+      function (jQuery) {
+        var img_top = "0";
+        var cl_visible = true;
+        var old_h = 0;
+        var rapport = -1;
+        var old_w = 0;
+
+ function Toggle_bp()
  { 
- cl_visible = !cl_visible ;
-   if (cl_visible) src=src1 ;
-  else src=src2 ;
-     if (cl_visible)  src_info=src3 ;
-  else src_info=src4 ;
+     cl_visible = !cl_visible ;
+       if (cl_visible) src=src1 ;
+      else src=src2 ;
+         if (cl_visible)  src_info=src3 ;
+      else src_info=src4 ;
   
-        jQuery('#bp_cla').attr('alt',src_info);
-        jQuery('#bp_cla').attr('title', src_info);
-
-        jQuery('#bp_img_cla').get(0).src=src ;
-        jQuery('#bp_img_cla').attr('alt',src_info);
-        jQuery('#bp_img_cla').attr('title',src_info);
-        jQuery('#bp_cla').attr('Stitle', src_info);
-        jQuery('#bp_cla').attr('Stip'," ");
-        old_w = 0;
-        jQuery(window).resize();
+            jQuery('#bp_cla').attr('alt',src_info);
+            jQuery('#bp_cla').attr('title', src_info);
+
+            jQuery('#bp_img_cla').get(0).src=src ;
+            jQuery('#bp_img_cla').attr('alt',src_info);
+            jQuery('#bp_img_cla').attr('title',src_info);
+            jQuery('#bp_cla').attr('Stitle', src_info);
+            jQuery('#bp_cla').attr('Stip'," ");
+            old_w = 0;
+            jQuery(window).resize();
     }
     //=========================================================
-    var old_w = 0;
+
      function wait_Timer() {
          old_w = 0
@@ -214 +188 @@
         * return: valeur entiere
         */
-        function Get_Val_int(myObj, Maxi_val, Obj) {
+        function Get_Val_int(myObj, Maxi_val, Mini_val) {
             var val = 0;
             var reg1 = new RegExp("%", "g")
@@ -231 +205 @@
             }
             if (typeof (myObj) == "string") {
+                if (myObj == "none") return Maxi_val;
+                if (myObj == "auto") return Maxi_val;
+                if (Mini_val)
+                    if (myObj < Mini_val) return Maxi_val;
                 switch (myObj) {
                     case 'thin':
@@ -254 +232 @@
 
 
-                if (myObj == "none") return Maxi_val;
-                if (myObj == "auto") return Maxi_val;
+
 
                 if (myObj.match(reg1)) val = myObj * Maxi_val / 100;
@@ -287 +264 @@
 
 
-        jQuery(document).ready(
-       function (jQuery) {
+
+     
+
+
+   
            /* jQuery */
            var img_init = { height: img_height, width: img_width };  // taille initiale
@@ -313 +293 @@
            //===================================================================        
 
-           var old_h = 0;
-           var rapport = -1;
+
 
 
@@ -569 +548 @@
 
 
-               maxWidth = Get_Val_int(jQuery(TheImg).css("max-width"), winwidth);
-               maxHeight = Get_Val_int(jQuery(TheImg).css("max-height"), winheight);
+              var maxWidth = Get_Val_int(jQuery(TheImg).css("max-width"), winwidth,"0");
+               maxHeight = Get_Val_int(jQuery(TheImg).css("max-height"), winheight,"0");
 
                mini_width = parseInt(miniWidth);

extensions/Autosize/template/autosize.tpl

@@ -4 +4 @@
   {known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js" now=1} 
   {known_script id="conflit_script" src=$AUTOSIZE_PATH|@cat:"js/conflit.js"}
-   {known_script id="dimensions" src=$AUTOSIZE_PATH|@cat:"js/jquery.dimensions.min.js"}
+   {known_script id="dimensions" src=$AUTOSIZE_PATH|@cat:"js/jquery.dimensions.js"}
 {*jQuery is always available by default*} 
  <script type="text/javascript">
@@ -11 +11 @@
     var visible = '{$visible}';
     var version = '{$version}';
+
     var scaled_width =  '{$SCALED_WIDTH}'; // valeur par defaut
     var scaled_height = '{$SCALED_HEIGHT}'; // valeur par defaut
@@ -32 +33 @@
     var normal_height='{$normal_height}';
     var user_status='{$user_status}';
-    var user_status = '{$user_status}';
+   
     var check_auto_w = '{$check_auto_w}';
     var check_desc_v = '{$check_desc_v}';