X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=d56b1e76b2dc91b1b7bf7c79cc8708696720d8ee;hb=fc032f4a312ac9de8a137e63f5cfb8a9b34d6c98;hp=de5895d5f600399b0ee53943a2a72f9086dea4ec;hpb=89ab4d03240716f1714ea5c2ec7f855c406c042e;p=mkws-moved-to-github.git diff --git a/src/mkws-core.js b/src/mkws-core.js index de5895d..d56b1e7 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -95,6 +95,12 @@ var mkws = { } }; +// We may be using a separate copy +if (typeof(mkws_jQuery) !== "undefined") { + mkws.$ = mkws_jQuery; +} else { + mkws.$ = jQuery; +} mkws.log = function(string) { if (!mkws.log_level) @@ -156,7 +162,7 @@ mkws.setMkwsConfig = function(overrides) { var config_default = { use_service_proxy: true, - pazpar2_url: "//mkws.indexdata.com/service-proxy/", + pazpar2_url: "//mkws.indexdata.com/service-proxy/", service_proxy_auth: "//mkws.indexdata.com/service-proxy-auth", lang: "", sort_options: [["relevance"], ["title:1", "title"], ["date:0", "newest"], ["date:1", "oldest"]], @@ -606,4 +612,4 @@ mkws.pagerNext = function(tname) { var widgetSelector = selectorForAllWidgets(); if (widgetSelector && $(widgetSelector).length !== 0) init(); }); -})(jQuery); +})(mkws.$);