X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-core.js;h=327519a2ef111450c4c53b4161fedb0b0a881e4c;hp=19718e81d8b6e3e49982758f7e194a1c395ffc0a;hb=f4860b3d6d8965ad2999eca215adb801defdf7a2;hpb=b1fbc964e443ea7de39f96647233e1eb7c967c58 diff --git a/src/mkws-core.js b/src/mkws-core.js index 19718e8..327519a 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -114,7 +114,11 @@ var consoleAppender = JL.createConsoleAppender('consoleAppender'); mkws.logger.setOptions({ "appenders": [consoleAppender] }); -function _log(fn, string) { fn.call(mkws.logger, string); }; +function _log() { + var argsAsARealArray = Array.prototype.slice.call(arguments); + var fn = argsAsARealArray.shift(); + fn.apply(mkws.logger, argsAsARealArray); +}; mkws.trace = function(x) { _log(mkws.logger.trace, x) }; mkws.debug = function(x) { _log(mkws.logger.debug, x) }; mkws.info = function(x) { _log(mkws.logger.info, x) }; @@ -155,19 +159,18 @@ mkws.registerWidgetType = function(name, fn) { mkws.info("registered widget-type '" + name + "'"); }; +mkws.aliasWidgetType = function(newName, oldName) { + mkws.widgetType2function[newName] = mkws.widgetType2function[oldName]; + mkws.info("aliased widget-type '" + newName + "' to '" + oldName + "'"); + +}; + mkws.promotionFunction = function(name) { return mkws.widgetType2function[name]; }; mkws.setMkwsConfig = function(overrides) { - // Set global log_level flag early so that _log() works - var tmp = overrides.log_level; - if (typeof(tmp) !== 'undefined') { - console.log("setting level to '" + tmp + "'"); - mkws.logger.setOptions({ "level": mkws.stringToLevel(tmp) }); - } - var config_default = { use_service_proxy: true, pazpar2_url: undefined, @@ -667,4 +670,11 @@ mkws.info("Using window.name '" + window.name + "'"); } }); + // Set global log_level flag early so that _log() works + if (typeof mkws_config !== 'undefined') { + var tmp = mkws_config.log_level; + if (typeof tmp !== 'undefined') { + mkws.logger.setOptions({ "level": mkws.stringToLevel(tmp) }); + } + } })(mkws.$);