# HG changeset patch # User robcast # Date 1433434627 -7200 # Node ID bb45e0404306b08905a15b1d6240d61aec4a5c73 # Parent 266e31e20a5b470c307a878751e1df4559d9c866 added backwards compatibility for old +-style query string. fixed small bug in geometry. diff -r 266e31e20a5b -r bb45e0404306 webapp/src/main/webapp/jquery/jquery.digilib.geometry.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.geometry.js Thu Jun 04 16:10:12 2015 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.geometry.js Thu Jun 04 18:17:07 2015 +0200 @@ -285,7 +285,7 @@ }; // return a vector with the contrary direction that.invertedVector = function() { - return [-this.dx, -this.dy];rectifiedDist + return [-this.dx, -this.dy]; }; // return a vector that is perpendicular to this line that.perpendicularVector = function(clockwise) { diff -r 266e31e20a5b -r bb45e0404306 webapp/src/main/webapp/jquery/jquery.digilib.js --- a/webapp/src/main/webapp/jquery/jquery.digilib.js Thu Jun 04 16:10:12 2015 +0200 +++ b/webapp/src/main/webapp/jquery/jquery.digilib.js Thu Jun 04 18:17:07 2015 +0200 @@ -45,7 +45,7 @@ var defaults = { // version of this script - 'version' : 'jquery.digilib.js 2.3.0-1', + 'version' : 'jquery.digilib.js 2.3.0-2', // logo url 'logoUrl' : 'img/digilib-logo-text1.png', // homepage url (behind logo) @@ -627,7 +627,45 @@ * */ var parseQueryParams = function() { - return parseQueryString(window.location.search.slice(1)); + var qs = window.location.search.slice(1); + if (qs.indexOf("=") === -1) { + console.warn("Query in legacy +-format! Converting..."); + return parseLegacyQueryString(qs); + } + return parseQueryString(qs); + }; + + var parseLegacyQueryString = function(query) { + var params = {}; + var parts = query.split('+'); + if (parts.length > 0) { + params['fn'] = parts[0] + } + if (parts.length > 1) { + params['pn'] = parts[1] + } + if (parts.length > 2) { + params['ws'] = parts[2] + } + if (parts.length > 3) { + params['mo'] = parts[3] + } + if (parts.length > 3) { + params['mk'] = parts[3] + } + if (parts.length > 3) { + params['wx'] = parts[3] + } + if (parts.length > 3) { + params['wy'] = parts[3] + } + if (parts.length > 3) { + params['ww'] = parts[3] + } + if (parts.length > 3) { + params['wh'] = parts[3] + } + return params; }; /**