Commit c928f270 authored by hbcui1984's avatar hbcui1984

解决图片预览点击报错的bug

parent e393a2ba
This diff is collapsed.
...@@ -113,10 +113,15 @@ ...@@ -113,10 +113,15 @@
zoom.scrollerTransition(zoom.options.speed).scrollerTransform(0, 0); zoom.scrollerTransition(zoom.options.speed).scrollerTransform(0, 0);
zoom.zoomerTransition(zoom.options.speed).zoomerTransform(scale); zoom.zoomerTransition(zoom.options.speed).zoomerTransform(scale);
}; };
zoom.toggleZoom = function(position) { zoom.toggleZoom = function(position, speed) {
if (typeof position === 'number') {
speed = position;
position = undefined;
}
speed = typeof speed === 'undefined' ? zoom.options.speed : speed;
if (scale && scale !== 1) { if (scale && scale !== 1) {
scale = currentScale = 1; scale = currentScale = 1;
zoom.scrollerTransition(zoom.options.speed).scrollerTransform(0, 0); zoom.scrollerTransition(speed).scrollerTransform(0, 0);
} else { } else {
scale = currentScale = zoom.options.maxZoom; scale = currentScale = zoom.options.maxZoom;
if (position) { if (position) {
...@@ -142,12 +147,12 @@ ...@@ -142,12 +147,12 @@
} }
offsetX = Math.min(Math.max(offsetX, imageMinX), imageMaxX); offsetX = Math.min(Math.max(offsetX, imageMinX), imageMaxX);
offsetY = Math.min(Math.max(offsetY, imageMinY), imageMaxY); offsetY = Math.min(Math.max(offsetY, imageMinY), imageMaxY);
zoom.scrollerTransition(zoom.options.speed).scrollerTransform(offsetX, offsetY); zoom.scrollerTransition(speed).scrollerTransform(offsetX, offsetY);
} else { } else {
zoom.scrollerTransition(zoom.options.speed).scrollerTransform(0, 0); zoom.scrollerTransition(speed).scrollerTransform(0, 0);
} }
} }
zoom.zoomerTransition(zoom.options.speed).zoomerTransform(scale); zoom.zoomerTransition(speed).zoomerTransform(scale);
}; };
zoom._cal = function() { zoom._cal = function() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment