diff --git a/assets/bsToast/bsToast.css b/assets/bsToast/bsToast.css deleted file mode 100644 index d3fef82..0000000 --- a/assets/bsToast/bsToast.css +++ /dev/null @@ -1,57 +0,0 @@ - -.toast { - width: 350px; - max-width: 100%; - font-size: 0.875rem; - pointer-events: auto; - background-color: rgba(255, 255, 255, 0.85); - background-clip: padding-box; - border: 1px solid rgba(0, 0, 0, 0.1); - box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); - border-radius: 0.25rem; -} -.toast.showing { - opacity: 0; -} -.toast:not(.show) { - display: none; -} - -.toast-container { - width: -webkit-max-content; - width: -moz-max-content; - width: max-content; - max-width: 100%; - pointer-events: none; -} -.toast-container > :not(:last-child) { - margin-bottom: 0.75rem; -} - -.toast-title { - margin-right: auto; -} -.toast-desc {} -.toast-icon { - -} -.toast-header { - display: flex; - align-items: center; - padding: 0.5rem 0.75rem; - color: #6c757d; - background-color: rgba(255, 255, 255, 0.85); - background-clip: padding-box; - border-bottom: 1px solid rgba(0, 0, 0, 0.05); - border-top-left-radius: calc(0.25rem - 1px); - border-top-right-radius: calc(0.25rem - 1px); -} -.toast-header .btn-close { - margin-right: -0.375rem; - margin-left: 0.75rem; -} - -.toast-body { - padding: 0.75rem; - word-wrap: break-word; -} \ No newline at end of file diff --git a/assets/bsToastService/bsToastService.css b/assets/bsToastService/bsToastService.css index 1ac775a..f1bba87 100644 --- a/assets/bsToastService/bsToastService.css +++ b/assets/bsToastService/bsToastService.css @@ -1,3 +1,62 @@ +.toast { + width: 350px; + max-width: 100%; + font-size: 0.875rem; + pointer-events: auto; + background-color: rgba(255, 255, 255, 0.85); + background-clip: padding-box; + border: 1px solid rgba(0, 0, 0, 0.1); + box-shadow: 0 0.5rem 1rem rgba(0, 0, 0, 0.15); + border-radius: 0.25rem; +} +.toast.showing { + opacity: 0; +} +.toast:not(.show) { + display: none; +} + +.toast-container { + width: -webkit-max-content; + width: -moz-max-content; + width: max-content; + max-width: 100%; + pointer-events: none; +} +.toast-container > :not(:last-child) { + margin-bottom: 0.75rem; +} + +.toast-title { + margin-right: auto; +} +.toast-desc {} +.toast-icon { + margin-right: 0.5em; + max-width: 1.5em; + max-height: 1.5em; +} +.toast-header { + display: flex; + align-items: center; + padding: 0.5rem 0.75rem; + color: #6c757d; + background-color: rgba(255, 255, 255, 0.85); + background-clip: padding-box; + border-bottom: 1px solid rgba(0, 0, 0, 0.05); + border-top-left-radius: calc(0.25rem - 1px); + border-top-right-radius: calc(0.25rem - 1px); +} +.toast-header .btn-close { + margin-right: -0.375rem; + margin-left: 0.75rem; +} + +.toast-body { + padding: 0.75rem; + word-wrap: break-word; +} + .toast-container--default { z-index: 10000; diff --git a/assets/bsToastService/bsToastService.js b/assets/bsToastService/bsToastService.js index 8670798..c2ae429 100644 --- a/assets/bsToastService/bsToastService.js +++ b/assets/bsToastService/bsToastService.js @@ -13,7 +13,7 @@ kit.PluginManager.register('bsToastService', function(module, exports, require, delay: 4000, }; this.closeTemplate = ''; - this.iconTemplate = ''; + this.iconTemplate = ''; /** * @type {HTMLElement} */ @@ -45,7 +45,7 @@ kit.PluginManager.register('bsToastService', function(module, exports, require, Service.prototype.getToastNode = function (title, message, desc = '') { var closeTemplate = this.close?this.closeTemplate:''; - var toastTemplate = '
'; + var toastTemplate = ''; return support.makeNode(toastTemplate); }; diff --git a/assets/core/core.register.js b/assets/core/core.register.js index 459aa2c..f3ef72a 100644 --- a/assets/core/core.register.js +++ b/assets/core/core.register.js @@ -49,9 +49,6 @@ __PluginManager__.registerPlugins({ path: __pmConfig__.assetsPath + '/bsToast', module: '/bsToast.js', type: 'loader', - css: [ - '/bsToast.css' - ], deps: ['bsCore'], }, bsToastService: { diff --git a/tests/bsToastsTest.php b/tests/bsToastsTest.php index d7105e6..812fbc7 100644 --- a/tests/bsToastsTest.php +++ b/tests/bsToastsTest.php @@ -24,8 +24,6 @@ $APPLICATION->ShowHead(); unit.logger.notice(' '); var audio = new Audio('https://issue.megapolis-it.ru/local/media/new_message_tone.mp3'); - - kit.service.toast.onShow.push(function (toast, node) { unit.logger.info(toast.data.title, toast.data); audio.play(); @@ -33,6 +31,7 @@ $APPLICATION->ShowHead(); var intervalId = setInterval(function(){ kit.service.toast.info('Новая заявка', 'Заявка от Пупкина на дальний склад. Очень срочно! Нужно еще вчера...', kit.date('H:i:s')); + //stop(); }, 5000); @@ -44,24 +43,4 @@ $APPLICATION->ShowHead();