Changeset 10736 for extensions/gally/gally-default/js

Timestamp:

May 1, 2011, 10:07:10 PM (13 years ago)

Author:

grum

Message:

bug:2291 ; compatibility with piwigo 2.2

Location:

extensions/gally/gally-default/js

Files:

• gallyjs-tcp.min.js (added)
• gallyjs-tcp.packed.js (deleted)
• gallyjs-tpp.js (modified) (6 diffs)
• gallyjs-tpp.min.js (added)
• gallyjs-tpp.packed.js (deleted)
• gallyjs-ttm.min.js (added)
• gallyjs-ttm.packed.js (deleted)
• simpleTip.min.js (added)
• simpleTip.packed.js (deleted)

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

@@ -50 +50 @@
   init = function()
   {
-    regexp = /[1234567]\./i;
+    var regexp = /[1234567]\./i;
 
     if(jQuery.browser.msie && jQuery.browser.version.match(regexp))
@@ -187 +187 @@
   initializeImageMode = function (mode)
   {
+    var thumbWidth=0,
+        imgTop=0,
+        cssValues = new Object;
+
     if(mode=="init")
     {
@@ -214 +218 @@
     }
 
-    cssValues = new Object;
     cssValues.height = $("#theImg").attr("height")+"px";
 
@@ -224 +227 @@
       $("#theImage").bind("mousemove",
         function(event){
-          deadArea = Math.max(options.imageScrollMinDeadArea, $("#navThumbPrev").attr("clientWidth")*1.2);
+          if($("#navThumbPrev").length>0) thumbWidth=$("#navThumbPrev").attr("clientWidth");
+          deadArea = Math.max(options.imageScrollMinDeadArea, thumbWidth*1.2);
           mouse=Math.max(Math.min(event.clientX-image.leftPos, this.clientWidth - deadArea), deadArea);
           $("#theImg")
@@ -523 +527 @@
   displayZoomHigh = function()
   {
-    container=calcImgHighPositionAndSize(image.zoomMode);
+    var container=calcImgHighPositionAndSize(image.zoomMode);
 
     $('#theImgHighContainer').css(
@@ -548 +552 @@
             function(event)
             {
-              deadArea = Math.max(options.marginContainer*2, options.imageScrollMinDeadArea);
-              mouseX=Math.max(Math.min(event.clientX-container.left, container.width - deadArea), deadArea);
-              mouseY=Math.max(Math.min(event.clientY-container.top, container.height - deadArea), deadArea);
+              var deadArea = Math.max(options.marginContainer*2, options.imageScrollMinDeadArea)
+                  mouseX=Math.max(Math.min(event.clientX-container.left, container.width - deadArea), deadArea),
+                  mouseY=Math.max(Math.min(event.clientY-container.top, container.height - deadArea), deadArea);
               $("#theImgHigh")
                 .css("left",Math.round((image.highWidth-container.width) * -(mouseX-deadArea)/(container.width-2*deadArea))+"px")