jodit 4.15.16 → 4.15.17

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.15.16
+ * Version: v4.15.17
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -2110,7 +2110,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.15.16";
+var APP_VERSION = "4.15.17";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -38147,14 +38147,28 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_1__.pluginSystem.add('file', file);
  */ jodit_config__WEBPACK_IMPORTED_MODULE_2__.Config.prototype.saveSelectionOnBlur = true;
 function focus(editor) {
     if (editor.o.saveSelectionOnBlur) {
+        // A click that brings focus back places the caret itself, and Chrome
+        // has already placed it when focus fires, so restoring would move it
+        // back to the old selection. The saved markers are dropped instead.
+        var focusByPointer = false;
         editor.e.on('blur', function() {
+            // A press that never brought the focus back must not decide
+            // what the next focus does
+            focusByPointer = false;
             if (editor.isEditorMode()) {
                 editor.s.save(true);
             }
+        }).on('mousedown touchstart', function() {
+            focusByPointer = !editor.editorIsActive;
         }).on('focus', function() {
             if (editor.isEditorMode()) {
-                editor.s.restore();
+                if (focusByPointer) {
+                    editor.s.removeMarkers();
+                } else {
+                    editor.s.restore();
+                }
             }
+            focusByPointer = false;
         });
     }
     var _$focus = function focus() {
@@ -39243,11 +39257,12 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.imageProcessor = {
 /* harmony import */ var _swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(38574);
 /* harmony import */ var jodit_core_constants__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(81937);
 /* harmony import */ var jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(84839);
-/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(28077);
-/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(65946);
-/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(91206);
-/* harmony import */ var jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(23112);
-/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(51034);
+/* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(23211);
+/* harmony import */ var jodit_core_global__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(28077);
+/* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(65946);
+/* harmony import */ var jodit_core_plugin__WEBPACK_IMPORTED_MODULE_13__ = __webpack_require__(91206);
+/* harmony import */ var jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_14__ = __webpack_require__(23112);
+/* harmony import */ var _config__WEBPACK_IMPORTED_MODULE_15__ = __webpack_require__(51034);
 /*!
  * Jodit Editor (https://xdsoft.net/jodit/)
  * Released under MIT see LICENSE.txt in the project root for license information.
@@ -39271,6 +39286,7 @@ jodit_config__WEBPACK_IMPORTED_MODULE_0__.Config.prototype.imageProcessor = {
 
 
 
+
 var JODIT_IMAGE_PROCESSOR_BINDED = '__jodit_imageprocessor_binded';
 var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
 /**
@@ -39373,9 +39389,9 @@ var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
                                 2
                             ];
                         }
-                        ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.$$)('img', editor.editor).forEach(function(elm) {
-                            if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
-                                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
+                        ;(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_12__.$$)('img', editor.editor).forEach(function(elm) {
+                            if (!(0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_12__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED)) {
+                                (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_12__.dataBind)(elm, JODIT_IMAGE_PROCESSOR_BINDED, true);
                                 if (!elm.complete) {
                                     editor.e.on(elm, 'load', function ElementOnLoad() {
                                         var _editor_e;
@@ -39387,6 +39403,7 @@ var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
                                     replaceDataURIToBlobUUID(editor, elm);
                                 }
                                 editor.e.on(elm, 'mousedown touchstart', function() {
+                                    removeCaretText(elm);
                                     editor.s.select(elm);
                                 });
                             }
@@ -39400,7 +39417,7 @@ var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
         }
     ]);
     return imageProcessor;
-}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_7__._)(jodit_core_plugin__WEBPACK_IMPORTED_MODULE_12__.Plugin));
+}((0,_swc_helpers_wrap_native_super__WEBPACK_IMPORTED_MODULE_7__._)(jodit_core_plugin__WEBPACK_IMPORTED_MODULE_13__.Plugin));
 (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_5__.__decorate)([
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.watch)(':afterGetValueFromEditor')
 ], imageProcessor.prototype, "onAfterGetValueFromEditor", null);
@@ -39415,6 +39432,25 @@ var JODIT_IMAGE_BLOB_ID = JODIT_IMAGE_PROCESSOR_BINDED + 'blob-id';
     ]),
     (0,jodit_core_decorators__WEBPACK_IMPORTED_MODULE_9__.debounce)()
 ], imageProcessor.prototype, "afterChange", null);
+/**
+ * Remove the invisible-space text beside an image, which only held a caret.
+ * Selecting the image replaces the caret, and with the text still after a
+ * block image, Safari highlights the rest of the image's line. See #1512
+ */ function removeCaretText(elm) {
+    for(var _i = 0, _iter = [
+        'previousSibling',
+        'nextSibling'
+    ]; _i < _iter.length; _i++){
+        var side = _iter[_i];
+        var _node_nodeValue;
+        var node = elm[side];
+        while(jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.isText(node) && !((_node_nodeValue = node.nodeValue) === null || _node_nodeValue === void 0 ? void 0 : _node_nodeValue.replace((0,jodit_core_constants__WEBPACK_IMPORTED_MODULE_8__.INVISIBLE_SPACE_REG_EXP)(), ''))){
+            var next = node[side];
+            jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_10__.Dom.safeRemove(node);
+            node = next;
+        }
+    }
+}
 function replaceDataURIToBlobUUID(editor, elm) {
     if (!editor.o.imageProcessor.replaceDataURIToBlobIdInView) {
         return;
@@ -39425,7 +39461,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     var dataUri = elm.src;
     var blob;
     try {
-        blob = (0,jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_13__.dataURItoBlob)(dataUri);
+        blob = (0,jodit_modules_uploader_helpers_data_uri_to_blob__WEBPACK_IMPORTED_MODULE_14__.dataURItoBlob)(dataUri);
     } catch (unused) {
         // A data URI the browser accepts but we cannot decode is not worth
         // breaking the editor over — keep the image as it is
@@ -39438,7 +39474,7 @@ function replaceDataURIToBlobUUID(editor, elm) {
     list[elm.src] = dataUri;
     editor.buffer.set(JODIT_IMAGE_BLOB_ID, list);
 }
-jodit_core_global__WEBPACK_IMPORTED_MODULE_10__.pluginSystem.add('imageProcessor', imageProcessor);
+jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('imageProcessor', imageProcessor);
 
 
 /***/ }),
@@ -41250,10 +41286,12 @@ UIImagePositionTab = (0,_swc_helpers_ts_decorate__WEBPACK_IMPORTED_MODULE_6__.__
         marginBottom,
         marginLeft
     ];
+    // Compared with the inline value, which is what `readMargins` showed, so a
+    // margin from a stylesheet is not overwritten when the field is unchanged
     var applyMargin = function applyMargin(key, value) {
-        var oldValue = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, key);
+        var oldValue = (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.cssInline)(image, key) || 0);
         var v = (0,_utils_utils__WEBPACK_IMPORTED_MODULE_1__.normalSizeToString)(value);
-        if (oldValue.toString() !== v.toString()) {
+        if (oldValue !== v) {
             (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_0__.css)(image, key, v);
         }
     };
@@ -42122,6 +42160,14 @@ var align = {
             'Normal'
         ],
         tooltip: 'Vertical align',
+        // `vertical-align` only moves an image in the line, not a floated or block one
+        isDisabled: function isDisabled(editor, button) {
+            var image = button.target;
+            return Boolean(image && ([
+                'left',
+                'right'
+            ].includes((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'float')) || (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_3__.css)(image, 'display') === 'block'));
+        },
         exec: function exec(editor, image, param) {
             var control = param.control;
             if (!jodit_core_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(image, 'img')) {

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.15.16
+ * Version: v4.15.17
  * 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.15.16
+ * Version: v4.15.17
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */