Mercurial > hg > digilib

changeset 1258:fd90ed468eec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved vector update.
author robcast
date Fri, 17 Jan 2014 22:31:27 +0100
parents 4f8f960a4bea
children e70b62304290
files webapp/src/main/webapp/jquery/jquery.digilib.vector.js
diffstat 1 files changed, 9 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.vector.js	Fri Jan 17 22:14:39 2014 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.vector.js	Fri Jan 17 22:31:27 2014 +0100
@@ -345,7 +345,7 @@
             // remove move/end handler
             $document.off("mousemove.dlVertexDrag", dragMove);
             $document.off("mouseup.dlVertexDrag", dragEnd);
-            // rearm handle
+            // rearm start handler
             $handle.one("mousedown.dlVertexDrag", dragStart);
             if (onComplete != null) {
                 onComplete(shape);
@@ -380,6 +380,8 @@
                 shape.geometry.coordinates = [[p.x, p.y], [p.x, p.y]];
             } else {
                 console.error("unsupported shape type: "+shapeType);
+                $overlayDiv.remove();
+                return false;
             }
             // draw shape
             renderShape(data, shape);
@@ -394,7 +396,8 @@
                 }
             })(evt);
             return false;
-        }; 
+        };
+        
         // start by clicking
         $overlayDiv.one('mousedown.dlShape', shapeStart);
     };
@@ -404,11 +407,12 @@
         var data = this;
         if (data.shapes == null || data.imgTrafo == null || !data.settings.isVectorActive)
             return;
-        if (data.zoomArea != data.vectorOldZA) {
+        if (data.imgTrafo != data.vectorOldImgTrafo) {
+            // imgTrafo changed
             renderShapes(data);
-            data.vectorOldZA = data.zoomArea;
+            data.vectorOldImgTrafo = data.imgTrafo;
         }
-        data.$svg.show();
+        //data.$svg.show();
     };
 
     /**