aloha-vue 1.2.246 → 1.2.248

package/package.json

@@ -14,7 +14,7 @@
     "Vue.js"
   ],
   "homepage": "https://github.com/ilia-brykin/aloha/#README.md",
-  "version": "1.2.246",
+  "version": "1.2.248",
   "author": {
     "name": "Ilia Brykin",
     "email": "brykin.ilia@gmail.com"

package/src/AModal/AModal.js

@@ -362,6 +362,7 @@ export default {
           role: "dialog",
           ariaModal: true,
           style: this.stylesModal,
+          ...this.$attrs,
         }, [
           h("div", {
             class: ["a_modal_dialog a_modal_dialog_scrollable", this.sizeClass],

package/src/AModalForm/AModalForm.js

@@ -19,7 +19,6 @@ import {
 // @vue/component
 export default {
   name: "AModalForm",
-  inheritAttrs: false,
   props: {
     alwaysTranslate: {
       type: Boolean,

package/src/AModalWizard/AModalWizard.js

@@ -20,7 +20,6 @@ import {
 // @vue/component
 export default {
   name: "AModalWizard",
-  inheritAttrs: false,
   props: {
     alwaysTranslate: {
       type: Boolean,

package/src/plugins/ATinymcePlugin.js

@@ -1,53 +1,54 @@
-import {
-  ref,
-} from "vue";
-
-export const tinymcePluginOptions = ref({
-  propsDefault: {
-    branding: true,
-    contentCustomStyle: undefined,
-    contentLangs: [
-      { title: "English", code: "en" },
-      { title: "Spanish", code: "es" },
-      { title: "French", code: "fr" },
-      { title: "Deutsch", code: "de" },
-      { title: "Portuguese", code: "pt" },
-      { title: "Chinese", code: "zh" },
-    ],
-    languageDefault: "de",
-    maxlength: undefined,
-    menu: undefined,
-    menubar: false,
-    plugins: "advlist autoresize code emoticons link lists table help example",
-    promotion: false,
-    rows: undefined,
-    toolbar: [
-      { name: "Formatierung", items: ["bold", "italic", "underline"] },
-      { name: "Ausrichtung", items: ["alignleft", "aligncenter", "alignright", "alignjustify"] },
-      { name: "Liste", items: ["bullist", "numlist"] },
-      { name: "Einrücken", items: ["indent", "outdent"] },
-      { name: "Sprache", items: ["language"] },
-      { name: "Link", items: ["link", "unlink"] },
-      { name: "Historie", items: ["undo", "redo"] },
-      { name: "Hilfe", items: ["help"] },
-    ],
-    toolbarMode: "wrap",
-    validElements: "@[style],a[href|target|title],strong/b[style],em/i[style],br[style],p[style],span[style],ul[style],ol[style],li[style],table[],thead[],tbody[],th[],tr[],td[]",
-    validStyles: {
-      "*": "text-align,padding-left,text-decoration",
-      ul: "list-style-type",
-      ol: "list-style-type",
-    },
-  },
-});
-
-export default {
-  install: (app, {
-    propsDefault = {},
-  } = {}) => {
-    tinymcePluginOptions.value.propsDefault = {
-      ...tinymcePluginOptions.value.propsDefault,
-      ...propsDefault,
-    };
-  },
-};
+import {
+  ref,
+} from "vue";
+
+export const tinymcePluginOptions = ref({
+  propsDefault: {
+    branding: true,
+    contentCustomStyle: undefined,
+    contentLangs: [
+      { title: "English", code: "en" },
+      { title: "Spanish", code: "es" },
+      { title: "French", code: "fr" },
+      { title: "Deutsch", code: "de" },
+      { title: "Portuguese", code: "pt" },
+      { title: "Chinese", code: "zh" },
+    ],
+    languageDefault: "de",
+    maxlength: undefined,
+    menu: undefined,
+    menubar: false,
+    minHeightBody: 70,
+    plugins: "advlist autoresize code emoticons link lists table help example",
+    promotion: false,
+    rows: undefined,
+    toolbar: [
+      { name: "Formatierung", items: ["bold", "italic", "underline"] },
+      { name: "Ausrichtung", items: ["alignleft", "aligncenter", "alignright", "alignjustify"] },
+      { name: "Liste", items: ["bullist", "numlist"] },
+      { name: "Einrücken", items: ["indent", "outdent"] },
+      { name: "Sprache", items: ["language"] },
+      { name: "Link", items: ["link", "unlink"] },
+      { name: "Historie", items: ["undo", "redo"] },
+      { name: "Hilfe", items: ["help"] },
+    ],
+    toolbarMode: "wrap",
+    validElements: "@[style],a[href|target|title],strong/b[style],em/i[style],br[style],p[style],span[style],ul[style],ol[style],li[style],table[],thead[],tbody[],th[],tr[],td[]",
+    validStyles: {
+      "*": "text-align,padding-left,text-decoration",
+      ul: "list-style-type",
+      ol: "list-style-type",
+    },
+  },
+});
+
+export default {
+  install: (app, {
+    propsDefault = {},
+  } = {}) => {
+    tinymcePluginOptions.value.propsDefault = {
+      ...tinymcePluginOptions.value.propsDefault,
+      ...propsDefault,
+    };
+  },
+};

package/src/ui/ATinymce/ATinymce.js

@@ -75,6 +75,11 @@ export default {
       required: false,
       default: () => tinymcePluginOptions.value.propsDefault.menubar,
     },
+    minHeightBody: {
+      type: Number,
+      required: false,
+      default: () => tinymcePluginOptions.value.propsDefault.minHeightBody,
+    },
     plugins: {
       type: String,
       required: false,

package/src/ui/ATinymce/compositionAPI/ATinymceAPI.js

@@ -56,6 +56,7 @@ export default function ATinymceAPI(props, context, {
   const menu = toRef(props, "menu");
   const menubar = toRef(props, "menubar");
   const modelValue = toRef(props, "modelValue");
+  const minHeightBody = toRef(props, "minHeightBody");
   const plugins = toRef(props, "plugins");
   const promotion = toRef(props, "promotion");
   const toolbar = toRef(props, "toolbar");
@@ -67,7 +68,8 @@ export default function ATinymceAPI(props, context, {
   let modelValueLocal = undefined;
 
   const contentStyle = computed(() => {
-    return `${ contentUiSkinCss.toString() }\n${ contentCss.toString() }\n${ contentCustomStyle.value ? contentCustomStyle.value : "" }`;
+    return `body { min-height: ${ minHeightBody.value }px; }
+      ${ contentUiSkinCss.toString() }\n${ contentCss.toString() }\n${ contentCustomStyle.value ? contentCustomStyle.value : "" }`;
   });
 
   const changeModelLocal = ({ model }) => {
@@ -78,12 +80,13 @@ export default function ATinymceAPI(props, context, {
   const render = () => {
     modelValueLocal = modelValue.value;
     tinymce.init({
+      autoresize_bottom_margin: 0,
       branding: branding.value,
       browser_spellcheck: true,
       content_css: false,
       content_langs: contentLangs.value,
       content_style: contentStyle.value,
-      contextmenu: "link copy custompaste",
+      contextmenu: false,
       convert_urls: false,
       entity_encoding: "raw",
       force_br_newlines: true,
@@ -106,24 +109,6 @@ export default function ATinymceAPI(props, context, {
         editor.on("change input undo redo", () => {
           changeModelLocal({ model: editor.getContent({ format: "html" }) });
         });
-        editor.ui.registry.addMenuItem("custompaste", {
-          text: "Paste",
-          icon: "paste",
-          shortcut: "Ctrl+V",
-          onAction: () => {
-            navigator.clipboard.readText().then(text => {
-              if (text) {
-                editor.insertContent(text);
-              }
-            }).catch(err => {
-              editor.notificationManager.open({
-                text: "Your browser doesn't support direct access to the clipboard. Please use the Ctrl+X/C/V keyboard shortcuts instead.",
-                type: "error"
-              });
-              console.error("Paste error: ", err);
-            });
-          },
-        });
       },
     });
   };