Mercurial > hg > digilib-old

changeset 1150:d9d17eb3d731

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
shoAnnotationNumbers controls now also numbers on mark-annotations.
author robcast
date Mon, 26 Nov 2012 16:44:57 +0100
parents 05f7eb1ba0a2
children 139ad480333b
files webapp/src/main/webapp/jquery/jquery.digilib.annotator.js
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Sun Nov 25 21:01:13 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Mon Nov 26 16:44:57 2012 +0100
@@ -246,7 +246,11 @@
         var $elem = data.$elem;
         var annotator = data.annotator;
         var annotation = annot.annotation;
-        var idx = annot.idx ? annot.idx : '?';
+        var idx = '';
+        if (data.settings.showAnnotationNumbers) {
+            // show annotation number
+            idx = annot.idx ? annot.idx : '?';
+        }
         var area = null;
         var type = null;
         if (annotation.shapes != null) {
@@ -280,10 +284,6 @@
         	var clippedArea = data.zoomArea.intersect(area);
         	if (clippedArea == null) return;
             screenRect = data.imgTrafo.transform(clippedArea);
-            if (!data.settings.showAnnotationNumbers) {
-                // suppress annotation number
-                idx = '';
-            }
 	        $annotation = $('<div class="'+cssPrefix+'annotationregion '+cssPrefix+'overlay annotator-hl">'+idx+'</div>');
         } else {
             // render point