jodit-pro 4.4.7 → 4.5.3

package/es5/jodit.js

@@ -1,7 +1,7 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valeriy <chupurnov@gmail.com>
- * Version: v4.4.7
+ * Version: v4.5.3
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
@@ -2094,7 +2094,7 @@ function _unsupported_iterable_to_array(o, minLen) {
     if (n === "Map" || n === "Set") return Array.from(n);
     if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
 }
-var APP_VERSION = "4.4.7";
+var APP_VERSION = "4.5.1";
 // prettier-ignore
 var ES = "es2020";
 var IS_ES_MODERN = true;
@@ -3648,29 +3648,29 @@ function _ts_values(o) {
             }
         },
         {
-            key: "wrapInline",
+            key: "wrapNextInline",
             value: /**
-     * Wrap all inline siblings
-     */ function wrapInline(current, tag, editor) {
-                var tmp, first = current, last = current;
+     * Wrap all inline next siblings
+     */ function wrapNextInline(current, tag, editor) {
+                var tmp;
+                var first = current;
+                var last = current;
                 editor.s.save();
                 var needFindNext = false;
-                do {
-                    needFindNext = false;
-                    tmp = first.previousSibling;
-                    if (tmp && !Dom.isBlock(tmp)) {
-                        needFindNext = true;
-                        first = tmp;
-                    }
-                }while (needFindNext);
                 do {
                     needFindNext = false;
                     tmp = last.nextSibling;
-                    if (tmp && !Dom.isBlock(tmp)) {
+                    if (tmp && !Dom.isBlock(tmp) && !Dom.isTag(tmp, 'br')) {
                         needFindNext = true;
                         last = tmp;
                     }
                 }while (needFindNext);
+                return Dom.__wrapElements(tag, editor, first, last);
+            }
+        },
+        {
+            key: "__wrapElements",
+            value: function __wrapElements(tag, editor, first, last) {
                 var wrapper = (0,_helpers_checker_index_js__WEBPACK_IMPORTED_MODULE_2__/* .isString */ .Kg)(tag) ? editor.createInside.element(tag) : tag;
                 if (first.parentNode) {
                     first.parentNode.insertBefore(wrapper, first);
@@ -3688,6 +3688,35 @@ function _ts_values(o) {
                 return wrapper;
             }
         },
+        {
+            key: "wrapInline",
+            value: /**
+     * Wrap all inline siblings
+     */ function wrapInline(current, tag, editor) {
+                var tmp;
+                var first = current;
+                var last = current;
+                editor.s.save();
+                var needFindNext = false;
+                do {
+                    needFindNext = false;
+                    tmp = first.previousSibling;
+                    if (tmp && !Dom.isBlock(tmp)) {
+                        needFindNext = true;
+                        first = tmp;
+                    }
+                }while (needFindNext);
+                do {
+                    needFindNext = false;
+                    tmp = last.nextSibling;
+                    if (tmp && !Dom.isBlock(tmp)) {
+                        needFindNext = true;
+                        last = tmp;
+                    }
+                }while (needFindNext);
+                return Dom.__wrapElements(tag, editor, first, last);
+            }
+        },
         {
             key: "wrap",
             value: /**
@@ -43013,10 +43042,18 @@ __webpack_require__.r(__webpack_exports__);
 /**
  * @private
  */ function isRemovableNode(jodit, node, current, allow, deny) {
-    if (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(node) && (allow && !allow[node.nodeName] || deny && deny[node.nodeName])) {
-        return true;
+    if (!_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isText(node)) {
+        if (allow && !allow[node.nodeName]) {
+            return true;
+        }
+        if (!allow && deny && deny[node.nodeName]) {
+            return true;
+        }
+    }
+    if (!jodit.o.cleanHTML.removeEmptyElements) {
+        return false;
     }
-    return jodit.o.cleanHTML.removeEmptyElements && _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isElement(node) && node.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isTemporary(node) && (0,_core_helpers_string_trim_js__WEBPACK_IMPORTED_MODULE_2__/* .trim */ .Bq)(node.innerHTML).length === 0 && (current == null || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isOrContains(node, current));
+    return _core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isElement(node) && node.nodeName.match(_core_constants_js__WEBPACK_IMPORTED_MODULE_0__.IS_INLINE) != null && !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isTemporary(node) && (0,_core_helpers_string_trim_js__WEBPACK_IMPORTED_MODULE_2__/* .trim */ .Bq)(node.innerHTML).length === 0 && (current == null || !_core_dom_dom_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isOrContains(node, current));
 }
 
 
@@ -51009,7 +51046,7 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__/* .Config */ .T.prototype.indentMargin =
 /* harmony import */ var _core_constants_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(59230);
 /* harmony import */ var _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(50036);
 /* harmony import */ var _core_global_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(29964);
-/* harmony import */ var _core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(30057);
+/* harmony import */ var _core_helpers_utils_index_js__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(33179);
 /* harmony import */ var _config_js__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(10589);
 /* harmony import */ var _helpers_js__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(73686);
 /*!
@@ -51022,6 +51059,22 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__/* .Config */ .T.prototype.indentMargin =
 
 
 
+var applyIndentToBox = function(processedElements, currentBox, editor, command) {
+    if (!currentBox) {
+        return;
+    }
+    if (processedElements.has(currentBox)) {
+        return;
+    }
+    var key = (0,_helpers_js__WEBPACK_IMPORTED_MODULE_5__/* .getKey */ .i)(editor.o.direction, currentBox);
+    processedElements.add(currentBox);
+    var value = currentBox.style[key] ? parseInt(currentBox.style[key], 10) : 0;
+    value += editor.o.indentMargin * (command === 'outdent' ? -1 : 1);
+    currentBox.style[key] = value > 0 ? value + 'px' : '';
+    if (!(0,_core_helpers_utils_index_js__WEBPACK_IMPORTED_MODULE_3__/* .attr */ .CF)(currentBox, 'style')) {
+        (0,_core_helpers_utils_index_js__WEBPACK_IMPORTED_MODULE_3__/* .attr */ .CF)(currentBox, 'style', null);
+    }
+};
 /**
  * Indents the line containing the selection or insertion point.
  */ function indent(editor) {
@@ -51032,44 +51085,43 @@ _config_js__WEBPACK_IMPORTED_MODULE_2__/* .Config */ .T.prototype.indentMargin =
         name: 'outdent',
         group: 'indent'
     });
-    var callback = function(command) {
-        var processedElements = [];
+    var indentCommand = function(command) {
+        var processedElements = new Set();
+        var _editor_o = editor.o, enter = _editor_o.enter, enterBlock = _editor_o.enterBlock;
+        var isBrMode = enter.toLowerCase() === _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.BR;
+        var current = editor.s.current();
+        if (isBrMode && editor.s.isCollapsed()) {
+            if (current) {
+                var box = _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapNextInline(current, enterBlock, editor);
+                applyIndentToBox(processedElements, box, editor, command);
+                return false;
+            }
+        }
         editor.s.eachSelection(function(current) {
             editor.s.save();
             var currentBox = current ? _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.up(current, _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.isBlock, editor.editor) : false;
-            var enter = editor.o.enter;
             if (!currentBox && current) {
-                currentBox = _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapInline(current, enter !== _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.BR ? enter : _core_constants_js__WEBPACK_IMPORTED_MODULE_0__.PARAGRAPH, editor);
+                currentBox = (0,_core_helpers_utils_index_js__WEBPACK_IMPORTED_MODULE_3__/* .call */ .T1)(!isBrMode ? _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapInline : _core_dom_index_js__WEBPACK_IMPORTED_MODULE_1__/* .Dom */ .J.wrapNextInline, current, !isBrMode ? enter.toLowerCase() : enterBlock, editor);
             }
             if (!currentBox) {
                 editor.s.restore();
                 return false;
             }
-            var alreadyIndented = processedElements.includes(currentBox);
-            if (currentBox && !alreadyIndented) {
-                var key = (0,_helpers_js__WEBPACK_IMPORTED_MODULE_5__/* .getKey */ .i)(editor.o.direction, currentBox);
-                processedElements.push(currentBox);
-                var value = currentBox.style[key] ? parseInt(currentBox.style[key], 10) : 0;
-                value += editor.o.indentMargin * (command === 'outdent' ? -1 : 1);
-                currentBox.style[key] = value > 0 ? value + 'px' : '';
-                if (!(0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.attr)(currentBox, 'style')) {
-                    (0,_core_helpers_index_js__WEBPACK_IMPORTED_MODULE_3__.attr)(currentBox, 'style', null);
-                }
-            }
+            applyIndentToBox(processedElements, currentBox, editor, command);
             editor.s.restore();
         });
         editor.synchronizeValues();
         return false;
     };
     editor.registerCommand('indent', {
-        exec: callback,
+        exec: indentCommand,
         hotkeys: [
             'ctrl+]',
             'cmd+]'
         ]
     });
     editor.registerCommand('outdent', {
-        exec: callback,
+        exec: indentCommand,
         hotkeys: [
             'ctrl+[',
             'cmd+['

package/es5/jodit.min.css

@@ -1,14 +1,14 @@
 /*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valeriy <chupurnov@gmail.com>
- * Version: v4.4.7
+ * Version: v4.5.3
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */
 	/*!
  * jodit-pro - PRO Version of Jodit Editor
  * Author: Chupurnov Valeriy <chupurnov@gmail.com>
- * Version: v4.4.7
+ * Version: v4.5.3
  * Url: https://xdsoft.net/jodit/pro/
  * License(s): SEE LICENSE IN LICENSE.md
  */