Update to work with imgViewer 0.7

Add zoomable option to disable zooming Updated Grunfile.js to include tests against latest version (2.1.0) of jQuery.
waynegm · Jun 19, 2014 · 1ed269c · 1ed269c
1 parent 59d9e8c
commit 1ed269c
Show file tree

Hide file tree

Showing 18 changed files with 271 additions and 68 deletions.
diff --git a/.directory b/.directory
@@ -0,0 +1,6 @@
+[Dolphin]
+Timestamp=2013,6,9,21,16,48
+Version=3
+
+[Settings]
+HiddenFilesShown=true
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -39,8 +39,8 @@ module.exports = function(grunt) {
 			options: {
 				urls: (function() {
 							var res = [];
-							['2.0.1', '1.10.0', '1.9.1', '1.8.3' ].forEach( function(jqversion) {
-								['1.10.3', '1.9.2', '1.8.24'].forEach( function(uiversion) {
+							['2.1.0', '2.0.3', '1.10.2', '1.9.1', '1.8.3' ].forEach( function(jqversion) {
+								['1.10.4', '1.9.2', '1.8.24'].forEach( function(uiversion) {
 									this.push('http://localhost:<%= connect.server.options.port %>/test/imgNotes.html?jquery=' + jqversion + '&jquery-ui=' + uiversion);
 								}, this);
 							}, res);

diff --git a/README.md b/README.md
@@ -21,8 +21,9 @@ The plugin is known to work with the configuration described below:
  * [jQuery](http://jquery.com/) (>=1.8)
  * [jQuery UI](http://jqueryui.com/) (>=1.8)
     * [Widget Factory](http://api.jqueryui.com/jQuery.widget/)
- * [jQuery Mousewheel](http://brandonaaron.net/code/mousewheel/docs) (>=3.0)
- * [jQuery imgViewer](https://github.com/waynegm/imgViewer) (>=0.6.0)
+ * [toe.js](https://github.com/visiongeist/toe.js) (>=3.0)
+ * [Zoetrope](https://github.com/benplum/Zoetrope) (>=3.0)
+ * [jQuery imgViewer](https://github.com/waynegm/imgViewer) (>=0.7.0)
 
 ## Usage
 
@@ -34,7 +35,8 @@ Include either the development version or minified production version of the JS
 	...
 	<script src="jquery.js"></script>
 	<script src="jquery-ui.js"></script>
-	<script src="jquery.mousewheel.js"></script>
+	<script src="jquery.fs.zoetrope.min.js"></script>
+	<script src="toe.min.js"></script>
 	<script src="imgViewer.min.js"></script>
 	<script src="imgNotes.min.js"></script>
 	...
@@ -107,6 +109,15 @@ $("#image1").imgNotes("option", "zoomStep", 0.05);
 $("#image1").imgNotes("option", "zoom", 3);
 ```
 
+###zoomable
+  * Controls if image will be zoomable
+  * Default: true
+  * Example - to disble image zooming:
+
+```javascript
+$("#image1").imgNotes("option", "zoomable", false);
+```
+
 ###onAdd
   * Callback triggered when a marker/note is added to the widget to allow developers to define their own markers
    This will happen when notes are imported using the "import" method and when the user clicks on the widget in edit mode
@@ -193,3 +204,7 @@ Copyright (c) 2013 Wayne Mogg.
 ## Release History
 ### 0.6
 First release
+### 0.7
+Update to work with imgViewer 0.7
+Add zoomable option to disable zooming
+Updated Grunfile.js to include tests against latest version (2.1.0) of jQuery.
diff --git a/dist/imgNotes.js b/dist/imgNotes.js
@@ -1,11 +1,12 @@
-/*! jQuery imgNotes - v0.6.0 - 2013-06-09
+/*! jQuery imgNotes - v0.7.0 - 2014-06-19
 * https://github.com/waynegm/imgNotes
-* Copyright (c) 2013 Wayne Mogg; Licensed MIT */
+* Copyright (c) 2014 Wayne Mogg; Licensed MIT */
 ;(function($) {
 	$.widget("wgm.imgNotes", {
 		options: {
 			zoom: 1,
 			zoomStep: 0.1,
+			zoomable: true,
 			canEdit: false,
 			vAll: "middle",
 			hAll: "middle",
@@ -120,7 +121,10 @@
 								$.each(self.notes, function() {
 									self._updateMarkerPos(this);
 								});
-							}
+							},
+							zoom: self.options.zoom,
+							zoomStep: self.options.zoomStep,
+							zoomable: self.options.zoomable
 			});
 		},
 /*
@@ -162,6 +166,9 @@
 				case 'zoomStep':
 					$(this.img).imgViewer("option", "zoomStep", value);
 					break;
+				case 'zoomable':
+					$(this.img).imgViewer("option", "zoomable", value);
+					break;
 			}
 		},
 

diff --git a/dist/imgNotes.min.js b/dist/imgNotes.min.js
diff --git a/examples/basic_interactive.html b/examples/basic_interactive.html
@@ -7,7 +7,8 @@
 		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.2/themes/smoothness/jquery-ui.css" media="screen">
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
 

diff --git a/examples/custom_editor.html b/examples/custom_editor.html
@@ -8,7 +8,8 @@
 
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="custom_editor_files/jquery.sceditor.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>

diff --git a/examples/custom_editor_files/.directory b/examples/custom_editor_files/.directory
@@ -0,0 +1,4 @@
+[Dolphin]
+Timestamp=2013,6,24,21,28,9
+Version=3
+ViewMode=1
diff --git a/examples/custom_marker.html b/examples/custom_marker.html
@@ -7,7 +7,8 @@
 		<link rel="stylesheet" href="http://code.jquery.com/ui/1.10.2/themes/smoothness/jquery-ui.css" media="screen">
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
 

diff --git a/examples/custom_view.html b/examples/custom_view.html
@@ -7,7 +7,8 @@
 
 		<script type="text/javascript" src="../libs/jquery/jquery.js"></script>
 		<script type="text/javascript" src="../libs/jquery/jquery-ui.js"></script>
-		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.fs.zoetrope.min.js"></script>
+		<script type="text/javascript" src="../libs/toe.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
 

diff --git a/imgNotes.jquery.json b/imgNotes.jquery.json
@@ -2,7 +2,7 @@
   "name": "imgNotes",
   "title": "jQuery imgNotes",
   "description": "Extension of the jQuery imgViewer plugin to add markers and notes to the image.",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "homepage": "",
   "author": {
     "name": "Wayne Mogg"
@@ -22,7 +22,8 @@
   "dependencies": {
     "jquery": ">=1.8",
     "jquery-ui": ">=1.8",
-    "jQuery Mousewheel":  ">=3.0",
+    "toe.js":  ">=3.0",
+    "zoetrope": ">=3.0",
     "jQuery imgViewer": ">=0.6"
   },
   "keywords": [