Mercurial > hg > digilib

changeset 1283:32f39a7d3d41

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 6b49c6af978fefe33b0a6c4b90435f4aa751b283
author robcast
date Thu, 06 Mar 2014 12:15:29 +0100
parents 3ffdeb8e209b (current diff) 6b49c6af978f (diff)
children 39cdaa1ee33b
files
diffstat 1 files changed, 12 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Thu Mar 06 12:14:39 2014 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Thu Mar 06 12:15:29 2014 +0100
@@ -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;