X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=7a98ed8b8dfd326abc18443b5ae912a31627f0ba;hb=b347eef13c87c5cdeb57a504fb3a927a2388310d;hp=b03470f8a03ea24e623b87d6160062cf179bbb5d;hpb=af138c65b80ae7e943d022b794e30e93cbb64781;p=mkws-moved-to-github.git
diff --git a/src/mkws-core.js b/src/mkws-core.js
index b03470f..7a98ed8 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -78,6 +78,9 @@ var mkws = {
}
};
+// We may be using a separate copy
+if (!mkws_jQuery) mkws_jQuery = jQuery;
+mkws.$ = mkws_jQuery;
mkws.log = function(string) {
if (!mkws.log_level)
@@ -111,10 +114,11 @@ mkws.M = function(word) {
// This function is taken from a StackOverflow answer
// http://stackoverflow.com/questions/901115/how-can-i-get-query-string-values-in-javascript/901144#901144
-mkws.getParameterByName = function(name) {
+mkws.getParameterByName = function(name, url) {
+ if (!url) url = location.search;
name = name.replace(/[\[]/, "\\[").replace(/[\]]/, "\\]");
var regex = new RegExp("[\\?&]" + name + "=([^]*)"),
- results = regex.exec(location.search);
+ results = regex.exec(url);
return results == null ? "" : decodeURIComponent(results[1].replace(/\+/g, " "));
}
@@ -258,11 +262,18 @@ mkws.defaultTemplate = function(name) {
\
\
';
+ } else if (name === 'Facet') {
+ return '\
+{{term}}\
+{{count}}\
+';
}
- var s = "There is no default '" + name +"' template!";
- alert(s);
- return s;
+ return null;
};
@@ -310,10 +321,9 @@ mkws.pagerNext = function(tname) {
};
-// wrapper to call team() after page load
-(function(j) {
+// wrapper to provide local copy of the jQuery object.
+(function($) {
var log = mkws.log;
- var $ = j; // XXX
function handleNodeWithTeam(node, callback) {
// First branch for DOM objects; second branch for jQuery objects
@@ -365,11 +375,11 @@ mkws.pagerNext = function(tname) {
var w1 = team.widget(t + "-Container-" + from);
var w2 = team.widget(t + "-Container-" + to);
if (w1) {
- w1.jqnode.hide();
+ w1.node.hide();
}
if (w2) {
- w2.jqnode.show();
- w.jqnode.appendTo(w2.jqnode);
+ w2.node.show();
+ w.node.appendTo(w2.node);
}
});
team.queue("resize-" + to).publish();
@@ -384,7 +394,7 @@ mkws.pagerNext = function(tname) {
* for the site.
*/
function authenticateSession(auth_url, auth_domain, pp2_url) {
- log("Run service proxy auth URL: " + auth_url);
+ log("service proxy authentication on URL: " + auth_url);
if (!auth_domain) {
auth_domain = pp2_url.replace(/^(https?:)?\/\/(.*?)\/.*/, '$2');
@@ -407,7 +417,7 @@ mkws.pagerNext = function(tname) {
return;
}
- log("Service proxy auth successfully done");
+ log("service proxy authentication successful");
mkws.authenticated = true;
var authName = $(data).find("displayName").text();
// You'd think there would be a better way to do this:
@@ -431,7 +441,7 @@ mkws.pagerNext = function(tname) {
function selectorForAllWidgets() {
- if (mkws.config.scan_all_nodes) {
+ if (mkws.config && mkws.config.scan_all_nodes) {
// This is the old version, which works by telling jQuery to
// find every node that has a class beginning with "mkws". In
// theory it should be slower than the class-based selector; but
@@ -464,7 +474,7 @@ mkws.pagerNext = function(tname) {
var myTeam = mkws.teams[tname];
if (!myTeam) {
myTeam = mkws.teams[tname] = team($, tname);
- log("Made MKWS team '" + tname + "'");
+ log("made MKWS team '" + tname + "'");
}
var oldHTML = this.innerHTML;
@@ -480,7 +490,8 @@ mkws.pagerNext = function(tname) {
}
- $(document).ready(function() {
+ function init(rootsel) {
+ if (!rootsel) var rootsel = ':root';
var saved_config;
if (typeof mkws_config === 'undefined') {
log("setting empty config");
@@ -497,7 +508,7 @@ mkws.pagerNext = function(tname) {
var lang = key.replace(/^language_/, "");
// Copy custom languages into list
mkws.locale_lang[lang] = mkws.config[key];
- log("Added locally configured language '" + lang + "'");
+ log("added locally configured language '" + lang + "'");
}
}
}
@@ -512,14 +523,14 @@ mkws.pagerNext = function(tname) {
log("using language: " + (mkws.config.lang ? mkws.config.lang : "none"));
if (mkws.config.query_width < 5 || mkws.config.query_width > 150) {
- log("Reset query width: " + mkws.config.query_width);
+ log("reset query width to " + mkws.config.query_width);
mkws.config.query_width = 50;
}
// 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.config.pazpar2_url);
}
if (mkws.config.responsive_design_width) {
@@ -545,15 +556,15 @@ mkws.pagerNext = function(tname) {
}
var then = $.now();
- makeWidgetsWithin(1, $(':root'));
+ makeWidgetsWithin(1, $(rootsel));
var now = $.now();
- log("Walking MKWS nodes took " + (now-then) + " ms");
+ log("walking MKWS nodes took " + (now-then) + " ms");
/*
for (var tName in mkws.teams) {
var myTeam = mkws.teams[tName]
- log("TEAM '" + tName + "' = " + myTeam + " ...");
+ log("team '" + tName + "' = " + myTeam + " ...");
myTeam.visitWidgets(function(t, w) {
log(" has widget of type '" + t + "': " + w);
});
@@ -568,5 +579,9 @@ mkws.pagerNext = function(tname) {
// raw pp2
runAutoSearches();
}
+ };
+ $(document).ready(function() {
+ var widgetSelector = selectorForAllWidgets();
+ if (widgetSelector && $(widgetSelector).length !== 0) init();
});
-})(jQuery);
+})(mkws_jQuery);