projects
/
mkws-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d91470
)
mkws-core.js now also uses the mkws.pazpar2_url() API method.
author
Mike Taylor
<mike@indexdata.com>
Fri, 22 Aug 2014 10:18:46 +0000
(11:18 +0100)
committer
Mike Taylor
<mike@indexdata.com>
Fri, 22 Aug 2014 10:18:46 +0000
(11:18 +0100)
src/mkws-core.js
patch
|
blob
|
history
diff --git
a/src/mkws-core.js
b/src/mkws-core.js
index
577d35b
..
abe414d
100644
(file)
--- a/
src/mkws-core.js
+++ b/
src/mkws-core.js
@@
-642,7
+642,7
@@
mkws.pazpar2_url = function() {
// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
if (mkws.config.pazpar2_url.match(/^\/\//)) {
mkws.config.pazpar2_url = document.location.protocol + mkws.config.pazpar2_url;
// protocol independent link for pazpar2: "//mkws/sp" -> "https://mkws/sp"
if (mkws.config.pazpar2_url.match(/^\/\//)) {
mkws.config.pazpar2_url = document.location.protocol + mkws.config.pazpar2_url;
- log("adjusted protocol independent link to " + mkws.config.pazpar2_url);
+ log("adjusted protocol independent link to " + mkws.pazpar2_url());
}
if (mkws.config.responsive_design_width) {
}
if (mkws.config.responsive_design_width) {
@@
-699,7
+699,7
@@
mkws.pazpar2_url = function() {
if (mkws.config.use_service_proxy && !mkws.authenticated && !mkws.authenticating) {
authenticateSession(sp_auth_url(mkws.config),
mkws.config.service_proxy_auth_domain,
if (mkws.config.use_service_proxy && !mkws.authenticated && !mkws.authenticating) {
authenticateSession(sp_auth_url(mkws.config),
mkws.config.service_proxy_auth_domain,
- mkws.config.pazpar2_url);
+ mkws.pazpar2_url());
} else if (!mkws.authenticating) {
// raw pp2 or we have a session already open
runAutoSearches();
} else if (!mkws.authenticating) {
// raw pp2 or we have a session already open
runAutoSearches();