Little bug fix

indrimuska · Nov 4, 2015 · ca2a1c9 · ca2a1c9
1 parent 1040a1b
commit ca2a1c9
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 18 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "zoomify",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "authors": [
     "Indri Muska <[email protected]>"
   ],

diff --git a/dist/zoomify.js b/dist/zoomify.js
@@ -84,8 +84,8 @@
 		this.$image.addClass('zoomed');
 
 		var offset     = this.$image.offset(),
-			width      = this.$image.width(),
-			height     = this.$image.height(),
+			width      = this.$image.outerWidth(),
+			height     = this.$image.outerHeight(),
 			wWidth     = $(window).width(),
 			wHeight    = $(window).height(),
 			scaleX     = wWidth / width,
@@ -97,11 +97,11 @@
 		this.transform(this.$image, transform);
 
 		this._zooming = true;
-		that.$image.trigger('zoom-in.zoomify');
+		this.$image.trigger('zoom-in.zoomify');
 		setTimeout(function () {
 			that.addShadow();
 			that.transformScaleAndTranslate(scale, translateX, translateY, function () {
-				this._zooming = false;
+				that._zooming = false;
 				that.$image.trigger('zoom-in-complete.zoomify');
 			});
 			that._zoomed = true;
@@ -111,10 +111,10 @@
 		var that = this;
 
 		this._zooming = true;
-		that.$image.trigger('zoom-out.zoomify');
+		this.$image.trigger('zoom-out.zoomify');
 		this.transformScaleAndTranslate(1, 0, 0, function () {
-			this._zooming = false;
-			that.$image.trigger('zoom-out-complete.zoomify');
+			that._zooming = false;
+			that.$image.removeClass('zoomed').trigger('zoom-out-complete.zoomify');
 		});
 		this.removeShadow();
 		this._zoomed = false;

diff --git a/dist/zoomify.min.js b/dist/zoomify.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "zoomify",
-  "version": "0.2.0",
+  "version": "0.2.1",
   "description": "Zoomify is a jQuery plugin for simple lightboxes with zoom effect.",
   "main": "Gruntfile.js",
   "repository": {

diff --git a/src/zoomify.js b/src/zoomify.js
@@ -84,8 +84,8 @@
 		this.$image.addClass('zoomed');
 
 		var offset     = this.$image.offset(),
-			width      = this.$image.width(),
-			height     = this.$image.height(),
+			width      = this.$image.outerWidth(),
+			height     = this.$image.outerHeight(),
 			wWidth     = $(window).width(),
 			wHeight    = $(window).height(),
 			scaleX     = wWidth / width,
@@ -97,11 +97,11 @@
 		this.transform(this.$image, transform);
 
 		this._zooming = true;
-		that.$image.trigger('zoom-in.zoomify');
+		this.$image.trigger('zoom-in.zoomify');
 		setTimeout(function () {
 			that.addShadow();
 			that.transformScaleAndTranslate(scale, translateX, translateY, function () {
-				this._zooming = false;
+				that._zooming = false;
 				that.$image.trigger('zoom-in-complete.zoomify');
 			});
 			that._zoomed = true;
@@ -111,10 +111,10 @@
 		var that = this;
 
 		this._zooming = true;
-		that.$image.trigger('zoom-out.zoomify');
+		this.$image.trigger('zoom-out.zoomify');
 		this.transformScaleAndTranslate(1, 0, 0, function () {
-			this._zooming = false;
-			that.$image.trigger('zoom-out-complete.zoomify');
+			that._zooming = false;
+			that.$image.removeClass('zoomed').trigger('zoom-out-complete.zoomify');
 		});
 		this.removeShadow();
 		this._zoomed = false;