X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=blobdiff_plain;f=src%2Fmkws-core.js;h=1d4d26ed32881c8ad5f69194e6eb66db31c16dc6;hp=c331bc4ba8e225edddf76b79f87f20c4c5a70bd8;hb=a400ffb90ea4c58ac7505052e00484421d7a4e7b;hpb=08fda796a375b76c6fbb9613ba3ead2de7271a17 diff --git a/src/mkws-core.js b/src/mkws-core.js index c331bc4..1d4d26e 100644 --- a/src/mkws-core.js +++ b/src/mkws-core.js @@ -16,6 +16,7 @@ window.mkws = { authenticated: false, authenticating: false, active: false, + logger: undefined, log_level: 1, // Will be overridden from mkws.config, but // initial value allows jQuery popup to use logging. teams: {}, @@ -90,25 +91,38 @@ if (typeof(mkws_jQuery) !== "undefined") { mkws.$ = jQuery; } -mkws.log = function(string) { - if (!mkws.log_level) - return; +mkws.logger = JL('mkws'); +var consoleAppender = JL.createConsoleAppender('consoleAppender'); +mkws.logger.setOptions({ "appenders": [consoleAppender]} ); + - if (typeof console === "undefined" || typeof console.log === "undefined") { /* ARGH!!! old IE */ +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) { - console.log(">>> called from function " + arguments.callee.caller.name + ' <<<'); + } - console.log(string); + fn.call(mkws.logger, string); }; +mkws.log = function(x) { _log(mkws.logger.debug, x) }; +/* +trace("message with severity trace"); +debug("message with severity debug"); +info("message with severity info"); +warn("message with severity warn"); +error("message with severity error"); +fatal("message with severity fatal"); +*/ + + + // Translation function. mkws.M = function(word) { var lang = mkws.config.lang;