X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-core.js;h=719e3e0d8ccf9883ca354a698dc82101485fdf04;hp=2b258073e28781efebf914a04e91f18a10cf3f99;hb=79ba978af9f202afa1c181b0675401b92447f579;hpb=7b6b1d731e85c96c95101e444364eca4ab03782c diff --git a/src/mkws-core.js b/src/mkws-core.js index 2b25807..719e3e0 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -111,25 +111,14 @@ mkws.stringToLevel = function(s) { mkws.logger = JL('mkws'); var consoleAppender = JL.createConsoleAppender('consoleAppender'); -mkws.logger.setOptions({ "appenders": [consoleAppender], - "level": mkws.stringToLevel(mkws.log_level) }); +mkws.logger.setOptions({ "appenders": [consoleAppender] }); -function _log(fn, string) { - if (!mkws.log_level) - return; - - // you need to disable use strict at the top of the file!!! - if (mkws.log_level >= 3) { - // Works in Chrome; not sure about elsewhere - console.trace(); - } else if (mkws.log_level >= 2) { - - } - 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) }; @@ -170,16 +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') mkws.log_level = tmp; - var config_default = { use_service_proxy: true, pazpar2_url: undefined, @@ -667,6 +658,9 @@ mkws.info("Using window.name '" + window.name + "'"); } else if (!mkws.authenticating) { // raw pp2 or we have a session already open runAutoSearches(); + for (var teamName in mkws.teams) { + mkws.teams[teamName].queue("authenticated").publish(); + } } mkws.isActive = true; @@ -679,4 +673,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.$);