Mercurial > hg > digilib

changeset 1324:e34a533418a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix error from annotator when creating polygon annotations.
author robcast
date Sat, 24 Jan 2015 16:09:29 +0100
parents 7e208f491ef1
children dc94ed3f60ff
files webapp/src/main/webapp/jquery/jquery.digilib.annotator.js
diffstat 1 files changed, 5 insertions(+), 38 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Sat Jan 24 16:08:29 2015 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Sat Jan 24 16:09:29 2015 +0100
@@ -243,43 +243,6 @@
 
 
     /**
-     * add a mark-annotation where clicked.
-     */
-    var setAnnotationMark = function (data) {
-        var $scaler = data.$scaler;
-        // start event capturing
-        $scaler.one('mousedown.dlSetAnnotationMark', function (evt) {
-            // event handler adding a new mark
-            console.log("setAnnotationMark at=", evt);
-            var annotator = data.annotator;
-            var mpos = geom.position(evt);
-            var pos = data.imgTrafo.invtransform(mpos);
-            // mark selection shape
-            var shape = {'type' : 'point', 'units' : 'fraction', 'geometry' : geom.position(pos)};
-            createAnnotation(data, shape, mpos);
-            return false;
-        });
-    };
-
-    /**
-     * Add a region-annotation where clicked.
-     */
-    var setAnnotationRegion = function (data) {
-        var annotator = data.annotator;
-        fn.defineArea(data, function (data, rect) {
-        	if (rect == null) return;
-            // event handler adding a new mark
-            console.log("setAnnotationRegion at=", rect);
-            // mark selection shape
-            var shape = {'type' : 'rectangle', 'units' : 'fraction', 'geometry' : rect};
-            // create and edit new annotation
-            var pos = rect.getPt1();
-            var mpos = data.imgTrafo.transform(pos);
-            createAnnotation(data, shape, mpos);
-        });
-    };
-
-    /**
      * Add a shape-annotation where clicked.
      */
     var setAnnotationShape = function (data, type) {
@@ -334,8 +297,9 @@
 	        renderAnnotations(data);
 	    };
 	    var cancel = function () {
-	    	console.log("annotation cancel.")
+	    	console.log("annotation cancel.");
 	    	cleanup();
+            renderAnnotations(data);
 	    };
 	    annotator.subscribe('annotationEditorSubmit', save);
 	    annotator.subscribe('annotationEditorHidden', cancel);
@@ -752,6 +716,9 @@
         var opts = {'readOnly' : data.settings.annotationsReadOnly};
         var annotator = new Annotator(elem, opts);
         console.debug("annotator created");
+        // unbind Annotator selection events so they don't annoy us
+        $(document).off("mousedown", annotator.checkForStartSelection);
+        $(document).off("mouseup", annotator.checkForEndSelection);
         // set plugin parameters
         var def = defaults.annotatorPluginSettings;
         var pluginParams = {};