This commit is contained in:
2021-11-25 19:08:22 +03:00
parent 3cc76baf5c
commit 7c096e52d3
6 changed files with 29 additions and 16 deletions
+7 -8
View File
@@ -9,11 +9,10 @@ window.kit = window.kit || {};
kit.config = kit.config || {}; kit.config = kit.config || {};
// [PluginManager] // [PluginManager]
Object.assign(kit.config, {
kit.config.assetsPath = '/local/templater.dev/kit/assets'; debug: true,
kit.config.requiredDependencies = ['bsCore', 'toolkit', 'support']; assetsPath: '/local/templater.dev/kit/assets',
kit.config.autoloadPluginList = ['tooltip', 'support']; requiredDependencies: ['bsCore', 'toolkit', 'support'],
kit.config.debug = true; autoloadPluginList: ['tooltip', 'support'],
kit.config.defaultPhoneMask = '+7 (999) 999-99-99'; defaultPhoneMask: '+7 (999) 999-99-99',
});
// [OtherPlugins]
+1
View File
@@ -474,6 +474,7 @@ window.kit.service = window.kit.service || {};
deps.forEach(function(pluginId, i, arr) { deps.forEach(function(pluginId, i, arr) {
var realPlugin = this.__getPlugin(pluginId); var realPlugin = this.__getPlugin(pluginId);
if(realPlugin === undefined) { if(realPlugin === undefined) {
console.warn(`Plugin "${pluginId}" not registered!`);
return false; return false;
} }
correct.push(realPlugin.id); correct.push(realPlugin.id);
+1 -1
View File
@@ -225,7 +225,7 @@ __PluginManager__.registerPlugins({
module: '/loggerService.js', module: '/loggerService.js',
css: '/loggerService.css', css: '/loggerService.css',
type: 'loader', type: 'loader',
deps: ['Logger', 'support'] deps: ['Logger', 'support', 'Collection']
}, },
fancybox: { fancybox: {
path: __pmConfig__.assetsPath + '/fancybox', path: __pmConfig__.assetsPath + '/fancybox',
+13 -4
View File
@@ -3,6 +3,7 @@ __PluginManager__.register('loggerService', function(module, exports, require, g
var support = require('support'); var support = require('support');
var Logger = require('Logger'); var Logger = require('Logger');
var Collection = require('Collection');
var lightMap = [ var lightMap = [
{class: 'kit-logger-row--success', keys: ['pass', 'success']}, {class: 'kit-logger-row--success', keys: ['pass', 'success']},
@@ -18,7 +19,6 @@ __PluginManager__.register('loggerService', function(module, exports, require, g
} }
return addClass; return addClass;
}; };
var htmlCollectionTemplater = '<div class="kit-logger kit-logger--fixed"></div>';
// function dump(value) { // function dump(value) {
// var rArray = []; // var rArray = [];
// if(value === null) { // if(value === null) {
@@ -60,7 +60,8 @@ __PluginManager__.register('loggerService', function(module, exports, require, g
*/ */
var LoggerService = function() { var LoggerService = function() {
Logger.prototype.constructor.apply(this, arguments); Logger.prototype.constructor.apply(this, arguments);
this.onLog.push(this.__log); this.onLog.push(this.__logHandler);
this.__htmlCollectionTemplater = '<div class="kit-logger kit-logger--fixed"></div>';
}; };
support.extend(LoggerService.prototype, Logger.prototype); support.extend(LoggerService.prototype, Logger.prototype);
@@ -69,7 +70,7 @@ __PluginManager__.register('loggerService', function(module, exports, require, g
/** /**
* @type {HTMLElement} * @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) { if((this.__htmlCollection instanceof HTMLElement) && !this.__htmlCollection.parentElement) {
document.body.appendChild(this.__htmlCollection) document.body.appendChild(this.__htmlCollection)
@@ -109,7 +110,7 @@ __PluginManager__.register('loggerService', function(module, exports, require, g
log.scrollTop = log.scrollHeight; log.scrollTop = log.scrollHeight;
}; };
LoggerService.prototype.__log = function(data = { LoggerService.prototype.__logHandler = function(data = {
lvl: 0, lvl: 0,
message: '', message: '',
context: [], context: [],
@@ -122,6 +123,14 @@ __PluginManager__.register('loggerService', function(module, exports, require, g
this.__row(data.context, lvl+1); 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 * @memberOf kit.service
* @class logger * @class logger
+1 -1
View File
@@ -42,7 +42,7 @@
kit.service.logger.warning('FRAME LIST ...'); kit.service.logger.warning('FRAME LIST ...');
kit.service.logger.notice(' '); kit.service.logger.notice(' ');
console.log(frameList); //console.log(frameList);
frameList.map(function (data) { frameList.map(function (data) {
data.iframe.onload = function() { data.iframe.onload = function() {
data.window = data.iframe.contentWindow; data.window = data.iframe.contentWindow;
+6 -2
View File
@@ -16,8 +16,8 @@ $APPLICATION->ShowHead();
?> ?>
<script> <script>
kit.ready(['date', 'logger'], function () { kit.ready(['testing', 'date', 'logger', 'loggerService'], function () {
var unit = new kit.testing.Unit();
var logger = new kit.Logger(); var logger = new kit.Logger();
logger.error('Привет мир!'); logger.error('Привет мир!');
@@ -43,6 +43,10 @@ $APPLICATION->ShowHead();
}, },
}); });
kit.service.logger.logList(logger.collection);
unit.assertSame(5, kit.service.logger.collection.length, 'Проверка количества логов в логерСервисе после подгрузки логов из класса Logger через loggerService.logList');
}); });
</script> </script>