Merge branch 'MDL-51539-master' of git://github.com/damyon/moodle
This commit is contained in:
Dan Poltawski
Vendored
+1
-1
@@ -1 +1 @@
|
||||
!function(a,b){"object"==typeof module&&module.exports&&"function"==typeof require?module.exports=b():"function"==typeof define&&"object"==typeof define.amd?define(b):a.log=b()}(this,function(){function a(a){return typeof console===i?!1:void 0!==console[a]?b(console,a):void 0!==console.log?b(console,"log"):h}function b(a,b){var c=a[b];if("function"==typeof c.bind)return c.bind(a);try{return Function.prototype.bind.call(c,a)}catch(d){return function(){return Function.prototype.apply.apply(c,[a,arguments])}}}function c(a,b){return function(){typeof console!==i&&(d(b),g[a].apply(g,arguments))}}function d(a){for(var b=0;b<j.length;b++){var c=j[b];g[c]=a>b?h:g.methodFactory(c,a)}}function e(a){var b=(j[a]||"silent").toUpperCase();try{return void(window.localStorage.loglevel=b)}catch(c){}try{window.document.cookie="loglevel="+b+";"}catch(c){}}function f(){var a;try{a=window.localStorage.loglevel}catch(b){}if(typeof a===i)try{a=/loglevel=([^;]+)/.exec(window.document.cookie)[1]}catch(b){}void 0===g.levels[a]&&(a="WARN"),g.setLevel(g.levels[a])}var g={},h=function(){},i="undefined",j=["trace","debug","info","warn","error"];g.levels={TRACE:0,DEBUG:1,INFO:2,WARN:3,ERROR:4,SILENT:5},g.methodFactory=function(b,d){return a(b)||c(b,d)},g.setLevel=function(a){if("string"==typeof a&&void 0!==g.levels[a.toUpperCase()]&&(a=g.levels[a.toUpperCase()]),!("number"==typeof a&&a>=0&&a<=g.levels.SILENT))throw"log.setLevel() called with invalid level: "+a;return e(a),d(a),typeof console===i&&a<g.levels.SILENT?"No console available for logging":void 0},g.enableAll=function(){g.setLevel(g.levels.TRACE)},g.disableAll=function(){g.setLevel(g.levels.SILENT)};var k=typeof window!==i?window.log:void 0;return g.noConflict=function(){return typeof window!==i&&window.log===g&&(window.log=k),g},f(),g});
|
||||
!function(a,b){"use strict";"object"==typeof module&&module.exports&&"function"==typeof require?module.exports=b():"function"==typeof define&&"object"==typeof define.amd?define(b):a.log=b()}(this,function(){"use strict";function a(a){return typeof console===h?!1:void 0!==console[a]?b(console,a):void 0!==console.log?b(console,"log"):g}function b(a,b){var c=a[b];if("function"==typeof c.bind)return c.bind(a);try{return Function.prototype.bind.call(c,a)}catch(d){return function(){return Function.prototype.apply.apply(c,[a,arguments])}}}function c(a,b,c){return function(){typeof console!==h&&(d.call(this,b,c),this[a].apply(this,arguments))}}function d(a,b){for(var c=0;c<i.length;c++){var d=i[c];this[d]=a>c?g:this.methodFactory(d,a,b)}}function e(b,d,e){return a(b)||c.apply(this,arguments)}function f(a,b,c){function f(a){var b=(i[a]||"silent").toUpperCase();try{return void(window.localStorage[l]=b)}catch(c){}try{window.document.cookie=encodeURIComponent(l)+"="+b+";"}catch(c){}}function g(){var a;try{a=window.localStorage[l]}catch(b){}if(typeof a===h)try{var c=window.document.cookie,d=c.indexOf(encodeURIComponent(l)+"=");d&&(a=/^([^;]+)/.exec(c.slice(d))[1])}catch(b){}return void 0===k.levels[a]&&(a=void 0),a}var j,k=this,l="loglevel";a&&(l+=":"+a),k.levels={TRACE:0,DEBUG:1,INFO:2,WARN:3,ERROR:4,SILENT:5},k.methodFactory=c||e,k.getLevel=function(){return j},k.setLevel=function(b,c){if("string"==typeof b&&void 0!==k.levels[b.toUpperCase()]&&(b=k.levels[b.toUpperCase()]),!("number"==typeof b&&b>=0&&b<=k.levels.SILENT))throw"log.setLevel() called with invalid level: "+b;return j=b,c!==!1&&f(b),d.call(k,b,a),typeof console===h&&b<k.levels.SILENT?"No console available for logging":void 0},k.setDefaultLevel=function(a){g()||k.setLevel(a,!1)},k.enableAll=function(a){k.setLevel(k.levels.TRACE,a)},k.disableAll=function(a){k.setLevel(k.levels.SILENT,a)};var m=g();null==m&&(m=null==b?"WARN":b),k.setLevel(m,!1)}var g=function(){},h="undefined",i=["trace","debug","info","warn","error"],j=new f,k={};j.getLogger=function(a){if("string"!=typeof a||""===a)throw new TypeError("You must supply a name when creating a logger.");var b=k[a];return b||(b=k[a]=new f(a,j.getLevel(),j.methodFactory)),b};var l=typeof window!==h?window.log:void 0;return j.noConflict=function(){return typeof window!==h&&window.log===j&&(window.log=l),j},j});
|
||||
+135
-70
@@ -27,10 +27,12 @@
|
||||
// Copy loglevel.js into lib/amd/src/ in Moodle folder.
|
||||
// Add the license as a comment to the file and these instructions.
|
||||
// Add the jshint ignore:start and ignore:end comments.
|
||||
// Delete the jshint validthis:true comments.
|
||||
|
||||
/* jshint ignore:start */
|
||||
/*! loglevel - v1.2.0 - https://github.com/pimterry/loglevel - (c) 2014 Tim Perry - licensed MIT */
|
||||
/*! loglevel - v1.4.0 - https://github.com/pimterry/loglevel - (c) 2015 Tim Perry - licensed MIT */
|
||||
(function (root, definition) {
|
||||
"use strict";
|
||||
if (typeof module === 'object' && module.exports && typeof require === 'function') {
|
||||
module.exports = definition();
|
||||
} else if (typeof define === 'function' && typeof define.amd === 'object') {
|
||||
@@ -39,7 +41,7 @@
|
||||
root.log = definition();
|
||||
}
|
||||
}(this, function () {
|
||||
var self = {};
|
||||
"use strict";
|
||||
var noop = function() {};
|
||||
var undefinedType = "undefined";
|
||||
|
||||
@@ -71,15 +73,31 @@
|
||||
}
|
||||
}
|
||||
|
||||
function enableLoggingWhenConsoleArrives(methodName, level) {
|
||||
// these private functions always need `this` to be set properly
|
||||
|
||||
function enableLoggingWhenConsoleArrives(methodName, level, loggerName) {
|
||||
return function () {
|
||||
if (typeof console !== undefinedType) {
|
||||
replaceLoggingMethods(level);
|
||||
self[methodName].apply(self, arguments);
|
||||
replaceLoggingMethods.call(this, level, loggerName);
|
||||
this[methodName].apply(this, arguments);
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function replaceLoggingMethods(level, loggerName) {
|
||||
for (var i = 0; i < logMethods.length; i++) {
|
||||
var methodName = logMethods[i];
|
||||
this[methodName] = (i < level) ?
|
||||
noop :
|
||||
this.methodFactory(methodName, level, loggerName);
|
||||
}
|
||||
}
|
||||
|
||||
function defaultMethodFactory(methodName, level, loggerName) {
|
||||
return realMethod(methodName) ||
|
||||
enableLoggingWhenConsoleArrives.apply(this, arguments);
|
||||
}
|
||||
|
||||
var logMethods = [
|
||||
"trace",
|
||||
"debug",
|
||||
@@ -88,97 +106,144 @@
|
||||
"error"
|
||||
];
|
||||
|
||||
function replaceLoggingMethods(level) {
|
||||
for (var i = 0; i < logMethods.length; i++) {
|
||||
var methodName = logMethods[i];
|
||||
self[methodName] = (i < level) ? noop : self.methodFactory(methodName, level);
|
||||
}
|
||||
}
|
||||
function Logger(name, defaultLevel, factory) {
|
||||
var self = this;
|
||||
var currentLevel;
|
||||
var storageKey = "loglevel";
|
||||
if (name) {
|
||||
storageKey += ":" + name;
|
||||
}
|
||||
|
||||
function persistLevelIfPossible(levelNum) {
|
||||
var levelName = (logMethods[levelNum] || 'silent').toUpperCase();
|
||||
function persistLevelIfPossible(levelNum) {
|
||||
var levelName = (logMethods[levelNum] || 'silent').toUpperCase();
|
||||
|
||||
// Use localStorage if available
|
||||
try {
|
||||
window.localStorage['loglevel'] = levelName;
|
||||
return;
|
||||
} catch (ignore) {}
|
||||
// Use localStorage if available
|
||||
try {
|
||||
window.localStorage[storageKey] = levelName;
|
||||
return;
|
||||
} catch (ignore) {}
|
||||
|
||||
// Use session cookie as fallback
|
||||
try {
|
||||
window.document.cookie = "loglevel=" + levelName + ";";
|
||||
} catch (ignore) {}
|
||||
}
|
||||
// Use session cookie as fallback
|
||||
try {
|
||||
window.document.cookie =
|
||||
encodeURIComponent(storageKey) + "=" + levelName + ";";
|
||||
} catch (ignore) {}
|
||||
}
|
||||
|
||||
function loadPersistedLevel() {
|
||||
var storedLevel;
|
||||
function getPersistedLevel() {
|
||||
var storedLevel;
|
||||
|
||||
try {
|
||||
storedLevel = window.localStorage['loglevel'];
|
||||
} catch (ignore) {}
|
||||
try {
|
||||
storedLevel = window.localStorage[storageKey];
|
||||
} catch (ignore) {}
|
||||
|
||||
if (typeof storedLevel === undefinedType) {
|
||||
try {
|
||||
storedLevel = /loglevel=([^;]+)/.exec(window.document.cookie)[1];
|
||||
} catch (ignore) {}
|
||||
}
|
||||
|
||||
if (self.levels[storedLevel] === undefined) {
|
||||
storedLevel = "WARN";
|
||||
}
|
||||
if (typeof storedLevel === undefinedType) {
|
||||
try {
|
||||
var cookie = window.document.cookie;
|
||||
var location = cookie.indexOf(
|
||||
encodeURIComponent(storageKey) + "=");
|
||||
if (location) {
|
||||
storedLevel = /^([^;]+)/.exec(cookie.slice(location))[1];
|
||||
}
|
||||
} catch (ignore) {}
|
||||
}
|
||||
|
||||
self.setLevel(self.levels[storedLevel]);
|
||||
// If the stored level is not valid, treat it as if nothing was stored.
|
||||
if (self.levels[storedLevel] === undefined) {
|
||||
storedLevel = undefined;
|
||||
}
|
||||
|
||||
return storedLevel;
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* Public API
|
||||
*
|
||||
*/
|
||||
|
||||
self.levels = { "TRACE": 0, "DEBUG": 1, "INFO": 2, "WARN": 3,
|
||||
"ERROR": 4, "SILENT": 5};
|
||||
|
||||
self.methodFactory = factory || defaultMethodFactory;
|
||||
|
||||
self.getLevel = function () {
|
||||
return currentLevel;
|
||||
};
|
||||
|
||||
self.setLevel = function (level, persist) {
|
||||
if (typeof level === "string" && self.levels[level.toUpperCase()] !== undefined) {
|
||||
level = self.levels[level.toUpperCase()];
|
||||
}
|
||||
if (typeof level === "number" && level >= 0 && level <= self.levels.SILENT) {
|
||||
currentLevel = level;
|
||||
if (persist !== false) { // defaults to true
|
||||
persistLevelIfPossible(level);
|
||||
}
|
||||
replaceLoggingMethods.call(self, level, name);
|
||||
if (typeof console === undefinedType && level < self.levels.SILENT) {
|
||||
return "No console available for logging";
|
||||
}
|
||||
} else {
|
||||
throw "log.setLevel() called with invalid level: " + level;
|
||||
}
|
||||
};
|
||||
|
||||
self.setDefaultLevel = function (level) {
|
||||
if (!getPersistedLevel()) {
|
||||
self.setLevel(level, false);
|
||||
}
|
||||
};
|
||||
|
||||
self.enableAll = function(persist) {
|
||||
self.setLevel(self.levels.TRACE, persist);
|
||||
};
|
||||
|
||||
self.disableAll = function(persist) {
|
||||
self.setLevel(self.levels.SILENT, persist);
|
||||
};
|
||||
|
||||
// Initialize with the right level
|
||||
var initialLevel = getPersistedLevel();
|
||||
if (initialLevel == null) {
|
||||
initialLevel = defaultLevel == null ? "WARN" : defaultLevel;
|
||||
}
|
||||
self.setLevel(initialLevel, false);
|
||||
}
|
||||
|
||||
/*
|
||||
*
|
||||
* Public API
|
||||
* Package-level API
|
||||
*
|
||||
*/
|
||||
|
||||
self.levels = { "TRACE": 0, "DEBUG": 1, "INFO": 2, "WARN": 3,
|
||||
"ERROR": 4, "SILENT": 5};
|
||||
var defaultLogger = new Logger();
|
||||
|
||||
self.methodFactory = function (methodName, level) {
|
||||
return realMethod(methodName) ||
|
||||
enableLoggingWhenConsoleArrives(methodName, level);
|
||||
};
|
||||
|
||||
self.setLevel = function (level) {
|
||||
if (typeof level === "string" && self.levels[level.toUpperCase()] !== undefined) {
|
||||
level = self.levels[level.toUpperCase()];
|
||||
var _loggersByName = {};
|
||||
defaultLogger.getLogger = function getLogger(name) {
|
||||
if (typeof name !== "string" || name === "") {
|
||||
throw new TypeError("You must supply a name when creating a logger.");
|
||||
}
|
||||
if (typeof level === "number" && level >= 0 && level <= self.levels.SILENT) {
|
||||
persistLevelIfPossible(level);
|
||||
replaceLoggingMethods(level);
|
||||
if (typeof console === undefinedType && level < self.levels.SILENT) {
|
||||
return "No console available for logging";
|
||||
}
|
||||
} else {
|
||||
throw "log.setLevel() called with invalid level: " + level;
|
||||
|
||||
var logger = _loggersByName[name];
|
||||
if (!logger) {
|
||||
logger = _loggersByName[name] = new Logger(
|
||||
name, defaultLogger.getLevel(), defaultLogger.methodFactory);
|
||||
}
|
||||
};
|
||||
|
||||
self.enableAll = function() {
|
||||
self.setLevel(self.levels.TRACE);
|
||||
};
|
||||
|
||||
self.disableAll = function() {
|
||||
self.setLevel(self.levels.SILENT);
|
||||
return logger;
|
||||
};
|
||||
|
||||
// Grab the current global log variable in case of overwrite
|
||||
var _log = (typeof window !== undefinedType) ? window.log : undefined;
|
||||
self.noConflict = function() {
|
||||
defaultLogger.noConflict = function() {
|
||||
if (typeof window !== undefinedType &&
|
||||
window.log === self) {
|
||||
window.log === defaultLogger) {
|
||||
window.log = _log;
|
||||
}
|
||||
|
||||
return self;
|
||||
return defaultLogger;
|
||||
};
|
||||
|
||||
loadPersistedLevel();
|
||||
return self;
|
||||
return defaultLogger;
|
||||
}));
|
||||
/* jshint ignore:end */
|
||||
|
||||
@@ -256,7 +256,7 @@
|
||||
<location>amd/src/loglevel.js</location>
|
||||
<name>loglevel.js</name>
|
||||
<license>MIT</license>
|
||||
<version>1.2.0</version>
|
||||
<version>1.4.0</version>
|
||||
</library>
|
||||
<library>
|
||||
<location>mustache</location>
|
||||
|
||||
Reference in New Issue
Block a user