window.mkws = {
$: $, // Our own local copy of the jQuery object
authenticated: false,
+ active: false,
log_level: 1, // Will be overridden from mkws.config, but
// initial value allows jQuery popup to use logging.
teams: {},
function makeWidgetsWithin(level, node) {
- node.find(selectorForAllWidgets()).each(function() {
+ if (node) var widgetNodes = node.find(selectorForAllWidgets());
+ else widgetNodes = $(selectorForAllWidgets());
+ // Return false if we parse no widgets
+ if (widgetNodes.length < 1) return false;
+ widgetNodes.each(function() {
handleNodeWithTeam(this, function(tname, type) {
var myTeam = mkws.teams[tname];
if (!myTeam) {
}
});
});
+ return true;
}
- function init(rootsel) {
- mkws.autoHasAuto = false;
- if (!rootsel) var rootsel = ':root';
- var saved_config;
- if (typeof mkws_config === 'undefined') {
- log("setting empty config");
- saved_config = {};
- } else {
- log("using config: " + $.toJSON(mkws_config));
- saved_config = mkws_config;
- }
- mkws.setMkwsConfig(saved_config);
-
- for (var key in mkws.config) {
- if (mkws.config.hasOwnProperty(key)) {
- if (key.match(/^language_/)) {
- var lang = key.replace(/^language_/, "");
- // Copy custom languages into list
- mkws.locale_lang[lang] = mkws.config[key];
- log("added locally configured language '" + lang + "'");
- }
- }
- }
-
- var lang = mkws.getParameterByName("lang") || mkws.config.lang;
- if (!lang || !mkws.locale_lang[lang]) {
- mkws.config.lang = ""
- } else {
- mkws.config.lang = lang;
- }
-
- 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 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);
- }
-
- if (mkws.config.responsive_design_width) {
- // Responsive web design - change layout on the fly based on
- // current screen width. Required for mobile devices.
- $(window).resize(resizePage);
- // initial check after page load
- $(document).ready(resizePage);
- }
+ // This function should have no side effects if run again on an operating session, even if
+ // the element/selector passed causes existing widgets to be reparsed:
+ //
+ // * configuration is not regenerated
+ // * authentication is not performed again
+ // * autosearches are not re-run
+ mkws.init = function(message, rootsel) {
+ if (message) mkws.log(message);
+ // TODO: Let's remove this soon
// Backwards compatibility: set new magic class names on any
// elements that have the old magic IDs.
var ids = [ "Switch", "Lang", "Search", "Pager", "Navi",
}
}
+ // MKWS is not active until init() has been run against an object with widget nodes.
+ // We only set initial configuration when MKWS is first activated.
+ if (!mkws.isActive) {
+ var widgetSelector = selectorForAllWidgets();
+ if ($(widgetSelector).length < 1) {
+ mkws.log("no widgets found");
+ return;
+ }
+
+ // Initial configuration
+ mkws.autoHasAuto = false;
+ var saved_config;
+ if (typeof mkws_config === 'undefined') {
+ log("setting empty config");
+ saved_config = {};
+ } else {
+ log("using config: " + $.toJSON(mkws_config));
+ saved_config = mkws_config;
+ }
+ mkws.setMkwsConfig(saved_config);
+
+ for (var key in mkws.config) {
+ if (mkws.config.hasOwnProperty(key)) {
+ if (key.match(/^language_/)) {
+ var lang = key.replace(/^language_/, "");
+ // Copy custom languages into list
+ mkws.locale_lang[lang] = mkws.config[key];
+ log("added locally configured language '" + lang + "'");
+ }
+ }
+ }
+
+ var lang = mkws.getParameterByName("lang") || mkws.config.lang;
+ if (!lang || !mkws.locale_lang[lang]) {
+ mkws.config.lang = ""
+ } else {
+ mkws.config.lang = lang;
+ }
+
+ 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 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);
+ }
+
+ if (mkws.config.responsive_design_width) {
+ // Responsive web design - change layout on the fly based on
+ // current screen width. Required for mobile devices.
+ $(window).resize(resizePage);
+ // initial check after page load
+ $(document).ready(resizePage);
+ }
+ }
+
var then = $.now();
- makeWidgetsWithin(1, $(rootsel));
+ // If we've made no widgets, return without starting an SP session
+ // or marking MKWS active.
+ if (makeWidgetsWithin(1, rootsel) === false) return false;
var now = $.now();
log("walking MKWS nodes took " + (now-then) + " ms");
}
*/
- if (mkws.config.use_service_proxy) {
+ if (mkws.config.use_service_proxy && !mkws.authenticated) {
authenticateSession(mkws.config.service_proxy_auth,
mkws.config.service_proxy_auth_domain,
mkws.config.pazpar2_url);
} else {
- // raw pp2
+ // raw pp2 or we have a session already open
runAutoSearches();
}
+
+ mkws.isActive = true;
+ return true;
};
+
$(document).ready(function() {
- var widgetSelector = selectorForAllWidgets();
- if (widgetSelector && $(widgetSelector).length !== 0) init();
+ mkws.init();
});
+
})(mkws.$);
export MKWS_ROOT=$(pwd)/..
-MKWS_OS=debian
+MKWS_OS=debian
APACHE_VERSION=2.2
+apache2=$(env PATH=/bin:/usr/bin:/usr/sbin which apache2 httpd false 2>/dev/null | head -1)
+
case $(uname) in
- Darwin ) MKWS_OS=macos
+ Darwin ) MKWS_OS=macos
test -e libexec || ln -fs /usr/libexec .
;;
- Linux ) MKWS_OS=debian
+ Linux ) MKWS_OS=debian
if [ -e /etc/debian_version ]; then
MKWS_OS=debian
- # Ubuntu with Apache 2.2 can continue using debian
- if /usr/bin/dpkg -s apache2 | grep -q "Version: 2\.4\..*ubuntu"; then
- MKWS_OS=ubuntu
- APACHE_VERSION=2.4
+ if $apache2 -v | egrep -q 'Server version: Apache/2\.4\.'; then
+ APACHE_VERSION=2.4
fi
fi
if [ -e /etc/redhat-release ]; then
- MKWS_OS=centos
+ MKWS_OS=centos
fi
;;
* ) MKWS_OS=debian ;;
esac
-export APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf"
if [ "$APACHE_VERSION" = "2.4" ]; then
- : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-2.4"}
+ : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template-$APACHE_VERSION"}
+ APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules-$APACHE_VERSION.$MKWS_OS.conf"
else
- : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"}
+ : ${MKWS_APACHE_TEMPLATE="$MKWS_ROOT/tools/apache2/jasmine-dev.template"}
+ APACHE_MODULES="$MKWS_ROOT/tools/apache2/jasmine-dev.apache-modules.$MKWS_OS.conf"
fi
-: ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev"}
+: ${MKWS_APACHE_FILE="$APACHE_LOG_DIR/jasmine-dev"}
+export APACHE_MODULES
perl -npe 's,\${(.*?)},$ENV{$1},g; ' $MKWS_APACHE_TEMPLATE > $MKWS_APACHE_FILE.tmp
mv -f $MKWS_APACHE_FILE.tmp $MKWS_APACHE_FILE
projects / mkws-moved-to-github.git / commitdiff