# HG changeset patch
# User hertzhaft
# Date 1472986596 -7200
# Node ID 4eaf3509f407a526e3ae7f0f35f3866a7d39a11e
# Parent  debdc9fdf48f3fe1f1b8822b63e5a0ea08a8d805
fix bug where annotatorPluginSettings could not be configured

diff -r debdc9fdf48f -r 4eaf3509f407 webapp/src/main/webapp/jquery/jquery.digilib.annotator.js
--- 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;