X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fmkws-core.js;h=327519a2ef111450c4c53b4161fedb0b0a881e4c;hb=7d7a5862b72296ef76b6f4f5cfb7b0e89147b6a3;hp=176e6d78e8f26eaf62454fd7043a0b680e1d9329;hpb=3ea5eadbf06a63b5a8fd10ddead6fd9e37f9740e;p=mkws-moved-to-github.git

diff --git a/src/mkws-core.js b/src/mkws-core.js
index 176e6d7..327519a 100644
--- a/src/mkws-core.js
+++ b/src/mkws-core.js
@@ -114,21 +114,11 @@ var consoleAppender = JL.createConsoleAppender('consoleAppender');
 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) };
@@ -169,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,
@@ -681,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.$);