From f10d2b7c1804a4e40b125b951a596e7c70f1d6a8 Mon Sep 17 00:00:00 2001 From: bellord13 Date: Sat, 21 Aug 2021 16:56:40 +0300 Subject: [PATCH] fix --- README.md | 2 +- assets/config/config.js | 5 +- assets/config/toolkit.config.css | 92 +++++++++++++++++++++++++++++++ assets/core/core.js | 22 +++++--- assets/core/core.register.js | 41 +++++++------- assets/main/main.js | 5 ++ assets/toolkit/toolkit.css | 94 +------------------------------- tests/cheatsheet.php | 19 +++++-- 8 files changed, 153 insertions(+), 127 deletions(-) create mode 100644 assets/config/toolkit.config.css create mode 100644 assets/main/main.js diff --git a/README.md b/README.md index 9c71bd8..d6c166b 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ## is a dependency wt.core [![Build Status](https://travis-ci.org/joemccann/dillinger.svg?branch=master)](https://bitbucket.org/andreyleoua/wt.core/) -Предназначен для асинхронной работы с ресурсами используемыми на веб-проектах. +Предназначен для асинхронной работы с ресурсами на веб-проектах. ## Термины и определения в контексте фреймворка diff --git a/assets/config/config.js b/assets/config/config.js index 3506550..5b22620 100644 --- a/assets/config/config.js +++ b/assets/config/config.js @@ -1,6 +1,7 @@ window.kit = window.kit || {}; kit.config = kit.config || {}; -kit.config.defaultPath = '/local/templates.dev/kit/assets'; +kit.config.defaultPath = '/local/templater.dev/kit/assets'; kit.config.requiredDependencies = ['bsCore', 'toolkit']; -kit.config.debug = false; \ No newline at end of file +kit.config.autoloadPluginList = ['tooltip']; +kit.config.debug = true; \ No newline at end of file diff --git a/assets/config/toolkit.config.css b/assets/config/toolkit.config.css new file mode 100644 index 0000000..e2f0303 --- /dev/null +++ b/assets/config/toolkit.config.css @@ -0,0 +1,92 @@ +:root { + + --kit-color-error-w5: hsl(0, 100%, 80%); + --kit-color-error-w4: hsl(0, 100%, 75%); + --kit-color-error-w3: hsl(0, 100%, 70%); + --kit-color-error-w2: hsl(0, 100%, 65%); + --kit-color-error-w1: hsl(0, 100%, 60%); + --kit-color-error: hsl(0, 100%, 55%); + --kit-color-error-b1: hsl(0, 100%, 50%); + --kit-color-error-b2: hsl(0, 100%, 45%); + --kit-color-error-b3: hsl(0, 100%, 40%); + --kit-color-error-b4: hsl(0, 100%, 35%); + --kit-color-error-b5: hsl(0, 100%, 30%); + + --kit-color-error-text: #FFF; + + --kit-color-warning-w5: hsl(36, 94%, 80%); + --kit-color-warning-w4: hsl(36, 94%, 75%); + --kit-color-warning-w3: hsl(36, 94%, 70%); + --kit-color-warning-w2: hsl(36, 94%, 65%); + --kit-color-warning-w1: hsl(36, 94%, 60%); + --kit-color-warning: hsl(36, 94%, 55%); + --kit-color-warning-b1: hsl(36, 94%, 50%); + --kit-color-warning-b2: hsl(36, 94%, 45%); + --kit-color-warning-b3: hsl(36, 94%, 40%); + --kit-color-warning-b4: hsl(36, 94%, 35%); + --kit-color-warning-b5: hsl(36, 94%, 30%); + + + --kit-color-success-w5: hsl(128, 45%, 80%); + --kit-color-success-w4: hsl(128, 45%, 75%); + --kit-color-success-w3: hsl(128, 45%, 70%); + --kit-color-success-w2: hsl(128, 45%, 65%); + --kit-color-success-w1: hsl(128, 45%, 60%); + --kit-color-success: hsl(128, 45%, 55%); + --kit-color-success-b1: hsl(128, 45%, 50%); + --kit-color-success-b2: hsl(128, 45%, 45%); + --kit-color-success-b3: hsl(128, 45%, 40%); + --kit-color-success-b4: hsl(128, 45%, 35%); + --kit-color-success-b5: hsl(128, 45%, 30%); + + + --kit-color-readonly-w2: hsl(0, 0%, 65%); + --kit-color-readonly-w1: hsl(0, 0%, 60%); + --kit-color-readonly: hsl(0, 0%, 55%); + --kit-color-readonly-b1: hsl(0, 0%, 50%); + --kit-color-readonly-b2: hsl(0, 0%, 45%); + + + + --kit-color-content: hsl(0, 0%, 100%); + --kit-color-content-b1: hsl(0, 0%, 97%); + --kit-color-content-b2: hsl(0, 0%, 94%); + --kit-color-content-b3: hsl(0, 0%, 91%); + --kit-color-content-b4: hsl(0, 0%, 88%); + --kit-color-content-b5: hsl(0, 0%, 85%); + + --kit-color-text-w3: #404040; + --kit-color-text-w2: #333333; + --kit-color-text-w1: #262626; + --kit-color-text: #1a1a1a; + + --kit-color: #1a1a1a; + --kit-color-text-hover: var(--kit-color-primary); + + --kit-color-primary-w3: hsl(22, 100%, 70%); + --kit-color-primary-w2: hsl(22, 100%, 65%); + --kit-color-primary-w1: hsl(22, 100%, 60%); + --kit-color-primary: hsl(22, 100%, 55%); + --kit-color-primary-b1: hsl(22, 100%, 50%); + --kit-color-primary-b2: hsl(22, 100%, 45%); + --kit-color-primary-b3: hsl(22, 100%, 40%); + --kit-color-primary-text: #FFF; + + --kit-color-secondary-w3: hsl(0, 0%, 70%); + --kit-color-secondary-w2: hsl(0, 0%, 65%); + --kit-color-secondary-w1: hsl(0, 0%, 60%); + --kit-color-secondary: hsl(0, 0%, 55%); + --kit-color-secondary-b1: hsl(0, 0%, 50%); + --kit-color-secondary-b2: hsl(0, 0%, 45%); + --kit-color-secondary-b3: hsl(0, 0%, 40%); + + --kit-color-secondary-text: #FFF; + + --font-size: 16px; + --kit-color-icon: #DADADA; + --kit-color-icon-hover: #b6b6b6; + --kit-color-placeholder: #b1b1b1; + --kit-font-family: 'Roboto', Arial, sans-serif; + + +} \ No newline at end of file diff --git a/assets/core/core.js b/assets/core/core.js index 1bfedf4..84cd579 100644 --- a/assets/core/core.js +++ b/assets/core/core.js @@ -15,10 +15,17 @@ window.kit = window.kit || {}; loader: 'loader', import: 'import', }; - var PluginManager = function(global, modules = {}){ + + /** + * @class PluginManager + * @param global + * @param plugins + * @constructor + */ + var PluginManager = function(global, plugins = {}){ this.plugins = {}; this.global = global; - this.registerPlugins(modules); + this.registerPlugins(plugins); }; var __proto = PluginManager.prototype; @@ -580,6 +587,7 @@ window.kit = window.kit || {}; var defaultConfig = { defaultPath: '', requiredDependencies: [], + autoloadPluginList: [], debug: false, }; var manager = new PluginManager(global); @@ -592,18 +600,18 @@ window.kit = window.kit || {}; }); manager.install('PluginManager'); manager.register('config', { - alias: 'pm', type: moduleTypeList.loader, loader: function(module, exports, require, global) { - global.config = global.config || {}; - global.config = Object.assign(defaultConfig, global.config); + var config = global.config || {}; + config = Object.assign({}, defaultConfig, config); + window.__pmConfig__ = global.config = config; } }); manager.install('config'); - global.PluginManager = manager; + window.__PluginManager__ = global.PluginManager = global.pm = manager; global.ready = manager.ready.bind(manager); global.exec = manager.exec.bind(manager); global.require = manager.require.bind(manager); -})(kit || window); +})(kit); diff --git a/assets/core/core.register.js b/assets/core/core.register.js index f7430e2..da5468c 100644 --- a/assets/core/core.register.js +++ b/assets/core/core.register.js @@ -1,6 +1,6 @@ -kit.PluginManager.registerPlugins({ +__PluginManager__.registerPlugins({ menu: { - path: kit.config.defaultPath + '/menu', + path: __pmConfig__.defaultPath + '/menu', module: '/menu.js', css: [ '/menu.css' @@ -9,28 +9,28 @@ kit.PluginManager.registerPlugins({ deps: ['lib', 'align', 'utils'] }, lib: { - path: kit.config.defaultPath + '/lib', + path: __pmConfig__.defaultPath + '/lib', module: '/lib.js', type: 'loader', }, align: { - path: kit.config.defaultPath + '/align', + path: __pmConfig__.defaultPath + '/align', module: '/align.js', type: 'loader', }, utils: { - path: kit.config.defaultPath + '/utils', + path: __pmConfig__.defaultPath + '/utils', module: '/utils.js', type: 'loader', }, jquery: { - path: kit.config.defaultPath + '/jquery', + path: __pmConfig__.defaultPath + '/jquery', module: '/jquery.min.js', type: 'loader', alias: '$', }, tooltip: { - path: kit.config.defaultPath + '/tooltip', + path: __pmConfig__.defaultPath + '/tooltip', module: '/tooltip.js', type: 'loader', css: '/tooltip.css', @@ -40,13 +40,13 @@ kit.PluginManager.registerPlugins({ deps: ['popper', 'bsCore'], }, popper: { - path: kit.config.defaultPath + '/popper', + path: __pmConfig__.defaultPath + '/popper', alias: 'popper.js', module: '/popper.js', type: 'loader', }, bsCore: { - path: kit.config.defaultPath + '/bsCore', + path: __pmConfig__.defaultPath + '/bsCore', module: '/bsCore.js', type: 'loader', css: [ @@ -54,20 +54,20 @@ kit.PluginManager.registerPlugins({ ] }, mask: { - path: kit.config.defaultPath + '/mask', + path: __pmConfig__.defaultPath + '/mask', module: '/mask.js', type: 'loader', deps: ['jquery'], }, toolkit: { - path: kit.config.defaultPath + '/toolkit', + path: __pmConfig__.defaultPath + '/toolkit', module: '/toolkit.js', type: 'loader', css: ['/toolkit.css'], deps: ['jquery', 'mask'], }, modal: { - path: kit.config.defaultPath + '/modal', + path: __pmConfig__.defaultPath + '/modal', module: '/modal.js', type: 'loader', css: [ @@ -92,7 +92,7 @@ kit.PluginManager.registerPlugins({ }, }, collapse: { - path: kit.config.defaultPath + '/collapse', + path: __pmConfig__.defaultPath + '/collapse', module: '/collapse.js', type: 'loader', css: [ @@ -106,7 +106,7 @@ kit.PluginManager.registerPlugins({ }, }, datepicker: { - path: kit.config.defaultPath + '/datepicker', + path: __pmConfig__.defaultPath + '/datepicker', module: '/js/datepicker.js', type: 'loader', css: [ @@ -122,16 +122,17 @@ kit.PluginManager.registerPlugins({ }); -kit.config.debug && (function(){ +__pmConfig__.debug && (function(){ console.log('%ckit.reg', 'color:#2053ff'); document.addEventListener("DOMContentLoaded", function () { console.log('%cDOMContentLoaded', 'color:#2053ff'); }); - kit.exec(function () { + __PluginManager__.exec(function () { console.log('%ckit.exec', 'color:#2053ff'); }); - kit.ready(function () { - console.log('%ckit.ready', 'color:#2053ff'); - }); }()); - +__PluginManager__.ready(__pmConfig__.autoloadPluginList, function () { + __pmConfig__.debug && (function() { + console.log('%ckit.ready', 'color:#2053ff'); + }()); +}); \ No newline at end of file diff --git a/assets/main/main.js b/assets/main/main.js new file mode 100644 index 0000000..393f19f --- /dev/null +++ b/assets/main/main.js @@ -0,0 +1,5 @@ +kit.ready(function () { + + + +}); \ No newline at end of file diff --git a/assets/toolkit/toolkit.css b/assets/toolkit/toolkit.css index c44c83f..5935d1a 100644 --- a/assets/toolkit/toolkit.css +++ b/assets/toolkit/toolkit.css @@ -1,96 +1,3 @@ -:root { - - - --kit-color-error-w5: hsl(0, 100%, 80%); - --kit-color-error-w4: hsl(0, 100%, 75%); - --kit-color-error-w3: hsl(0, 100%, 70%); - --kit-color-error-w2: hsl(0, 100%, 65%); - --kit-color-error-w1: hsl(0, 100%, 60%); - --kit-color-error: hsl(0, 100%, 55%); - --kit-color-error-b1: hsl(0, 100%, 50%); - --kit-color-error-b2: hsl(0, 100%, 45%); - --kit-color-error-b3: hsl(0, 100%, 40%); - --kit-color-error-b4: hsl(0, 100%, 35%); - --kit-color-error-b5: hsl(0, 100%, 30%); - - --kit-color-error-text: #FFF; - - --kit-color-warning-w5: hsl(36, 94%, 80%); - --kit-color-warning-w4: hsl(36, 94%, 75%); - --kit-color-warning-w3: hsl(36, 94%, 70%); - --kit-color-warning-w2: hsl(36, 94%, 65%); - --kit-color-warning-w1: hsl(36, 94%, 60%); - --kit-color-warning: hsl(36, 94%, 55%); - --kit-color-warning-b1: hsl(36, 94%, 50%); - --kit-color-warning-b2: hsl(36, 94%, 45%); - --kit-color-warning-b3: hsl(36, 94%, 40%); - --kit-color-warning-b4: hsl(36, 94%, 35%); - --kit-color-warning-b5: hsl(36, 94%, 30%); - - - --kit-color-success-w5: hsl(128, 45%, 80%); - --kit-color-success-w4: hsl(128, 45%, 75%); - --kit-color-success-w3: hsl(128, 45%, 70%); - --kit-color-success-w2: hsl(128, 45%, 65%); - --kit-color-success-w1: hsl(128, 45%, 60%); - --kit-color-success: hsl(128, 45%, 55%); - --kit-color-success-b1: hsl(128, 45%, 50%); - --kit-color-success-b2: hsl(128, 45%, 45%); - --kit-color-success-b3: hsl(128, 45%, 40%); - --kit-color-success-b4: hsl(128, 45%, 35%); - --kit-color-success-b5: hsl(128, 45%, 30%); - - - --kit-color-readonly-w2: hsl(0, 0%, 65%); - --kit-color-readonly-w1: hsl(0, 0%, 60%); - --kit-color-readonly: hsl(0, 0%, 55%); - --kit-color-readonly-b1: hsl(0, 0%, 50%); - --kit-color-readonly-b2: hsl(0, 0%, 45%); - - - - --kit-color-content: hsl(0, 0%, 100%); - --kit-color-content-b1: hsl(0, 0%, 97%); - --kit-color-content-b2: hsl(0, 0%, 94%); - --kit-color-content-b3: hsl(0, 0%, 91%); - --kit-color-content-b4: hsl(0, 0%, 88%); - --kit-color-content-b5: hsl(0, 0%, 85%); - - --kit-color-text-w3: #404040; - --kit-color-text-w2: #333333; - --kit-color-text-w1: #262626; - --kit-color-text: #1a1a1a; - - --kit-color: #1a1a1a; - --kit-color-text-hover: var(--kit-color-primary); - - --kit-color-primary-w3: hsl(22, 100%, 70%); - --kit-color-primary-w2: hsl(22, 100%, 65%); - --kit-color-primary-w1: hsl(22, 100%, 60%); - --kit-color-primary: hsl(22, 100%, 55%); - --kit-color-primary-b1: hsl(22, 100%, 50%); - --kit-color-primary-b2: hsl(22, 100%, 45%); - --kit-color-primary-b3: hsl(22, 100%, 40%); - --kit-color-primary-text: #FFF; - - --kit-color-secondary-w3: hsl(0, 0%, 70%); - --kit-color-secondary-w2: hsl(0, 0%, 65%); - --kit-color-secondary-w1: hsl(0, 0%, 60%); - --kit-color-secondary: hsl(0, 0%, 55%); - --kit-color-secondary-b1: hsl(0, 0%, 50%); - --kit-color-secondary-b2: hsl(0, 0%, 45%); - --kit-color-secondary-b3: hsl(0, 0%, 40%); - - --kit-color-secondary-text: #FFF; - - --font-size: 16px; - --kit-color-icon: #DADADA; - --kit-color-icon-hover: #b6b6b6; - --kit-color-placeholder: #b1b1b1; - --kit-font-family: 'Roboto', Arial, sans-serif; - - -} *, :after, :before { box-sizing: border-box; } @@ -834,6 +741,7 @@ } .kit-button__label { --line-clamp: 1; + --line-clamp-height: 1em; white-space: normal; text-transform: uppercase; font-size: 0.9em; diff --git a/tests/cheatsheet.php b/tests/cheatsheet.php index d8d18a7..5d2d5da 100644 --- a/tests/cheatsheet.php +++ b/tests/cheatsheet.php @@ -1,6 +1,18 @@ - + service()->assets()->setPlugin([ + 'kit:config', + 'kit:flex-kit', + 'kit:core', + 'kit:bsCore', + 'kit:collapse', + 'kit:site', + 'kit:toolkit', + 'kit:theme', + ])->render(); +} +$APPLICATION->ShowHead(); ?> @@ -886,5 +898,4 @@ - \ No newline at end of file +?> \ No newline at end of file