Mercurial > hg > digilib

changeset 1524:4eaf3509f407

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix bug where annotatorPluginSettings could not be configured
author hertzhaft
date Sun, 04 Sep 2016 12:56:36 +0200
parents debdc9fdf48f
children 09b851740c70
files webapp/src/main/webapp/jquery/jquery.digilib.annotator.js
diffstat 1 files changed, 2 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Sun Sep 04 12:55:08 2016 +0200
+++ b/webapp/src/main/webapp/jquery/jquery.digilib.annotator.js	Sun Sep 04 12:56:36 2016 +0200
@@ -233,7 +233,7 @@
 	            // password entered in JS-prompt
 	            password = window.prompt("Please authenticate: Password", '');
 	            // set params for Auth plugin
-	         	auth.options.requestData.password = password;   
+	         	auth.options.requestData.password = password;
 	    		// try to use the safe url for the password
     			if (data.settings.annotationSafeTokenUrl != null) {
     				auth.options.tokenUrl = data.settings.annotationSafeTokenUrl;
@@ -792,11 +792,10 @@
         $(document).off("mousedown", annotator.checkForStartSelection);
         $(document).off("mouseup", annotator.checkForEndSelection);
         // set plugin parameters
-        var def = defaults.annotatorPluginSettings;
         var pluginParams = {};
         // merge settings 
         // (deep copy of defaults from plugin and options from HTML)
-        $.extend(true, pluginParams, defaults.annotatorPluginSettings, data.options.annotatorPluginSettings);
+        $.extend(true, pluginParams, defaults.annotatorPluginSettings, data.settings.annotatorPluginSettings);
         // function to evaluate plugin settings
         var evalParams = function (params) {
             if (params == null) return;