jodit 4.13.24 → 4.13.26

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.13.24
+ * Version: v4.13.26
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -2107,7 +2107,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.13.24";
+var APP_VERSION = "4.13.26";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -2764,24 +2764,45 @@ var Create = /*#__PURE__*/ function() {
         return value;
     };
 }
+function getOwnerDocument(component) {
+    var od = component.od;
+    return od !== null && od !== void 0 ? od : document;
+}
 function cacheHTML(target, _, descriptor) {
     var fn = descriptor.value;
     if (!(0,jodit_core_helpers_checker__WEBPACK_IMPORTED_MODULE_2__.isFunction)(fn)) {
         throw (0,jodit_core_helpers_utils_error_error__WEBPACK_IMPORTED_MODULE_3__.error)('Handler must be a Function');
     }
     var useCache = true;
-    var cached = new WeakMap();
+    /**
+	 * The cache is keyed by the owner document first and only then by the
+	 * component class. A page can create editors inside different documents
+	 * (iframes) and destroy those documents later: a template cached from a
+	 * dead document would otherwise be cloned for every subsequent editor,
+	 * whose buttons then never react to clicks.
+	 */ var cached = new WeakMap();
     descriptor.value = function() {
         for(var _len = arguments.length, attrs = new Array(_len), _key = 0; _key < _len; _key++){
             attrs[_key] = arguments[_key];
         }
-        if (useCache && cached.has(this.constructor)) {
-            var _cached_get;
-            return (_cached_get = cached.get(this.constructor)) === null || _cached_get === void 0 ? void 0 : _cached_get.cloneNode(true);
+        var doc = getOwnerDocument(this);
+        var docCache = cached.get(doc);
+        if (useCache && (docCache === null || docCache === void 0 ? void 0 : docCache.has(this.constructor))) {
+            var _docCache_get;
+            return (_docCache_get = docCache.get(this.constructor)) === null || _docCache_get === void 0 ? void 0 : _docCache_get.cloneNode(true);
         }
         var value = fn.apply(this, attrs);
         if (useCache && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isElement(value)) {
-            cached.set(this.constructor, value);
+            if (docCache) {
+                docCache.set(this.constructor, value);
+            } else {
+                cached.set(doc, new WeakMap([
+                    [
+                        this.constructor,
+                        value
+                    ]
+                ]));
+            }
         }
         return useCache ? value.cloneNode(true) : value;
     };
@@ -19889,6 +19910,15 @@ var Popup = /*#__PURE__*/ function(UIGroup) {
                 this.j.e.fire(this, 'beforeClose');
                 this.j.e.fire('beforePopupClose', this);
                 this.__removeGlobalListeners();
+                // Blur a focused control (e.g. the color picker hex input) before
+                // the container goes away. Chrome fires `blur`/`change` for a
+                // removed focused element in the middle of `removeChild`, Firefox
+                // does not fire them at all. Blurring first makes both browsers
+                // run those handlers while the popup is still in the DOM. See #1458
+                var activeElement = this.od.activeElement;
+                if (activeElement && activeElement !== this.container && jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_13__.Dom.isOrContains(this.container, activeElement) && (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_15__.isFunction)(activeElement.blur)) {
+                    activeElement.blur();
+                }
                 jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_13__.Dom.safeRemove(this.container);
                 return this;
             }
@@ -29194,15 +29224,23 @@ var ToolbarButton = /*#__PURE__*/ function(UIButton) {
         {
             key: "__closePopup",
             value: function __closePopup() {
-                if (this.openedPopup) {
-                    this.j.e.off(this.ow, 'mousedown touchstart', this.onOutsideClick).off('escape closeAllPopups', this.onOutsideClick);
-                    this.state.activated = false;
-                    this.openedPopup.close();
-                    this.openedPopup.destruct();
-                    this.openedPopup = null;
-                    if (this.trigger) {
-                        (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_27__.attr)(this.trigger, 'aria-expanded', false);
-                    }
+                var popup = this.openedPopup;
+                if (!popup) {
+                    return;
+                }
+                // Detach first: removing a popup that holds the focused element
+                // makes Chrome fire `blur`/`change` on it synchronously, and a
+                // handler there may call the popup's `close` callback again.
+                // A re-entrant call must be a no-op, otherwise it destructs the
+                // popup while the outer `removeChild` is still running and Chrome
+                // throws NotFoundError. See #1458
+                this.openedPopup = null;
+                this.j.e.off(this.ow, 'mousedown touchstart', this.onOutsideClick).off('escape closeAllPopups', this.onOutsideClick);
+                this.state.activated = false;
+                popup.close();
+                popup.destruct();
+                if (this.trigger) {
+                    (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_27__.attr)(this.trigger, 'aria-expanded', false);
                 }
             }
         },
@@ -30799,8 +30837,15 @@ jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', (_palette_svg__WE
     var extra = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.refs)(form).extra;
     extra.appendChild(editor.c.fromHTML('<div class="'.concat(cn, '__hex"><input data-ref="hexInput" type="text" spellcheck="false" aria-label="HEX" placeholder="#FF0000" value="').concat(valueHex || '', '"/></div>')));
     var hexInput = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.refs)(form).hexInput;
+    // Enter applies the value and closes the popup; removing the focused
+    // input then makes Chrome fire `change` on it, which would apply the
+    // same color a second time and toggle it off again. See #1459
+    var appliedHexValue = null;
     var applyHexInput = function applyHexInput() {
         var raw = hexInput.value.trim();
+        if (raw === appliedHexValue) {
+            return;
+        }
         var isHex = /^#?[0-9a-f]{3}(?:[0-9a-f]{3})?$/i.test(raw);
         var isRgb = /^rgba?\([\d\s.,%]+\)$/i.test(raw);
         if (!isHex && !isRgb) {
@@ -30808,6 +30853,7 @@ jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', (_palette_svg__WE
         }
         var color = (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.normalizeColor)(isHex && !raw.startsWith('#') ? '#' + raw : raw);
         if (color && (0,jodit_core_helpers___WEBPACK_IMPORTED_MODULE_1__.isFunction)(callback)) {
+            appliedHexValue = raw;
             callback(color);
         }
     };

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