jodit 4.2.7 → 4.2.10

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -3127,7 +3127,7 @@ __webpack_require__.r(__webpack_exports__);
  * Copyright (c) 2013-2024 Valeriy Chupurnov. All rights reserved. https://xdsoft.net
  */
 
-var APP_VERSION = "4.2.7";
+var APP_VERSION = "4.2.10";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -16771,7 +16771,9 @@ var UIList = /** @class */ (function (_super) {
             }
         };
         var isNotRemoved = function (b) {
-            return !_this.removeButtons.includes(b.name);
+            var _a;
+            return !_this.removeButtons.includes(b.name) &&
+                (!b.isVisible || ((_a = b.isVisible) === null || _a === void 0 ? void 0 : _a.call(b, _this.j, b)));
         };
         items.forEach(function (item) {
             if ((0,jodit_core_ui_helpers_buttons__WEBPACK_IMPORTED_MODULE_10__/* .isButtonGroup */ .i)(item)) {
@@ -30294,7 +30296,45 @@ 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: function (editor) {
+        return !editor.o.disablePlugins.includes('color');
+    },
+    icon: 'brush',
+    popup: function (editor, _, close) {
+        if (!(0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.isJoditObject)(editor)) {
+            return;
+        }
+        var tableModule = editor.getInstance('Table', editor.o), selected = tableModule.getAllSelectedCells();
+        if (!selected.length) {
+            return false;
+        }
+        var makeColorPicker = function (key) {
+            return (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_3__/* .ColorPickerWidget */ .Kn)(editor, function (value) {
+                selected.forEach(function (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: function (editor) {
+        return !editor.o.disablePlugins.includes('color');
+    },
     update: function (editor, button) {
         var color = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.dataBind)(button, 'color');
         var update = function (key, value) {
@@ -34224,16 +34264,21 @@ function readSizes(image, values, state) {
                 case 0: return [4 /*yield*/, image.decode()];
                 case 1:
                     _a.sent();
-                    width = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width') || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__/* .css */ .A)(image, 'width', true) || false;
-                    height = (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'height') || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__/* .css */ .A)(image, 'height', true) || false;
+                    width = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__/* .css */ .A)(image, 'width', true) || (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__/* .attr */ .C)(image, 'width') || false;
+                    height = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__/* .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_4__/* .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 || '';
+                    }
                     imageWidth = values.imageWidth, imageHeight = values.imageHeight;
                     w = parseFloat(imageWidth.toString());
                     if (!(0,jodit_core_helpers_checker_is_numeric__WEBPACK_IMPORTED_MODULE_4__/* .isNumeric */ .k)(imageWidth) || !(0,jodit_core_helpers_checker_is_numeric__WEBPACK_IMPORTED_MODULE_4__/* .isNumeric */ .k)(imageHeight)) {
@@ -35169,6 +35214,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__(12461);
 /* harmony import */ var jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(26150);
 /* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38322);
 /* harmony import */ var _utils_utils__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(9645);
@@ -35180,6 +35226,7 @@ function applyMargin(j, marginTop, marginRight, marginBottom, marginLeft, image,
 
 
 
+
 /** @private */
 function applySize(image, imageWidth, imageHeight, sizeIsLocked) {
     // Size
@@ -35193,7 +35240,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;
         }
@@ -35719,8 +35768,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__(9823);
-/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(38322);
-/* harmony import */ var jodit_modules_widget__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(16116);
+/* harmony import */ var jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(38322);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -35728,45 +35776,13 @@ jodit_config__WEBPACK_IMPORTED_MODULE_5__/* .Config */ .T.prototype.popup = {
  */
 
 
-
 var cmd = function (control) {
     return 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: function (editor, _, close) {
-            if (!(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_0__/* .isJoditObject */ .y0)(editor)) {
-                return;
-            }
-            var tableModule = editor.getInstance('Table', editor.o), selected = tableModule.getAllSelectedCells();
-            if (!selected.length) {
-                return false;
-            }
-            var makeColorPicker = function (key) {
-                return (0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_1__/* .ColorPickerWidget */ .Kn)(editor, function (value) {
-                    selected.forEach(function (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'],
@@ -35778,7 +35794,7 @@ var cmd = function (control) {
                 .getInstance('Table', editor.o)
                 .getAllSelectedCells()
                 .forEach(function (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'

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
 	/*!
  * jodit - Jodit is an awesome and useful wysiwyg editor with filebrowser
  * Author: Chupurnov <chupurnov@gmail.com> (https://xdsoft.net/jodit/)
- * Version: v4.2.7
+ * Version: v4.2.10
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */