diff --git a/assets/config/config.js b/assets/config/config.js index e6c4b34..3e6cc2a 100644 --- a/assets/config/config.js +++ b/assets/config/config.js @@ -9,11 +9,10 @@ window.kit = window.kit || {}; kit.config = kit.config || {}; // [PluginManager] - -kit.config.assetsPath = '/local/templater.dev/kit/assets'; -kit.config.requiredDependencies = ['bsCore', 'toolkit', 'support']; -kit.config.autoloadPluginList = ['tooltip', 'support']; -kit.config.debug = true; -kit.config.defaultPhoneMask = '+7 (999) 999-99-99'; - -// [OtherPlugins] \ No newline at end of file +Object.assign(kit.config, { + debug: true, + assetsPath: '/local/templater.dev/kit/assets', + requiredDependencies: ['bsCore', 'toolkit', 'support'], + autoloadPluginList: ['tooltip', 'support'], + defaultPhoneMask: '+7 (999) 999-99-99', +}); \ No newline at end of file diff --git a/assets/core/core.js b/assets/core/core.js index 1bc6432..a6f49d2 100644 --- a/assets/core/core.js +++ b/assets/core/core.js @@ -474,6 +474,7 @@ window.kit.service = window.kit.service || {}; deps.forEach(function(pluginId, i, arr) { var realPlugin = this.__getPlugin(pluginId); if(realPlugin === undefined) { + console.warn(`Plugin "${pluginId}" not registered!`); return false; } correct.push(realPlugin.id); diff --git a/assets/core/core.register.js b/assets/core/core.register.js index 8cd6fb1..697a4a7 100644 --- a/assets/core/core.register.js +++ b/assets/core/core.register.js @@ -225,7 +225,7 @@ __PluginManager__.registerPlugins({ module: '/loggerService.js', css: '/loggerService.css', type: 'loader', - deps: ['Logger', 'support'] + deps: ['Logger', 'support', 'Collection'] }, fancybox: { path: __pmConfig__.assetsPath + '/fancybox', diff --git a/assets/loggerService/loggerService.js b/assets/loggerService/loggerService.js index c2a9188..dfaa517 100644 --- a/assets/loggerService/loggerService.js +++ b/assets/loggerService/loggerService.js @@ -3,6 +3,7 @@ __PluginManager__.register('loggerService', function(module, exports, require, g var support = require('support'); var Logger = require('Logger'); + var Collection = require('Collection'); var lightMap = [ {class: 'kit-logger-row--success', keys: ['pass', 'success']}, @@ -18,7 +19,6 @@ __PluginManager__.register('loggerService', function(module, exports, require, g } return addClass; }; - var htmlCollectionTemplater = '
'; // function dump(value) { // var rArray = []; // if(value === null) { @@ -60,7 +60,8 @@ __PluginManager__.register('loggerService', function(module, exports, require, g */ var LoggerService = function() { Logger.prototype.constructor.apply(this, arguments); - this.onLog.push(this.__log); + this.onLog.push(this.__logHandler); + this.__htmlCollectionTemplater = '
'; }; support.extend(LoggerService.prototype, Logger.prototype); @@ -69,7 +70,7 @@ __PluginManager__.register('loggerService', function(module, exports, require, g /** * @type {HTMLElement} */ - this.__htmlCollection = node || document.getElementById('kit-logger') || document.querySelector('.kit-logger') || support.makeNode(__htmlCollectionTemplater); + this.__htmlCollection = node || document.getElementById('kit-logger') || document.querySelector('.kit-logger') || support.makeNode(this.__htmlCollectionTemplater); if((this.__htmlCollection instanceof HTMLElement) && !this.__htmlCollection.parentElement) { document.body.appendChild(this.__htmlCollection) @@ -109,7 +110,7 @@ __PluginManager__.register('loggerService', function(module, exports, require, g log.scrollTop = log.scrollHeight; }; - LoggerService.prototype.__log = function(data = { + LoggerService.prototype.__logHandler = function(data = { lvl: 0, message: '', context: [], @@ -122,6 +123,14 @@ __PluginManager__.register('loggerService', function(module, exports, require, g this.__row(data.context, lvl+1); }; + LoggerService.prototype.logList = function (logList) { + var self = this; + logList = new Collection(logList); + logList.map(function (log) { + self.log(log.lvl, log.message, log.context, log.type); + }); + }; + /** * @memberOf kit.service * @class logger diff --git a/tests/index.php b/tests/index.php index fa780c4..71a35d3 100644 --- a/tests/index.php +++ b/tests/index.php @@ -42,7 +42,7 @@ kit.service.logger.warning('FRAME LIST ...'); kit.service.logger.notice(' '); - console.log(frameList); + //console.log(frameList); frameList.map(function (data) { data.iframe.onload = function() { data.window = data.iframe.contentWindow; diff --git a/tests/loggerTest.php b/tests/loggerTest.php index 76b2ca8..cc1c9cb 100644 --- a/tests/loggerTest.php +++ b/tests/loggerTest.php @@ -16,8 +16,8 @@ $APPLICATION->ShowHead(); ?>