From 648c04bf2231861d74bbd17867c29b467cd6f209 Mon Sep 17 00:00:00 2001 From: Wolfram Schneider Date: Thu, 19 Dec 2013 10:29:11 +0000 Subject: [PATCH] call mkws() on page load, part of MKWS-50 This make it possible to configure mkws anywhere in a HTML page, in the or section. Also, this would enable us to include mkws-complete.js at the end of the HTML page at the bottom, to speedup incremental page load for users. --- tools/htdocs/mkws.js | 40 ++++++++++++++++++++++++---------------- 1 file changed, 24 insertions(+), 16 deletions(-) diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js index cb3e973..0ed1a99 100644 --- a/tools/htdocs/mkws.js +++ b/tools/htdocs/mkws.js @@ -9,17 +9,16 @@ var mkws = { filters: [] }; -/* - * global config object: mkws_config - * - * Needs to be defined in the HTML header before including this JS file. - * Define empty mkws_config for simple applications that don't define it. - */ +// Define empty mkws_config for simple applications that don't define it. if (!mkws_config) var mkws_config = {}; -// Wrapper for jQuery -(function ($) { +// wrapper for jQuery lib +function _mkws($) { + // if (console && console.log) console.log("run _mkws()"); + + // call this function only once + if (mkws.init) return; mkws.locale_lang = { "de": { @@ -100,6 +99,7 @@ mkws.debug_function = function (string) { console.log(timestamp + string); } var debug = mkws.debug_function; // local alias +debug("start running MKWS"); Handlebars.registerHelper('json', function(obj) { @@ -214,7 +214,7 @@ for (var key in mkws_config) { } } - +debug("Create main pz2 object"); // create a parameters array and pass it to the pz2's constructor // then register the form submit event with the pz2.search function // autoInit is set to true on default @@ -422,7 +422,7 @@ function onFormSubmitEventHandler() function newSearch(query, sort, targets) { debug("newSearch: " + query); - + if (mkws_config.use_service_proxy && !mkws.authenticated) { alert("searching before authentication"); return; @@ -1274,11 +1274,8 @@ function init_popup(obj) { }); }; - - - -/* magic */ -$(document).ready(function() { +// main +(function() { try { mkws_html_all() } @@ -1287,6 +1284,17 @@ $(document).ready(function() { mkws_config.error = e.message; // alert(e.message); } -}); +})(); + + // done + mkws.init = true; +}; + +// wrapper to call _mkws after page load +(function (j) { + $(document).ready(function() { + // if (console && console.log) console.log("on load ready"); + _mkws(j); + }); })(jQuery); -- 1.7.10.4