jodit-pro 4.2.2 → 4.2.5

package/es2021/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valeriy <chupurnov@gmail.com>
- * Version: v4.2.2
+ * Version: v4.2.5
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2444,7 +2444,7 @@ __webpack_require__.r(__webpack_exports__);
  * Released under MIT see LICENSE.txt in the project root for license information.
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
-const APP_VERSION = "4.2.2";
+const APP_VERSION = "4.2.5";
 // prettier-ignore
 const ES = "es2021";
 const IS_ES_MODERN = true;
@@ -15460,7 +15460,8 @@ let UIList = class UIList extends jodit_core_ui_group_group__WEBPACK_IMPORTED_MO
                 group.append(elm);
             }
         };
-        const isNotRemoved = (b) => !this.removeButtons.includes(b.name);
+        const isNotRemoved = (b) => !this.removeButtons.includes(b.name) &&
+            (!b.isVisible || b.isVisible?.(this.j, b));
         items.forEach(item => {
             if ((0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_9__/* .isButtonGroup */ .i)(item)) {
                 const buttons = item.buttons.filter(b => b);
@@ -28540,7 +28541,43 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_0__/* .pluginSystem */ .fg.add('color
 
 
 jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_2__/* .Icon */ .I.set('brush', (_brush_svg__WEBPACK_IMPORTED_MODULE_4___default()));
+jodit_config__WEBPACK_IMPORTED_MODULE_5__/* .Config */ .T.prototype.controls.brushCell = {
+    isVisible: (editor) => {
+        return !editor.o.disablePlugins.includes('color');
+    },
+    icon: 'brush',
+    popup: (editor, _, close) => {
+        if (!(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.isJoditObject)(editor)) {
+            return;
+        }
+        const tableModule = editor.getInstance('Table', editor.o), selected = tableModule.getAllSelectedCells();
+        if (!selected.length) {
+            return false;
+        }
+        const makeColorPicker = (key) => (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_3__/* .ColorPickerWidget */ .Kn)(editor, (value) => {
+            selected.forEach(cell => {
+                (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(cell, key, value);
+            });
+            editor.lock();
+            editor.synchronizeValues();
+            close();
+            editor.unlock();
+        }, (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.css)(selected[0], key));
+        return (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_3__/* .TabsWidget */ .Zg)(editor, [
+            {
+                name: 'Background',
+                content: makeColorPicker('background-color')
+            },
+            { name: 'Text', content: makeColorPicker('color') },
+            { name: 'Border', content: makeColorPicker('border-color') }
+        ]);
+    },
+    tooltip: 'Background'
+};
 jodit_config__WEBPACK_IMPORTED_MODULE_5__/* .Config */ .T.prototype.controls.brush = {
+    isVisible: (editor) => {
+        return !editor.o.disablePlugins.includes('color');
+    },
     update(editor, button) {
         const color = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color');
         const update = (key, value) => {
@@ -32315,16 +32352,21 @@ function readMargins(image, values, state) {
 /** @private */
 async function readSizes(image, values, state) {
     await image.decode();
-    const width = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width') || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__/* .css */ .A)(image, 'width', true) || false;
-    const height = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'height') || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__/* .css */ .A)(image, 'height', true) || false;
+    const width = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__/* .css */ .A)(image, 'width', true) || (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width') || false;
+    const height = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__/* .css */ .A)(image, 'height', true) || (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'height') || false;
     values.imageWidth =
         width !== false
             ? (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__/* .normalSizeFromString */ .G)(width)
             : image.offsetWidth || image.naturalWidth;
-    values.imageHeight =
-        height !== false
-            ? (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__/* .normalSizeFromString */ .G)(height)
-            : image.offsetHeight || image.naturalHeight;
+    if ((0,jodit_core_helpers_checker_is_numeric__WEBPACK_IMPORTED_MODULE_3__/* .isNumeric */ .k)(values.imageWidth)) {
+        values.imageHeight =
+            height !== false
+                ? (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__/* .normalSizeFromString */ .G)(height)
+                : image.offsetHeight || image.naturalHeight;
+    }
+    else {
+        values.imageHeight = height || '';
+    }
     const { imageWidth, imageHeight } = values;
     const w = parseFloat(imageWidth.toString());
     if (!(0,jodit_core_helpers_checker_is_numeric__WEBPACK_IMPORTED_MODULE_3__/* .isNumeric */ .k)(imageWidth) || !(0,jodit_core_helpers_checker_is_numeric__WEBPACK_IMPORTED_MODULE_3__/* .isNumeric */ .k)(imageHeight)) {
@@ -33295,6 +33337,7 @@ function applyMargin(j, marginTop, marginRight, marginBottom, marginLeft, image,
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   q: function() { return /* binding */ applySize; }
 /* harmony export */ });
+/* harmony import */ var jodit_core_helpers_checker_is_numeric__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(59372);
 /* harmony import */ var jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(97099);
 /* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4401);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(10926);
@@ -33306,6 +33349,7 @@ function applyMargin(j, marginTop, marginRight, marginBottom, marginLeft, image,
 
 
 
+
 /** @private */
 function applySize(image, imageWidth, imageHeight, sizeIsLocked) {
     // Size
@@ -33319,7 +33363,9 @@ function applySize(image, imageWidth, imageHeight, sizeIsLocked) {
             width: updatedWidth,
             height: updatedWidth && sizeIsLocked ? null : updatedHeight
         });
-        (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width', (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width') ? updatedWidth : null);
+        (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width', updatedWidth && (0,jodit_core_helpers_checker_is_numeric__WEBPACK_IMPORTED_MODULE_3__/* .isNumeric */ .k)(imageWidth) && (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width')
+            ? updatedWidth
+            : null);
         if (!(0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width') || sizeIsLocked) {
             updatedHeight = null;
         }
@@ -33829,8 +33875,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_5__/* .Config */ .T.prototype.popup = {
 
 "use strict";
 /* harmony import */ var jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(58588);
-/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(4401);
-/* harmony import */ var jodit_modules_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(21391);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(4401);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -33838,41 +33883,11 @@ jodit_config__WEBPACK_IMPORTED_MODULE_5__/* .Config */ .T.prototype.popup = {
  */
 
 
-
 const cmd = (control) => control.args && (0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_0__/* .isString */ .Kg)(control.args[0])
     ? control.args[0].toLowerCase()
     : '';
 /* harmony default export */ __webpack_exports__.A = ([
-    {
-        name: 'brush',
-        popup: (editor, _, close) => {
-            if (!(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_0__/* .isJoditObject */ .y0)(editor)) {
-                return;
-            }
-            const tableModule = editor.getInstance('Table', editor.o), selected = tableModule.getAllSelectedCells();
-            if (!selected.length) {
-                return false;
-            }
-            const makeColorPicker = (key) => (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_1__/* .ColorPickerWidget */ .Kn)(editor, (value) => {
-                selected.forEach(cell => {
-                    (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__/* .css */ .A)(cell, key, value);
-                });
-                editor.lock();
-                editor.synchronizeValues();
-                close();
-                editor.unlock();
-            }, (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__/* .css */ .A)(selected[0], key));
-            return (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_1__/* .TabsWidget */ .Zg)(editor, [
-                {
-                    name: 'Background',
-                    content: makeColorPicker('background-color')
-                },
-                { name: 'Text', content: makeColorPicker('color') },
-                { name: 'Border', content: makeColorPicker('border-color') }
-            ]);
-        },
-        tooltip: 'Background'
-    },
+    'brushCell',
     {
         name: 'valign',
         list: ['Top', 'Middle', 'Bottom', 'Normal'],
@@ -33883,7 +33898,7 @@ const cmd = (control) => control.args && (0,jodit_core_helpers_checker__WEBPACK_
                 .getInstance('Table', editor.o)
                 .getAllSelectedCells()
                 .forEach((cell) => {
-                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__/* .css */ .A)(cell, 'vertical-align', command === 'normal' ? '' : command);
+                (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_1__/* .css */ .A)(cell, 'vertical-align', command === 'normal' ? '' : command);
             });
         },
         tooltip: 'Vertical align'