Changeset 22467

Timestamp:

May 2, 2013, 5:56:33 PM (11 years ago)

Author:

cljosse

Message:

[extensions] Autosize update to piwigo 2.5 (fix bugs with jquery 1.9 )

Location:

extensions/Autosize

Files:

• autosize.inc.php (modified) (2 diffs)
• js/Affiche_script.js (modified) (18 diffs)
• js/JScript.js (modified) (1 diff)
• js/autosizeDetect.js (modified) (1 diff)
• js/autosize_ajax.js (modified) (1 diff)
• js/conflit.js (modified) (1 diff)
• main.inc.php (modified) (1 diff)
• template/picture.tpl (modified) (1 diff)

extensions/Autosize/autosize.inc.php

@@ -294 +294 @@
                                 <script type='text/javascript' src='plugins/Autosize/js/autosizeDetect.js'></script>
                                 <script type='text/javascript' src='plugins/Autosize/js/autosize.cookie.js'></script>
-                                <script type='text/javascript' src='themes/default/js/plugins/jquery.ajaxmanager.js'></script>";
+                        ";
                 $set_miniature .= "<script type='text/javascript' src='plugins/Autosize/js/autosize_ajax.js' id='autosize_ajax' >  </script >";
                 $set_var = "<script type='text/javascript'>\n var COOKIE_PATH =  '".cookie_path()."';\n";
