# HG changeset patch # User robcast # Date 1393255285 28800 # Node ID 6b49c6af978fefe33b0a6c4b90435f4aa751b283 # Parent 6873d5e130d216d2947d08699e3a6431807411e0 quick fix on the way to Annotator.js 2.0 support. diff -r 6873d5e130d2 -r 6b49c6af978f webapp/src/main/webapp/jquery/jquery.digilib.annotator.js --- 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 = '
'; $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;