Changeset 11461 for extensions/Autosize

Timestamp:

Jun 21, 2011, 10:00:39 AM (13 years ago)

Author:

cljosse

Message:

[extensions] Autosize fix compatibility with gmaps

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (2 diffs)
• include/affiche.php (modified) (1 diff)
• js/conflit.js (modified) (3 diffs)
• js/conflit_2.js (modified) (2 diffs)
• main.inc.php (modified) (1 diff)
• template/conflit.tpl (modified) (1 diff)
• template/header_2_2.tpl (modified) (1 diff)
• template/picture.tpl (modified) (1 diff)

extensions/Autosize/autosize.inc.php

@@ -20 +20 @@
 // | USA.                                                                  |
 // +-----------------------------------------------------------------------+
-if (!defined('AUTOSIZE_PATH')) 
-define(
-  'AUTOSIZE_PATH',
-   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/'
-);
-if (!defined('ROOT_URL')) 
-define(  'ROOT_URL',  get_root_url().'/' );
- 
-if (!defined('AUTOSIZE_PATH_ABS')) 
-define(
-  'AUTOSIZE_PATH_ABS',  realpath(AUTOSIZE_PATH)."/"
-);
-
-
 class autosize_controler {
  //============================================================
@@ -57 +43 @@
     else 
       $file =AUTOSIZE_PATH_ABS.'template/header_2_2.tpl' ;
-   
-;
-
     $template->set_filenames(array('autosize_init_header'=> $file ));
     $template->set_filenames(array('autosize_init'=>AUTOSIZE_PATH_ABS. "template/conflit.tpl" ) );

extensions/Autosize/include/affiche.php

@@ -15 +15 @@
 $DEBUG_autosize = isset($conf['cl_debug_conflit']) ? $conf['cl_debug_conflit'] : $DEBUG_autosize ; 
 //=================================================================================================
-  $AUTOSIZE_PATH = AUTOSIZE_PATH_ABS;
+  $my_path = AUTOSIZE_PATH_ABS;
   $theme=$user['theme'];
   $user_status = $user['status'] ;

extensions/Autosize/js/conflit.js

@@ -65 +65 @@
 nbpa = 0;
 var Fn;
+if (typeof MooTools == "undefined" && typeof Prototype == "undefined") {
+
+} else {
+  $mootools = $;
+}
+//====================================================
 function conflit(element, nc) {
-  if(typeof DEBUG != "boolean") DEBUG = false ;
     //--- cl_conflit
     if (typeof MooTools == "undefined" && typeof Prototype == "undefined") {
@@ -530 +535 @@
         jQuery('#browser').val(browser.browser);
   }
-
-  if (typeof (Parent) == "undefined") return;
-
+    if (typeof (Parent) == "undefined")
+        Parent = "#theImage";
   info_image = jQuery(Parent).infos();
   p0 = jQuery(Parent);
@@ -573 +577 @@
 //--------------------------------------------------------------
 $_0 = $;
-
+    function $(element, nc0) {
+        if (typeof jQuery.fn.infos != "function")
+            if (typeof myjQuery != "undefined")
+                jQuery = myjQuery;
+        a = conflit(element, nc0);
+        return a;
+    }
 //=== ajout des fonctions jQuery ===
-$ = jQuery.fn.$;
-
-if (typeof $mootools != "undefined")
-  jQuery.extend($, $mootools);
-
-jQuery.extend($, $_0);
+    jQuery.extend($, jQuery);

extensions/Autosize/js/conflit_2.js

@@ -1 +1 @@
 
   //=== ajout des fonctions jQuery ===
-  if (typeof MooTools!= "undefined" && typeof Prototype == "undefined") {
+if (typeof MooTools == "undefined" && typeof Prototype == "undefined") {
     $mootools = window.$;
   } else {
@@ -17 +17 @@
     }
   }
-if (typeof Type_Img ) {}

extensions/Autosize/main.inc.php

@@ -12 +12 @@
 if (!defined('AUTOSIZE_PATH')) 
 define(  'AUTOSIZE_PATH',   PHPWG_PLUGINS_PATH.basename(dirname(__FILE__)).'/' );
+if (!defined('ROOT_URL')) 
+define(  'ROOT_URL',  get_root_url().'/' );
+ 
+if (!defined('AUTOSIZE_PATH_ABS')) 
+define(
+  'AUTOSIZE_PATH_ABS',  realpath(AUTOSIZE_PATH)."/"
+);
+
+
+
 
 //==================================================================

extensions/Autosize/template/conflit.tpl

@@ -12 +12 @@
      {if not empty($cl_plugins )}
        {foreach from=$cl_plugins item=cl_plug }
-      value='{$cl_plug}';cl_plugins.push(value);           
+            value="{$cl_plug}";cl_plugins.push(value);           
         {/foreach}
      {/if}
 {/if}
-</script>{/html_head}  
+</script>
+{/html_head} 

extensions/Autosize/template/header_2_2.tpl

@@ -4 +4 @@
 {else}
 {/if}
+{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery" }
 {* au cas ou jquery non défini  *}
-{combine_script id="conflit_script0" load="header" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" } 
-{combine_script id="jquery" load="header" path = "themes/default/js/jquery.min.js"}
-
-{if $combine_file}
-{combine_script id="cl_dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"} 
-{combine_script id="conflit_script" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery,cl_dimensions"   } 
-{else}
-{combine_script id="cl_dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"} 
-{ combine_script id="conflit_script" load="footer" path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery,cl_dimensions"} 
-
-{/if}
-{combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
-{combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery,conflit_script0"}
 
 
-{combine_script id="conflit_script2" load="async" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery,conflit_script" }
+
+{combine_script id="conflit_script"  path = $AUTOSIZE_PATH|@cat:"js/conflit.js" require="jquery" }
+{combine_script id="jquery.cluetip" path = "themes/default/js/plugins/jquery.cluetip.js" require="jquery" }
+{combine_script id="autosize.dimensions" path = $AUTOSIZE_PATH|@cat:"js/autosize.dimensions.js" require="jquery"}
+{combine_script id="autosize.cookie" path = $AUTOSIZE_PATH|@cat:"js/autosize.cookie.js" require="jquery"}
+
+
+{combine_script id="conflit_script2" load="async" path = $AUTOSIZE_PATH|@cat:"js/conflit_2.js" require="jquery" }
 
  

extensions/Autosize/template/picture.tpl

@@ -1 @@
- 
-
-
  <style type="text/css">
          #bp_cla {ldelim}