Mercurial > hg > digilib

changeset 1281:6b49c6af978f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
quick fix on the way to Annotator.js 2.0 support.
author robcast
date Mon, 24 Feb 2014 07:21:25 -0800
parents 6873d5e130d2
children 32f39a7d3d41
files webapp/src/main/webapp/jquery/jquery.digilib.annotator.js
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Tue Feb 18 11:13:30 2014 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Mon Feb 24 07:21:25 2014 -0800
@@ -316,7 +316,7 @@
         } else {
             // render point
 	        if (!data.zoomArea.containsPosition(area)) return;
-            screenRect = data.imgTrafo.transform(area).getPosition();
+            screenRect = data.imgTrafo.transform(area);
             // create annotation
             var html = '<div class="'+cssPrefix+'annotationmark '+cssPrefix+'overlay annotator-hl">'+idx+'</div>';
             $annotation = $(html);
@@ -533,15 +533,12 @@
                     };
                 }
             },
-            'Store' : { 
+            /* 'Store' : { 
                 'prefix' : getAnnotationServerUrl,
                 'annotationData': {
                     'uri': getAnnotationPageUri
                 }, 
-                'loadFromSearch': {
-                    'uri': getAnnotationPageUri
-                }
-            },
+            }, */
             'DigilibIntegrator' : {
                 'hooks' : {
                     'setupAnnotation' : getSetupAnnotation,
@@ -605,7 +602,15 @@
         // set up annotator (after html has been set up)
         var uri = getAnnotationPageUri(data);
         var elem = data.$elem.get(0);
-        var opts = {'readOnly' : data.settings.annotationsReadOnly};
+        var opts = {
+            'store' : {
+                type: Annotator.Plugin.Store,
+                prefix: getAnnotationServerUrl(data),
+                annotationData: {uri: uri}                
+            },
+            'loadQuery' : {'uri': uri},
+            'readOnly' : data.settings.annotationsReadOnly
+        };
         var annotator = new Annotator(elem, opts);
         // set plugin parameters
         var def = defaults.annotatorPluginSettings;