@@ -1005 +1005 @@
                         //=======================================================================================
                         if($nosrc!=true  ){
-                                $script_miniatures = "<script type='text/javascript' src='".PHPWG_ROOT_PATH."themes/default/js/plugins/jquery.ajaxmanager.js' ></script>";
+                                $script_miniatures = "";
                                 $script_miniatures .= "<script type='text/javascript' src='".PHPWG_ROOT_PATH."plugins/Autosize/js/autosize_ajax.js' id='autosize_ajax' >  </script >";
                                 $nosrc=true ;

extensions/Autosize/js/Affiche_script.js

@@ -805 +805 @@
     // REPONSE TRIGGER
     // ===========================================================
-    jQuery('#ret_autosize').live('ON', function (e) {
+    jQuery(document).on('ON','#ret_autosize', function (e) {
       if (nu_img == "") nu_img = 8;
       jQuery(jQuery('.debug').get(nu_img)).trigger('ON');
@@ -825 +825 @@
     // jQuery("#llgbo").trigger("ON");
     // ==================================
-    jQuery(llgbo_id).live('ON', function (e) {
+    jQuery(window).on('ON',llgbo_id, function (e) {
       n_id = this;
       infos_llgbo = jQuery(llgbo_id).infos();
@@ -845 +845 @@
     // jQuery("#mapPicture").trigger("ON");
     // ==============================
-    jQuery("#mapPicture").live('ON', function (e) {
+    jQuery(window).on('ON',"#mapPicture", function (e) {
       p2 = jQuery("#infoSwitcher").infos();
     });
@@ -851 +851 @@
     // jQuery("#map").trigger("ON");
     // ==============================
-    jQuery("#map").live('ON', function (e) {
+    jQuery(window).on('ON', "#map", function (e) {
       p2 = jQuery("#map").infos();
     });
@@ -857 +857 @@
     // jQuery(theImage_id).trigger("ON");
     // ===================================
-    jQuery("#imageInfos").live('on', function (e) {
+    jQuery(window).on('ON', "#imageInfos", function (e) {
       target = e.target.id;
     });
@@ -864 +864 @@
     // jQuery(theImage_id).trigger("ON");
     // ===================================
-    jQuery(theImage_id).live('ON', function (e) {
+    jQuery(window).on('ON', theImage_id, function (e) {
       target = e.target.id;
 
@@ -871 +871 @@
     });
 
-    jQuery("#theMainImage").load(function (e) {
+    jQuery("#theMainImage").on("load",function (e) {
       if (!e.target.src) return;
       if (e.target.src.match(RegExp("gif", "gi"))) {
@@ -878 +878 @@
 
     });
+
+
     jQuery("#theMainImage").resize(function (e) {
 
@@ -890 +892 @@
 
     // =================================================================
-    jQuery(document).live('gallyInterfaceReady', function (e) {
+    jQuery(document).on('on','gallyInterfaceReady', function (e) {
       i = jQuery(this).text();
       jQuery(this).trigger('ON');
@@ -921 +923 @@
     // jQuery("#theImageAndInfos").trigger("ON");
     // ===========================================
-    jQuery("#theImageAndInfos").live('ON', function (e) {
+    jQuery(window).on('ON', "#theImageAndInfos", function (e) {
       infos_theImageAndInfos = jQuery("#theImageAndInfos").infos();
       // setTimeout(function () { Autosize_resize(true) }, 100);
@@ -1037 +1039 @@
       nauto = Get_dimensions(true, parametres);
       if (nauto == "Wait") {
-        setTimeout(function (force, parametres) { Autosize_resize(force, parametres); }, 100);
+        setTimeout(function (force, parametres) { Autosize_resize(force,options); }, 100);
         return;
       }
@@ -1190 +1192 @@
       mypanorama = window.myPamoorama;
       if (mypanorama) {
-        jQuery(mypanorama).live('ON', function (e) {
+        jQuery(window).on('ON', mypanorama, function (e) {
           jQuery(jQuery('.debug').get(1)).trigger('ON');
           Autosize_resize(true, options);
@@ -1199 +1201 @@
         // jQuery(theImage_id).trigger("Start_right");
         // ===============================================
-        jQuery(mypanorama).live('Start_right', function (e) {
+        jQuery(window).on('Start_right', mypanorama, function (e) {
           if (typeof Zone_image == "undefined") return
           test_w = window.myPamoorama.autoSlideFx.to;
@@ -1214 +1216 @@
         // jQuery(theImage_id).trigger("Start_left");
         // ===============================================
-        jQuery(mypanorama).live('Start_left', function (e) {
+        jQuery(window).on('Start_left', mypanorama, function (e) {
           if (typeof Zone_image == "undefined") return
           jQuery(theImage_id).show(0);
@@ -1823 +1825 @@
       if (Type_Img != "map" && Type_Img != "iframe")
         if (Select_Image() == "Wait") {
-          return "Wait";
+          if (!Zone_image.src.match("error"))  
+        return "Wait";
         }
       useMap = options.pictureSelType;
@@ -2024 +2027 @@
     * DEBUG ....
     **************************************************************************/
-    /*
-    * if (DEBUG_autosize.match("true",gi)) { for (var i = 0; i < 10; i++) {
-    * jQuery('#adddebugs').click(); } jQuery(jQuery('.debug').get(i -
-    * 1)).click(); }
-    */
+    /**/
+      if (DEBUG_autosize.match(new RegExp( "true","gi") )) { for (var i = 0; i < 10; i++) {
+      jQuery('#adddebugs').click(); } jQuery(jQuery('.debug').get(i -
+      1)).click(); }
+    
 
     // Custom Event, ON to turn on a debug.
-    jQuery('.debug').live('ON', function (e) {
+    jQuery(document).on('ON','.debug', function (e) {
 
       nu_img = jQuery(this).text();
@@ -2040 +2043 @@
 
     // On Click = debugs On
-    jQuery('.debug').live('click', function (e) {
+    jQuery(document).on('click','.debug', function (e) {
       i = jQuery(this).text();
       jQuery(this).trigger('ON');
@@ -2046 +2049 @@
 
     // Custom Event, Turn off a debug
-    jQuery('.debug').live('OFF', function (e) {
+    jQuery('.debug').on('OFF', '.debug', function (e) {
       jQuery(this).removeClass('debugOn');
     });
 
     // on Double Click, remove the debug from the DOM
-    jQuery('.debug').live('dblclick', function () {
+    jQuery('.debug').on('dblclick', '.debug', function (e) {
       jQuery(this).fadeOut(function () { jQuery(this).remove(); });
     });

extensions/Autosize/js/JScript.js

@@ -22 +22 @@
 
 jQuery(document).ready(function (jQuery) {
-  jQuery(window).load(function () {  
+  jQuery(window).on("load", function () {  
     if (jQuery("#scrolltotop").length == 0)
       jQuery('#scrolltobottom').before('<div id="scrolltotop" ><a title="Revenir en haut de la page" href="#"></a></div>');

extensions/Autosize/js/autosizeDetect.js

@@ -1 +1 @@
 jQuery(document).ready(function (jQuery) {
-  jQuery(window).load(function (e) {
+  jQuery(window).on("load", function (e) {
     var myWidth = 0, myHeight = 0;
     if (typeof (window.innerWidth) == 'number') {

extensions/Autosize/js/autosize_ajax.js

@@ -56 +56 @@
     jQuery("body").append("<div style='position:abosolute;left:-200;top:-200'>");
   if (derivatives.elements.length) {
-    if (derivatives.total - derivatives.done > 0)
-      setTimeout("Set_images(params.src)", 500 * (derivatives.total - derivatives.done));
+    //if (derivatives.total - derivatives.done > 0)
+    //  setTimeout(function () { Set_images(params.src); }, 500 * (derivatives.total - derivatives.done));
      }
         } //ready 

extensions/Autosize/js/conflit.js

@@ -174 +174 @@
 jQuery(document).ready(
     function (jQuery) {
-      jQuery(window).load(function () {
+      jQuery(window).on("load", function () {
         //==============================================================
 

extensions/Autosize/main.inc.php

@@ -2 +2 @@
 /*
  Plugin Name: AutoSize
-Version: 3.1.3
+Version: 3.1.4
 Description: Ajuste l'affichage des photos en fonction de la hauteur de la fenetre de navigation
 Plugin URI: http://piwigo.org/ext/extension_view.php?eid=448

extensions/Autosize/template/picture.tpl

@@ -29 +29 @@
 
    {if $ASP.width}
-   jQuery(window).load(function () {ldelim}
+   jQuery(window).on("load", function () {ldelim}
    asp_options ={ldelim} };
    if(typeof $("#imageToolBar") !="undefined" )