Update to imgViewer 0.8.0

waynegm · Aug 1, 2016 · b453585 · b453585
1 parent 77e43ad
commit b453585
Show file tree

Hide file tree

Showing 17 changed files with 56 additions and 58 deletions.
diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@ 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/)
- * [toe.js](https://github.com/visiongeist/toe.js) (>=3.0)
+ * [jquery.event.ue.js](https://github.com/mmikowski/jquery.event.ue) (>=0.4.3)
  * [Zoetrope](https://github.com/benplum/Zoetrope) (>=3.0)
  * [jquery-mousewheel](https://github.com/brandonaaron/jquery-mousewheel) (>=3.0)
  * [jQuery imgViewer](https://github.com/waynegm/imgViewer) (>=0.7.1)
@@ -33,7 +33,7 @@ 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.fs.zoetrope.min.js"></script>
-	<script src="toe.min.js"></script>
+	<script src="jquery.event.ue.min.js"></script>
 	<script src="jquery.mousewheel.min.js"></script>
 	<script src="imgViewer.min.js"></script>
 	<script src="imgNotes.min.js"></script>
@@ -279,21 +279,16 @@ This plugin is provided under the [MIT License](http://opensource.org/licenses/M
 Copyright (c) 2013 Wayne Mogg.
 
 ## Release History
-### 0.6
-- First release
-
-### 0.7.1
-- Update to work with imgViewer 0.7.1
-- Add zoomable option to disable zooming
-- Updated Grunfile.js to include tests against latest version (2.1.0) of jQuery.
+### 0.8.0
+- Update to imgViewer 0.8.0
 
-### 0.7.2
-- Bump version number for bug fix in imgViewer
+### 0.7.6
+- turn events off before removing note markers - for better performance
 
-### 0.7.3
-- Add onUpdateMarker callback
-- Add example with custom onUpdateMarker
-- Fix so that zoom option value reflects zoom of underlying imgViewer
+### 0.7.5
+- Add onUpdate callback
+- Add onUpdate callback example that links the markers with a line
+- Fix bug affecting display of newly inserted markers and position of edit dialog
 
 ### 0.7.4
 - Simplify signature for onUpdateMarker callback
@@ -302,13 +297,21 @@ Copyright (c) 2013 Wayne Mogg.
 - Add printing example
 - Add jQuery Mobile example
 
-### 0.7.5
-- Add onUpdate callback
-- Add onUpdate callback example that links the markers with a line
-- Fix bug affecting display of newly inserted markers and position of edit dialog
+### 0.7.3
+- Add onUpdateMarker callback
+- Add example with custom onUpdateMarker
+- Fix so that zoom option value reflects zoom of underlying imgViewer
 
-### 0.7.6
-- turn events off before removing note markers - for better performance
+### 0.7.2
+- Bump version number for bug fix in imgViewer
+
+### 0.7.1
+- Update to work with imgViewer 0.7.1
+- Add zoomable option to disable zooming
+- Updated Grunfile.js to include tests against latest version (2.1.0) of jQuery.
+
+### 0.6
+- First release
 
 
 

diff --git a/demo.html b/demo.html
@@ -8,7 +8,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="libs/toe.min.js"></script>
+		<script type="text/javascript" src="libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="libs/imgViewer.min.js"></script>
 		<script type="text/javascript" src="src/imgNotes.js"></script>
@@ -91,4 +91,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Basic Interactive Example</h1>
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
diff --git a/dist/imgNotes.js b/dist/imgNotes.js
@@ -1,6 +1,6 @@
-/*! jQuery imgNotes - v0.7.6 - 2015-06-13
+/*! jQuery imgNotes - v0.8.0 - 2016-08-01
 * https://github.com/waynegm/imgNotes
-* Copyright (c) 2015 Wayne Mogg; Licensed MIT */
+* Copyright (c) 2016 Wayne Mogg; Licensed MIT */
 ;(function($) {
 	$.widget("wgm.imgNotes", {
 		options: {
@@ -247,6 +247,7 @@
  *	Delete a note
  */
 		_delete: function(elem) {
+			this.noteCount--;
 			this.notes = this.notes.filter(function(v) { return v!== elem; });
 			$(elem).off();
 			$(elem).remove();

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,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="../libs/toe.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
 		<script type="text/javascript" src="../libs/printThis.js"></script>
@@ -107,4 +107,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Basic Interactive Example</h1>
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
diff --git a/examples/custom_editor.html b/examples/custom_editor.html
@@ -9,7 +9,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="../libs/toe.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="custom_editor_files/jquery.sceditor.min.js"></script>
 		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
@@ -141,4 +141,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Custom Editor Example</h1>
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
diff --git a/examples/custom_marker.html b/examples/custom_marker.html
@@ -8,7 +8,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="../libs/toe.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
@@ -106,4 +106,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Custom Marker Example</h1>
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
diff --git a/examples/custom_updatemarker.html b/examples/custom_updatemarker.html
@@ -8,7 +8,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="../libs/toe.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
@@ -120,4 +120,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Custom Update Marker Example</
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
diff --git a/examples/custom_updateview.html b/examples/custom_updateview.html
@@ -8,7 +8,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="../libs/toe.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
@@ -143,4 +143,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Custom Update View Example</h1
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
diff --git a/examples/custom_view.html b/examples/custom_view.html
@@ -8,7 +8,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="../libs/toe.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
@@ -109,4 +109,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Custom View Example</h1>
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
diff --git a/examples/jquery_mobile.html b/examples/jquery_mobile.html
@@ -9,7 +9,7 @@
 
 	<script type="text/javascript" src="../libs/jquery/jquery-ui.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/jquery.event.ue.min.js"></script>
 	<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 	<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
 	<script type="text/javascript" src="../libs/printThis.js"></script>
@@ -132,4 +132,4 @@ <h4>My Footer</h4>
 </script>
 
 </body>
-</html>
+</html>
diff --git a/examples/with_overview.html b/examples/with_overview.html
@@ -8,7 +8,7 @@
 		<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.fs.zoetrope.min.js"></script>
-		<script type="text/javascript" src="../libs/toe.min.js"></script>
+		<script type="text/javascript" src="../libs/jquery.event.ue.min.js"></script>
 		<script type="text/javascript" src="../libs/jquery.mousewheel.min.js"></script>
 		<script type="text/javascript" src="../libs/imgViewer.min.js"></script>
 		<script type="text/javascript" src="../src/imgNotes.js"></script>
@@ -115,4 +115,4 @@ <h1 style="text-align: center;">jQuery imgNotes - Basic Interactive Example</h1>
 })(jQuery);
 </script>
 </body>
-</html>
+</html>
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.7.6",
+  "version": "0.8.0",
   "homepage": "",
   "author": {
     "name": "Wayne Mogg"
@@ -22,7 +22,7 @@
   "dependencies": {
     "jquery": ">=1.8",
     "jquery-ui": ">=1.8",
-    "toe.js":  ">=3.0",
+    "jquery.event.ue.js":  ">=0.4.3",
     "zoetrope": ">=3.0",
     "jquery-mousewheel": ">=3.0",
     "jQuery imgViewer": ">=0.7.3"
@@ -35,4 +35,4 @@
       "zoom",
       "pan"
   ]
-}
+}