diff --git a/frontend/js/behaviors/openMediaLibrary.js b/frontend/js/behaviors/openMediaLibrary.js index c33d7bb7c1..7bd798f22b 100644 --- a/frontend/js/behaviors/openMediaLibrary.js +++ b/frontend/js/behaviors/openMediaLibrary.js @@ -1,13 +1,11 @@ import forEachNodelist from '../utils/forEachNodelist.js' // Open Media library from the nav -const openMediaLibrary = function () { +const openMediaLibrary = function (app) { const bts = document.querySelectorAll('[data-medialib-btn]') function _triggerOpenMediaLibrary () { - if (window[process.env.VUE_APP_NAME].vm) { - window[process.env.VUE_APP_NAME].vm.openFreeMediaLibrary() - } + app.openFreeMediaLibrary() } // Toggle Click button diff --git a/frontend/js/components/Browser.vue b/frontend/js/components/Browser.vue index 013c1f71c0..2e2ebc938c 100755 --- a/frontend/js/components/Browser.vue +++ b/frontend/js/components/Browser.vue @@ -13,11 +13,13 @@ diff --git a/frontend/js/components/BrowserField.vue b/frontend/js/components/BrowserField.vue index 95222ea92b..7c168b0750 100755 --- a/frontend/js/components/BrowserField.vue +++ b/frontend/js/components/BrowserField.vue @@ -37,7 +37,7 @@ @@ -184,7 +184,7 @@ font-weight:600; padding: 0 15px; - .icon { + :deep(.icon) { vertical-align: baseline; top: 3px; position: relative; @@ -383,7 +383,7 @@ color: $color__icons; @include monospaced-figures('off'); // dont use monospaced figures here - .icon { + :deep(.icon) { transition: color .25s linear; } @@ -392,12 +392,12 @@ border-color: $color__text; color: $color__text; - .icon { + :deep(.icon) { color: $color__text; } } - .icon { + :deep(.icon) { // vertical-align: top; // height: 100%; display: block; @@ -421,7 +421,7 @@ color: $color__button_greyed; background: $color__button_greyed--bg; - .icon { + :deep(.icon) { color: $color__button_greyed; } diff --git a/frontend/js/components/ButtonBar.vue b/frontend/js/components/ButtonBar.vue index d452681fb3..baad6550fd 100755 --- a/frontend/js/components/ButtonBar.vue +++ b/frontend/js/components/ButtonBar.vue @@ -41,8 +41,8 @@ border-radius: 2px; display: flex; - > a, - > button { + > :slotted(a), + > :slotted(button) { @include btn-reset; height: $toolbar__height - 2px; line-height: $toolbar__height - 2px; @@ -80,14 +80,14 @@ } } - > a:first-child, - > button:first-child { + > :slotted(a):first-child, + > :slotted(button):first-child { border-top-left-radius: $border__radius; border-bottom-left-radius: $border__radius; } - > a:last-child, - > button:last-child { + > :slotted(a):last-child, + > :slotted(button):last-child { border-top-right-radius: $border__radius; border-bottom-right-radius: $border__radius; border-right: 0 none; diff --git a/frontend/js/components/Checkbox.vue b/frontend/js/components/Checkbox.vue index 5af1cb7af8..db8272ab05 100755 --- a/frontend/js/components/Checkbox.vue +++ b/frontend/js/components/Checkbox.vue @@ -16,6 +16,7 @@ export default { name: 'A17Checkbox', mixins: [randKeyMixin], + emits: ['change'], props: { value: { default: '' diff --git a/frontend/js/components/CheckboxAccordion.vue b/frontend/js/components/CheckboxAccordion.vue index 717997821a..7e37407270 100755 --- a/frontend/js/components/CheckboxAccordion.vue +++ b/frontend/js/components/CheckboxAccordion.vue @@ -1,7 +1,11 @@ @@ -18,6 +22,7 @@ 'a17-accordion': a17Accordion }, mixins: [VisibilityMixin], + emits: ['open'], props: { value: { default: function () { return [] } diff --git a/frontend/js/components/CheckboxGroup.vue b/frontend/js/components/CheckboxGroup.vue index b43ce19e7c..116f952ab5 100755 --- a/frontend/js/components/CheckboxGroup.vue +++ b/frontend/js/components/CheckboxGroup.vue @@ -31,6 +31,11 @@ default: function () { return [] } } }, + data () { + return { + hasLocale: false + } + }, mixins: [InputframeMixin, CheckboxMixin, FormStoreMixin], computed: { checkboxClasses: function () { diff --git a/frontend/js/components/ColorField.vue b/frontend/js/components/ColorField.vue index dcfcc43c8d..b5a75740f8 100644 --- a/frontend/js/components/ColorField.vue +++ b/frontend/js/components/ColorField.vue @@ -19,9 +19,11 @@ /> -
- -
+
diff --git a/frontend/js/components/ColorPicker.vue b/frontend/js/components/ColorPicker.vue index be2f7a21c1..588cd41f4c 100644 --- a/frontend/js/components/ColorPicker.vue +++ b/frontend/js/components/ColorPicker.vue @@ -27,6 +27,7 @@ export default { name: 'a17ColorPicker', + emits: ['change'], props: { color: { type: String, diff --git a/frontend/js/components/ConnectorField.vue b/frontend/js/components/ConnectorField.vue index 58fb89ffcb..d53d60b7e1 100755 --- a/frontend/js/components/ConnectorField.vue +++ b/frontend/js/components/ConnectorField.vue @@ -83,7 +83,7 @@ toggleVisibility: function (value) { if (this.$refs.fieldContainer) { - this.$slots.default.forEach((child) => { + this.$slots.default().forEach((child) => { // Base input fields. if ( child.componentInstance !== undefined && @@ -100,7 +100,7 @@ child.componentInstance.$slots !== undefined && child.componentInstance.$slots.default !== undefined ) { - child.componentInstance.$slots.default.forEach((subChild) => { + child.componentInstance.$slots.default().forEach((subChild) => { if (subChild.componentInstance && subChild.componentInstance.destroyValue) { subChild.componentInstance.destroyValue() } diff --git a/frontend/js/components/Cropper.vue b/frontend/js/components/Cropper.vue index 781462def0..d2e11faee6 100644 --- a/frontend/js/components/Cropper.vue +++ b/frontend/js/components/Cropper.vue @@ -2,7 +2,7 @@
@@ -12,7 +12,7 @@