Changeset 7741

Timestamp:

Nov 11, 2010, 10:57:42 AM (13 years ago)

Author:

cljosse

Message:

[Autosize][beta] save

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (2 diffs)
• js/Affiche_script.js (modified) (1 diff)
• js/conflit.js (modified) (2 diffs)

extensions/Autosize/autosize.inc.php

@@ -153 +153 @@
         static public function cl_autosize_script()
         {
-           global  $template,$user,$conf,$picture ;
-
+           global  $template,$user,$conf,$picture ,$page;
+           //userDefManage ??
                 $my_path =  basename(dirname(__FILE__)).'/' ;
             $my_path = dirname(__FILE__).'/';
                         $debug = isset($conf['debug']) ? $conf['debug'] : false ; 
                         $template->func_known_script(array('id'=>'jquery', 'src'=>get_root_url().'themes/default/js/jquery.packed.js'), $smarty);
+                $template->func_known_script(array('id'=>'jquery', 'src'=>$my_path. '/js/jconflit.js'), $smarty);
+        
+
+
+
                 $template->set_filenames(
                      array('autosize_init'=>$my_path. "template/conflit.tpl"  
@@ -169 +174 @@
                                                 'AUTOSIZE_ROOT' => AUTOSIZE_PATH)
                                                  );
-
+if(     $page['body_id'] == 'theAdminPage' ) return ;
                    return $template->parse( 'autosize_init', false);
 

extensions/Autosize/js/Affiche_script.js

@@ -1006 +1006 @@
 
                      });
-                     jQuery("#Debug1").text("info_theImage.height : " + info_theImage.height);
+                     jQuery("#Debug1").text("img_finale.heightt : " + img_finale.height);
                      //===================================================
                      jQuery("#Debug2").css({ position: "absolute",

extensions/Autosize/js/conflit.js

@@ -22 +22 @@
 var ret_element = "";
 if (retour.match(RegExp("jQuery", "gi"))) {
-        ret_element = jQuery(element);
+    ret_element = jQuery(element);
+} 
+        else if (retour.match(RegExp("rv_gmaps", "gi"))) {
+        ret_element = jQuery().$Prototype(element);
     } else if (retour.match(RegExp("GMaps", "gi"))) {
         ret_element = jQuery(element);
@@ -29 +32 @@
 } else if (retour.match(RegExp("luciano", "gi"))) {
     ret_element = jQuery().$Luciano(element);
-} else if (retour.match(RegExp("rv_gmaps", "gi"))) {
-        ret_element = jQuery().$Prototype(element);
+
 }else if (retour.match(RegExp("jQuery", "gi"))) {
         ret_element = jQuery(element);