Merge branch 'Zakay-master'

elevateweb · Jun 28, 2015 · f8a8cfe · f8a8cfe
2 parents 29cafcd + 30c027f
commit f8a8cfe
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/jquery.elevatezoom.js b/jquery.elevatezoom.js
@@ -172,7 +172,7 @@ if ( typeof Object.create !== 'function' ) {
 						+ "margin-top: " + String(borderWidth) + ";"         
 						+ "background-position: 0px 0px;"
 						+ "width: " + String(self.nzWidth) + "px;"
-						+ "height: " + String(self.nzHeight)
+						+ "height: " + String(self.nzHeight) + "px;"
 						+ "px;float: left;"
 						+ "display: none;"
 						+ "cursor:"+(self.options.cursor)+";"
@@ -659,7 +659,7 @@ if ( typeof Object.create !== 'function' ) {
 				}
 
 				// if the mouse position of the slider is one of the outerbounds, then hide  window and lens
-				if (self.mouseLeft <= 0 || self.mouseTop < 0 || self.mouseLeft > self.nzWidth || self.mouseTop > self.nzHeight ) {				          
+				if (self.mouseLeft < 0 || self.mouseTop < 0 || self.mouseLeft > self.nzWidth || self.mouseTop > self.nzHeight ) {				          
 					self.setElements("hide");
 					return;
 				}
@@ -774,7 +774,13 @@ if ( typeof Object.create !== 'function' ) {
 				if(change == "hide"){
 					if(self.isWindowActive){
 						if(self.options.zoomWindowFadeOut){
-							self.zoomWindow.stop(true, true).fadeOut(self.options.zoomWindowFadeOut);
+							self.zoomWindow.stop(true, true).fadeOut(self.options.zoomWindowFadeOut, function () {
+								if (self.loop) {
+									//stop moving the zoom window when zoom window is faded out
+									clearInterval(self.loop);
+									self.loop = false;
+								}
+							});
 						}
 						else{self.zoomWindow.hide();}
 						self.isWindowActive = false;        
@@ -995,13 +1001,15 @@ if ( typeof Object.create !== 'function' ) {
 					}
 					// adjust images less than the window height
 
-					if(self.largeHeight < self.options.zoomWindowHeight){
+					if (self.options.zoomType == "window") {
+						if (self.largeHeight < self.options.zoomWindowHeight) {
 
-						self.windowTopPos = 0;
+							self.windowTopPos = 0;
+						}
+						if (self.largeWidth < self.options.zoomWindowWidth) {
+							self.windowLeftPos = 0;
+						}
 					}
-					if(self.largeWidth < self.options.zoomWindowWidth){
-						self.windowLeftPos = 0;
-					}       
 
 					//set the zoomwindow background position
 					if (self.options.easing){
@@ -1071,6 +1079,12 @@ if ( typeof Object.create !== 'function' ) {
 									self.loop = false;
 
 								}
+								else if (Math.round(Math.abs(self.xp - self.windowLeftPos) + Math.abs(self.yp - self.windowTopPos)) < 1) {
+									//stops micro movements
+									clearInterval(self.loop);
+									self.zoomWindow.css({ backgroundPosition: self.windowLeftPos + 'px ' + self.windowTopPos + 'px' });
+									self.loop = false;
+								}
 								else{
 									if(self.changeBgSize){    
 										if(self.nzHeight>self.nzWidth){ 
@@ -1171,7 +1185,6 @@ if ( typeof Object.create !== 'function' ) {
 					self.largeHeight = newImg.height;
 					self.zoomImage = largeimage;
 					self.zoomWindow.css({ "background-size": self.largeWidth + 'px ' + self.largeHeight + 'px' });
-					self.zoomWindow.css({ "background-size": self.largeWidth + 'px ' + self.largeHeight + 'px' });
 
 
 					self.swapAction(smallimage, largeimage);
@@ -1774,4 +1787,4 @@ if ( typeof Object.create !== 'function' ) {
 			onImageSwapComplete: $.noop
 	};
 
-})( jQuery, window, document );
+})( jQuery, window, document );