Support to natural width/height

Maximum zoom limits to natural image dimensions (width & height).

README.md

@@ -31,7 +31,7 @@ Property | Type | Default | Description
 ---|---|---|---
 duration | `integer` | `200` | Transition duration in milliseconds.
 easing | `string` | `"linear"` | Transition property name.
-scale | `float` | `0.9` | Maximum zoom scale (1 means full screen).
+scale | `float` | `0.9` | If the image is bigger than the size of the page, it represent the maximum zoom scale according to page width/height (from 0 to 1).
 
 Options can be passed via data attributes or JavaScript. For data attributes, append the option name to `data-`, as in `data-duration=""`.
 

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "zoomify",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "authors": [
     "Indri Muska <[email protected]>"
   ],
@@ -25,7 +25,6 @@
     "tests"
   ],
   "dependencies": {
-    "angular": "~1.4.3",
     "jquery": "~1.7.1"
   }
 }

dist/zoomify.js

@@ -82,11 +82,13 @@
 		var offset     = this.$image.offset(),
 			width      = this.$image.outerWidth(),
 			height     = this.$image.outerHeight(),
+			nWidth     = this.$image[0].naturalWidth || +Infinity,
+			nHeight    = this.$image[0].naturalHeight || +Infinity,
 			wWidth     = $(window).width(),
 			wHeight    = $(window).height(),
-			scaleX     = wWidth / width,
-			scaleY     = wHeight / height,
-			scale      = Math.min(scaleX, scaleY) * this.options.scale,
+			scaleX     = Math.min(nWidth, wWidth * this.options.scale) / width,
+			scaleY     = Math.min(nHeight, wHeight * this.options.scale) / height,
+			scale      = Math.min(scaleX, scaleY),
 			translateX = (-offset.left + (wWidth - width) / 2) / scale,
 			translateY = (-offset.top + (wHeight - height) / 2 + $(document).scrollTop()) / scale;
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zoomify",
-  "version": "0.2.3",
+  "version": "0.2.4",
   "description": "Zoomify is a jQuery plugin for simple lightboxes with zoom effect.",
   "main": "Gruntfile.js",
   "repository": {
@@ -21,7 +21,7 @@
   },
   "homepage": "http://indrimuska.github.io/zoomify",
   "dependencies": {
-    "angular": "~1.4.3"
+    "jquery": "~1.7.1"
   },
   "devDependencies": {
     "grunt": "^0.4.5",

src/zoomify.js

@@ -82,11 +82,13 @@
 		var offset     = this.$image.offset(),
 			width      = this.$image.outerWidth(),
 			height     = this.$image.outerHeight(),
+			nWidth     = this.$image[0].naturalWidth || +Infinity,
+			nHeight    = this.$image[0].naturalHeight || +Infinity,
 			wWidth     = $(window).width(),
 			wHeight    = $(window).height(),
-			scaleX     = wWidth / width,
-			scaleY     = wHeight / height,
-			scale      = Math.min(scaleX, scaleY) * this.options.scale,
+			scaleX     = Math.min(nWidth, wWidth * this.options.scale) / width,
+			scaleY     = Math.min(nHeight, wHeight * this.options.scale) / height,
+			scale      = Math.min(scaleX, scaleY),
 			translateX = (-offset.left + (wWidth - width) / 2) / scale,
 			translateY = (-offset.top + (wHeight - height) / 2 + $(document).scrollTop()) / scale;