aloha-vue 1.2.152 → 1.2.154

package/package.json

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

package/src/AModal/AModal.js

@@ -167,6 +167,11 @@ export default {
       required: false,
       default: () => modalPluginOptions.value.propsDefault.selectorCloseIds,
     },
+    showCloseButton: {
+      type: Boolean,
+      required: false,
+      default: true,
+    },
     size: {
       type: String,
       validator: value => ["small", "large", "xl", "xxl", "fullscreen"].indexOf(value) !== -1,
@@ -322,13 +327,13 @@ export default {
                     extra: this.extra,
                   }),
                 ]),
-                h(AButton, {
+                this.showCloseButton ? h(AButton, {
                   class: "a_btn_close",
                   disabled: this.disabledLocal,
                   textScreenReader: this.closeButtonText,
                   title: this.closeButtonText,
                   onClick: () => this.close(true),
-                })
+                }) : "",
               ]),
               h("div", {
                 ref: "modal_body",

package/src/AModalConfirm/AModalConfirm.js

@@ -30,6 +30,7 @@ export default {
         isModalHidden: isModalHidden.value,
         isConfirm: true,
         ...confirmOptions.value,
+        showCloseButton: false,
         close: closeConfirm,
       };
     });

package/src/ui/ACheckbox/ACheckbox.js

@@ -644,10 +644,12 @@ export default {
                     })
                   ]),
                 ]),
-              this.hasNotElementsWithSearch && h(ATranslation, {
-                class: "a_form__not_elements",
-                text: "_A_CHECKBOX_HAS_NOT_ELEMENTS_WITH_SEARCH_",
-              }),
+              (!this.dataSort.length || this.hasNotElementsWithSearch) ?
+                h(ATranslation, {
+                  class: "a_form__not_elements",
+                  text: "_A_CHECKBOX_HAS_NOT_ELEMENTS_WITH_SEARCH_",
+                }) :
+                "",
             ]),
           ]),
         ]),

package/src/ui/ARadio/ARadio.js

@@ -652,10 +652,12 @@ export default {
                     })
                   ]),
                 ]),
-              this.hasNotElementsWithSearch && h(ATranslation, {
-                class: "a_form__not_elements",
-                text: "_A_RADIO_HAS_NOT_ELEMENTS_WITH_SEARCH_",
-              }),
+              (!this.dataSort.length || this.hasNotElementsWithSearch) ?
+                h(ATranslation, {
+                  class: "a_form__not_elements",
+                  text: "_A_RADIO_HAS_NOT_ELEMENTS_WITH_SEARCH_",
+                }) :
+                "",
             ]),
           ]),
         ]),

package/src/ui/ASelect/ASelect.js

@@ -875,10 +875,12 @@ export default {
                             })
                           ]),
                         ]),
-                      this.hasNotElementsWithSearch && h(ATranslation, {
-                        class: "a_form__not_elements",
-                        text: "_A_SELECT_HAS_NOT_ELEMENTS_WITH_SEARCH_",
-                      }),
+                      (!this.dataSort.length || this.hasNotElementsWithSearch) ?
+                        h(ATranslation, {
+                          class: "a_form__not_elements",
+                          text: "_A_SELECT_HAS_NOT_ELEMENTS_WITH_SEARCH_",
+                        }) :
+                        "",
                     ]),
                   ]),
                 ]),

package/src/ui/ASelect/i18n/ru.json

@@ -1,4 +1,4 @@
 {
-  "_A_SELECT_HAS_NOT_ELEMENTS_WITH_SEARCH_": "[No choicesНет элементов для выбора]",
+  "_A_SELECT_HAS_NOT_ELEMENTS_WITH_SEARCH_": "[Нет элементов для выбора]",
   "_A_SELECT_SEARCH_": "Поиск"
 }

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

@@ -84,6 +84,7 @@ export default function ATinymceAPI(props, context, {
       content_langs: contentLangs.value,
       content_style: contentStyle.value,
       contextmenu: "copy link",
+      convert_urls: false,
       entity_encoding: "raw",
       force_br_newlines: true,
       indent: false,