Changeset 12592 for extensions/gally/gally-default/js/gallyjs-tcp.js

Timestamp:

Nov 11, 2011, 12:10:02 AM (12 years ago)

Author:

grum

Message:

feature:2499 - compatibility with Piwigo 2.3

File:

• extensions/gally/gally-default/js/gallyjs-tcp.js (modified) (14 diffs)

extensions/gally/gally-default/js/gallyjs-tcp.js

@@ -4 +4 @@
   ------------------------------------------------------------------------------
   file: gally/gallyjs-tcp.js
-  file release: 1.4.0
+  file release: 1.4.4
   ------------------------------------------------------------------------------
   author: grum at piwigo.org
@@ -32 +32 @@
   initContentDesc = function()
   {
+    var tmpInfo='';
+
     if(($("#additional_infoTOP").length + $("#additional_infoBOTTOM").length)<2)
     {
@@ -70 +72 @@
 
     // <!--up-down--> tag
-    txt = $("#additional_infoLEFT").attr("innerHTML");
+    txt = $("#additional_infoLEFT").prop("innerHTML");
     if(txt==null) { txt=""; }
     tmp = txt.indexOf("<!--up-down-->");
@@ -76 +78 @@
     if(tmp>-1)
     { // tag is not managed by the ExtendedDescription plugin
-      $("#additional_infoTOP").attr("innerHTML", txt.slice(0,tmp));
+      $("#additional_infoTOP").prop("innerHTML", txt.slice(0,tmp));
       txt=txt.substr(tmp+14); //remove the tag
     }
@@ -85 +87 @@
           if(this.id=="")
           {
-            $("#additional_infoTOP").attr("innerHTML", $("#additional_infoTOP").attr("innerHTML")+this.innerHTML);
+            $("#additional_infoTOP").prop("innerHTML", $("#additional_infoTOP").prop("innerHTML")+this.innerHTML);
             this.parentNode.removeChild(this);
           }
@@ -97 +99 @@
     if(tmp>-1)
     { // tag is present, cut the right text to the
-      $("#additional_infoBOTTOM").attr("innerHTML", txt.slice(0,tmp));
+      $("#additional_infoBOTTOM").prop("innerHTML", txt.slice(0,tmp));
       txt=txt.substr(tmp+17);
     }
 
-    $("#additional_infoLEFT").attr("innerHTML", txt);
+    $("#additional_infoLEFT").prop("innerHTML", txt);
 
     if((txt.replace(/\s*/im, "")=="")&&($("#additional_infoID").length>0))
@@ -110 +112 @@
     $(".additional_info").css("visibility", "visible");
 
-    if($("#additional_infoBOTTOM").attr("innerHTML").replace(/\s*/im, "")=="")
+    tmpInfo=$("#additional_infoBOTTOM").prop("innerHTML");
+    if(tmpInfo==null) tmpInfo='';
+
+    if(tmpInfo.replace(/\s*/im, "")=="")
     {
       // remove the bottom area if empty
@@ -120 +125 @@
     }
 
-    if($("#additional_infoTOP").attr("innerHTML").replace(/\s*/im, "")=="")
+    tmpInfo=$("#additional_infoTOP").prop("innerHTML");
+    if(tmpInfo==null) tmpInfo='';
+    if(tmpInfo.replace(/\s*/im, "")=="")
     {
       // remove the top area if empty
@@ -138 +145 @@
         {
           visibility:"hidden",
-          top: $("#titrePageID").attr("offsetTop")+$("#titrePageID").attr("offsetHeight")-2+'px'
+          top: $("#titrePageID").prop("offsetTop")+$("#titrePageID").prop("offsetHeight")-2+'px'
         }
       );
@@ -167 +174 @@
         function (index, elem)
         {
-          //alert($(this.parentNode).attr('offsetWidth')+"---"+$(this.parentNode).attr('id'));
-          $(this).css("min-width", $(this.parentNode).attr('offsetWidth'));
+          //alert($(this.parentNode).prop('offsetWidth')+"---"+$(this.parentNode).prop('id'));
+          $(this).css("min-width", $(this.parentNode).prop('offsetWidth'));
           if(jQuery.browser.msie)
           {
@@ -194 +201 @@
             height:"auto"
           }).fadeTo(options.animateDelay,1);
-          $("#icon_menu").attr("className", "button2");
+          $("#icon_menu").toggleClass("button button2");
           menuState=true;
           break;
@@ -204 +211 @@
             });
           });
-          $("#icon_menu").attr("className", "button");
+          $("#icon_menu").toggleClass("button button2");
           menuState=false;
       }
@@ -217 +224 @@
             height:"auto"
           });
-          $("#icon_menu").attr("className", "button2");
+          $("#icon_menu").toggleClass("button button2");
           menuState=true;
           break;
@@ -225 +232 @@
             height:"0px"
           });
-          $("#icon_menu").attr("className", "button");
+          $("#icon_menu").toggleClass("button button2");
           menuState=false;
       }