Mercurial > hg > digilib-old

changeset 1118:f0474c1faaff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
trying new annotator authentication.
author robcast
date Tue, 06 Nov 2012 18:24:39 +0100
parents 5768d4ccb53e
children 036efe7361c8
files webapp/src/main/webapp/jquery/jquery.digilib.annotator.js
diffstat 1 files changed, 11 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Tue Nov 06 01:15:33 2012 +0100
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Tue Nov 06 18:24:39 2012 +0100
@@ -51,13 +51,18 @@
             return this.user;
         },
 
-        // Annotator plugin settings
+        // Annotator plugin settings (some values provided in handleSetup)
         'annotatorPlugins' : {
 	        //'Tags' : {},
 	        'Auth' : {
 	        	//token : data.annotationToken
 	            //tokenUrl: data.settings.annotationTokenUrl
-	            //autoFetch: false
+	            autoFetch: true,
+	            requestMethod: 'POST',
+	            requestData: {
+	            	//'user': data.settings.annotationUser,
+	            	//'password': data.annotationPassword
+	            }
             },
             'Permissions' : { 
             	//user: data.settings.annotationUser,
@@ -136,11 +141,7 @@
                 setAnnotationMark(data);
             } else {
                 // use position and text (and user-id)
-                var annotation = newAnnotation(data, mpos, text, null, null, data.settings.annotationUser);
-                storeAnnotation(data, annotation);
-                // TODO: replace with annotation returned by server
-                data.annotations.push(annotation);
-                digilib.fn.redisplay(data);
+                console.error("Currently only interactive annotations!");
             }
         },
     };
@@ -358,9 +359,9 @@
     var handleSetup = function(evt) {
         console.debug("annotations: handleSetup");
         var data = this;
-        if (data.annotationToken ==  null) {
+        /* if (data.annotationToken ==  null) {
             loadAnnotationToken(data);        
-        }
+        } */
         // set up annotator (after html has been set up)
         var uri = getAnnotationPageUrl(data);
         var annotator = new Annotator(data.$elem.get(0));
@@ -369,7 +370,7 @@
         	'Auth' : {
         		'token' : data.annotationToken,
         		'tokenUrl' : data.settings.annotationTokenUrl,
-        		'autoFetch' : false
+        		'autoFetch' : true
         	},
         	'Permissions' : {
         		'user' : data.settings.annotationUser