projects
/
mkws-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into onload
[mkws-moved-to-github.git]
/
tools
/
htdocs
/
mkws.js
diff --git
a/tools/htdocs/mkws.js
b/tools/htdocs/mkws.js
index
cb3e973
..
22230d0
100644
(file)
--- a/
tools/htdocs/mkws.js
+++ b/
tools/htdocs/mkws.js
@@
-1,4
+1,4
@@
-/* MKWS, the MasterKey Widget Set. Copyright (C) 2013, Index Data */
+/*! MKWS, the MasterKey Widget Set. Copyright (C) 2013, Index Data */
"use strict"; // HTML5: disable for debug_level >= 2
"use strict"; // HTML5: disable for debug_level >= 2
@@
-9,17
+9,16
@@
var mkws = {
filters: []
};
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 = {};
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": {
mkws.locale_lang = {
"de": {
@@
-88,7
+87,7
@@
mkws.debug_function = function (string) {
}
var now = $.now();
}
var now = $.now();
- var timestamp = (now - mkws.debug_time.start)/1000 + " (+" + (now - mkws.debug_time.last)/1000 + ") "
+ var timestamp = ((now - mkws.debug_time.start)/1000).toFixed(3) + " (+" + ((now - mkws.debug_time.last)/1000).toFixed(3) + ") "
mkws.debug_time.last = now;
// you need to disable use strict at the top of the file!!!
mkws.debug_time.last = now;
// you need to disable use strict at the top of the file!!!
@@
-100,6
+99,7
@@
mkws.debug_function = function (string) {
console.log(timestamp + string);
}
var debug = mkws.debug_function; // local alias
console.log(timestamp + string);
}
var debug = mkws.debug_function; // local alias
+debug("start running MKWS");
Handlebars.registerHelper('json', function(obj) {
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
// 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);
function newSearch(query, sort, targets)
{
debug("newSearch: " + query);
-
+
if (mkws_config.use_service_proxy && !mkws.authenticated) {
alert("searching before authentication");
return;
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()
}
try {
mkws_html_all()
}
@@
-1287,6
+1284,17
@@
$(document).ready(function() {
mkws_config.error = e.message;
// alert(e.message);
}
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);
})(jQuery);