jodit 4.16.1 → 4.17.1

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.16.1
+ * Version: v4.17.1
  * Url: https://xdsoft.net/jodit/
  * License(s): MIT
  */
@@ -2129,7 +2129,7 @@ __webpack_require__.r(__webpack_exports__);
  * @packageDocumentation
  * @module constants
  */ 
-var APP_VERSION = "4.16.1";
+var APP_VERSION = "4.17.1";
 // prettier-ignore
 var ES = "es5";
 var IS_ES_MODERN = false;
@@ -7266,11 +7266,18 @@ function sanitizeHTMLElement(elm) {
     var _ref = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : {
         safeJavaScriptLink: true,
         removeOnError: true
-    }, safeJavaScriptLink = _ref.safeJavaScriptLink, removeOnError = _ref.removeOnError;
+    }, safeJavaScriptLink = _ref.safeJavaScriptLink, removeOnError = _ref.removeOnError, removeEventAttributes = _ref.removeEventAttributes;
     if (!jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isElement(elm)) {
         return false;
     }
     var effected = false;
+    // Every `on*` handler, not only `onerror`: the clean-html background
+    // pass calls this directly, and markup that reached the editable area
+    // without `safeHTML` (a drop, a script) kept its handlers otherwise.
+    // See GHSA-jhhp-r3r7-v2cg
+    if (removeEventAttributes && removeAllEventAttributes(elm)) {
+        effected = true;
+    }
     if (removeOnError && elm.hasAttribute('onerror')) {
         (0,jodit_core_helpers_utils__WEBPACK_IMPORTED_MODULE_1__.attr)(elm, 'onerror', null);
         effected = true;
@@ -31712,7 +31719,8 @@ jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', (_palette_svg__WE
 
 "use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   FileSelectorWidget: function() { return /* binding */ FileSelectorWidget; }
+/* harmony export */   FileSelectorWidget: function() { return /* binding */ FileSelectorWidget; },
+/* harmony export */   UploadTab: function() { return /* binding */ UploadTab; }
 /* harmony export */ });
 /* harmony import */ var jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(23211);
 /* harmony import */ var jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(65946);
@@ -31744,22 +31752,19 @@ jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', (_palette_svg__WE
     var tabs = [];
     var options = editor.o.uploader;
     if (callbacks.upload && options.showTabInFileSelector !== false && (options.url || options.insertImageAsBase64URI || options.customUploadFunction)) {
-        var dragBox = editor.c.fromHTML('<div class="jodit-drag-and-drop__file-box">' + "<strong>".concat(editor.i18n(isImage ? 'Drop image' : 'Drop file'), "</strong>") + "<span><br>".concat(editor.i18n('or click'), "</span>") + '<input type="file" accept="'.concat(isImage ? 'image/*' : '*', '" tabindex="-1" dir="auto" multiple=""/>') + '</div>');
-        editor.uploader.bind(dragBox, function(resp) {
-            var handler = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(callbacks.upload) ? callbacks.upload : options.defaultHandlerSuccess;
+        var upload = callbacks.upload;
+        tabs.push(UploadTab(editor, function(resp) {
+            var handler = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(upload) ? upload : options.defaultHandlerSuccess;
             if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.isFunction)(handler)) {
                 handler.call(editor, resp);
             }
-            editor.e.fire('closeAllPopups');
-        }, function(error) {
-            editor.message.error(error.message);
-            editor.e.fire('closeAllPopups');
-        });
-        tabs.push({
-            icon: 'upload',
-            name: 'Upload',
-            content: dragBox
-        });
+        }, isImage ? {
+            label: 'Drop image',
+            accept: 'image/*'
+        } : {
+            label: 'Drop file',
+            accept: '*'
+        }));
     }
     if (callbacks.filebrowser) {
         if (editor.o.filebrowser.ajax.url || editor.o.filebrowser.items.url) {
@@ -31827,6 +31832,25 @@ jodit_core_ui__WEBPACK_IMPORTED_MODULE_2__.Icon.set('palette', (_palette_svg__WE
     box.classList.add('jodit-file-selector');
     return box;
 };
+/**
+ * The Upload tab: a box that uploads the files dropped on it or chosen in its
+ * file input, then passes the uploader's answer to `onSuccess` and closes the popup
+ */ var UploadTab = function UploadTab(editor, onSuccess, param) {
+    var label = param.label, accept = param.accept;
+    var dragBox = editor.c.fromHTML('<div class="jodit-drag-and-drop__file-box">' + "<strong>".concat(editor.i18n(label), "</strong>") + "<span><br>".concat(editor.i18n('or click'), "</span>") + '<input type="file" accept="'.concat(accept, '" tabindex="-1" dir="auto" multiple=""/>') + '</div>');
+    editor.uploader.bind(dragBox, function(resp) {
+        onSuccess.call(editor, resp);
+        editor.e.fire('closeAllPopups');
+    }, function(error) {
+        editor.message.error(error.message);
+        editor.e.fire('closeAllPopups');
+    });
+    return {
+        icon: 'upload',
+        name: 'Upload',
+        content: dragBox
+    };
+};
 function val(elm, name, value) {
     var child = jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.first(elm, function(node) {
         return jodit_core_dom_dom__WEBPACK_IMPORTED_MODULE_0__.Dom.isTag(node, 'input') && (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_1__.attr)(node, 'name') === name;
@@ -31850,7 +31874,8 @@ function val(elm, name, value) {
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   ColorPickerWidget: function() { return /* reexport safe */ _color_picker_color_picker__WEBPACK_IMPORTED_MODULE_0__.ColorPickerWidget; },
 /* harmony export */   FileSelectorWidget: function() { return /* reexport safe */ _file_selector_file_selector__WEBPACK_IMPORTED_MODULE_1__.FileSelectorWidget; },
-/* harmony export */   TabsWidget: function() { return /* reexport safe */ _tabs_tabs__WEBPACK_IMPORTED_MODULE_2__.TabsWidget; }
+/* harmony export */   TabsWidget: function() { return /* reexport safe */ _tabs_tabs__WEBPACK_IMPORTED_MODULE_2__.TabsWidget; },
+/* harmony export */   UploadTab: function() { return /* reexport safe */ _file_selector_file_selector__WEBPACK_IMPORTED_MODULE_1__.UploadTab; }
 /* harmony export */ });
 /* harmony import */ var _color_picker_color_picker__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(72348);
 /* harmony import */ var _file_selector_file_selector__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(18762);
@@ -37106,7 +37131,11 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('dragAndDropElem
                     window,
                     this.j.ed,
                     this.j.editor
-                ], 'dragstart.DragAndDrop', this.onDragStart);
+                ], 'dragstart.DragAndDrop', this.onDragStart)// Always, not only after a `dragstart` seen in this window: a drop
+                // from another window or application never produces one here, and
+                // the browser then inserted its HTML natively, unsanitized. Routed
+                // through the paste plugin instead. See GHSA-jhhp-r3r7-v2cg
+                .on('drop.DragAndDrop', this.onDrop);
             }
         },
         {
@@ -37142,13 +37171,13 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('dragAndDropElem
         {
             key: "addDragListeners",
             value: function addDragListeners() {
-                this.j.e.on('dragover', this.onDrag).on('drop.DragAndDrop', this.onDrop).on(window, 'dragend.DragAndDrop drop.DragAndDrop mouseup.DragAndDrop', this.onDragEnd);
+                this.j.e.on('dragover', this.onDrag).on(window, 'dragend.DragAndDrop drop.DragAndDrop mouseup.DragAndDrop', this.onDragEnd);
             }
         },
         {
             key: "removeDragListeners",
             value: function removeDragListeners() {
-                this.j.e.off('dragover', this.onDrag).off('drop.DragAndDrop', this.onDrop).off(window, 'dragend.DragAndDrop drop.DragAndDrop mouseup.DragAndDrop', this.onDragEnd);
+                this.j.e.off('dragover', this.onDrag).off(window, 'dragend.DragAndDrop drop.DragAndDrop mouseup.DragAndDrop', this.onDragEnd);
             }
         },
         {
@@ -37222,7 +37251,12 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_9__.pluginSystem.add('dragAndDropElem
                         fragment = (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_12__.dataBind)(this.draggable, 'target');
                     }
                 } else if (this.getText(event)) {
-                    fragment = this.j.createInside.fromHTML(this.getText(event));
+                    // Dropped markup takes the same sanitizing pass as pasted and
+                    // assigned content. See GHSA-jhhp-r3r7-v2cg
+                    var box = this.j.createInside.div();
+                    box.innerHTML = this.getText(event);
+                    this.j.e.fire('safeHTML', box);
+                    fragment = box.firstChild !== box.lastChild || !box.firstChild ? box : box.firstChild;
                 }
                 return fragment;
             }
@@ -38179,6 +38213,20 @@ function brBefore(start) {
 
 
 
+function insertLinks(data) {
+    var _this = this;
+    var _data_files;
+    (_data_files = data.files) === null || _data_files === void 0 ? void 0 : _data_files.forEach(function(file) {
+        var link = _this.createInside.element('a', {
+            href: data.baseurl + file
+        });
+        link.textContent = _this.o.uploader.getDisplayName.call(_this.uploader, data.baseurl, file);
+        _this.s.insertNode(link);
+    });
+}
+jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.file = {
+    defaultHandlerSuccess: insertLinks
+};
 jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.file = {
     popup: function popup(editor, current, close) {
         var insert = function insert(url) {
@@ -38196,7 +38244,11 @@ jodit_config__WEBPACK_IMPORTED_MODULE_3__.Config.prototype.controls.file = {
                 });
                 close();
             },
-            upload: true,
+            upload: function upload(data) {
+                var _ref;
+                var _editor_o_file;
+                ((_ref = (_editor_o_file = editor.o.file) === null || _editor_o_file === void 0 ? void 0 : _editor_o_file.defaultHandlerSuccess) !== null && _ref !== void 0 ? _ref : insertLinks).call(editor, data);
+            },
             url: function url(url, text) {
                 if (sourceAnchor) {
                     (0,jodit_core_helpers_utils_attr__WEBPACK_IMPORTED_MODULE_2__.attr)(sourceAnchor, 'href', url);
@@ -42226,6 +42278,26 @@ var cmd = function cmd(control) {
 var alignClasses = function alignClasses(editor, elm) {
     return jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isTag(elm, 'img') ? editor.o.imageAlignClasses : null;
 };
+// A Normal image sits where the text of its line is aligned (#1531)
+var lineAlign = function lineAlign(editor, elm) {
+    var block = elm && jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.closest(elm, jodit_core_dom__WEBPACK_IMPORTED_MODULE_1__.Dom.isBlock, editor.editor) || editor.editor;
+    var rtl = (0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(block, 'direction') === 'rtl';
+    switch((0,jodit_core_helpers_utils_css__WEBPACK_IMPORTED_MODULE_4__.css)(block, 'text-align')){
+        case 'center':
+        case '-webkit-center':
+            return 'center';
+        case 'justify':
+            return 'justify';
+        case 'right':
+            return 'right';
+        case 'end':
+            return rtl ? 'left' : 'right';
+        case 'start':
+            return rtl ? 'right' : 'left';
+        default:
+            return 'left';
+    }
+};
 var currentAlign = function currentAlign(editor, elm) {
     return elm ? (0,jodit_core_helpers_utils_align__WEBPACK_IMPORTED_MODULE_3__.getHAlign)(elm, alignClasses(editor, elm)) : 'normal';
 };
@@ -42242,7 +42314,7 @@ var align = {
     ],
     update: function update(editor, button) {
         var current = currentAlign(editor, button.target);
-        button.state.icon.name = current === 'normal' ? 'left' : current;
+        button.state.icon.name = current === 'normal' ? lineAlign(editor, button.target) : current;
     },
     isActive: function isActive(editor, button) {
         return currentAlign(editor, button.target) !== 'normal';
@@ -50221,7 +50293,8 @@ var AceEditor = /*#__PURE__*/ function(SourceEditor) {
                         }
                         return;
                     }
-                    _this.fromWYSIWYG();
+                    // The source plugin carries the fallback editor's text over when this
+                    // one is ready; refilling from WYSIWYG here would drop unsynced typing
                     tryInitAceEditor();
                 };
                 editor.e.on('afterSetMode', initAceEditor);
@@ -50725,7 +50798,10 @@ var SourceEditor = /*#__PURE__*/ function() {
                 name: 'source',
                 group: 'source'
             }
-        ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "sourceEditor", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "mirrorContainer", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__lock", false), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__oldMirrorValue", ''), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerStart", '{start-jodit-selection}'), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerStartReg", /{start-jodit-selection}/g), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerEnd", '{end-jodit-selection}'), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerEndReg", /{end-jodit-selection}/g), // override it for ace editors
+        ]), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "sourceEditor", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "mirrorContainer", void 0), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__lock", false), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__oldMirrorValue", ''), /**
+	 * What the source view was last filled with from WYSIWYG, read back from
+	 * the editor; while the view still holds it, nothing has been typed there
+	 */ (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "__filledValue", ''), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerStart", '{start-jodit-selection}'), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerStartReg", /{start-jodit-selection}/g), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerEnd", '{end-jodit-selection}'), (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "tempMarkerEndReg", /{end-jodit-selection}/g), // override it for ace editors
         (0,_swc_helpers_define_property__WEBPACK_IMPORTED_MODULE_3__._)(_this, "getSelectionStart", function() {
             var _ref;
             var _this_sourceEditor;
@@ -50761,6 +50837,7 @@ var SourceEditor = /*#__PURE__*/ function() {
                     if (new_value !== this.getMirrorValue()) {
                         this.setMirrorValue(new_value);
                     }
+                    this.__filledValue = this.getMirrorValue();
                     this.__lock = false;
                 }
             }
@@ -50979,9 +51056,9 @@ var SourceEditor = /*#__PURE__*/ function() {
                                 return;
                             }
                             loading = true;
-                            // It formats the source view from the next time it opens:
-                            // filling it again now would replace what was typed there
-                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.loadNext)(editor, editor.o.beautifyHTMLCDNUrlsJS).then(addEventListener, function() {
+                            (0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.loadNext)(editor, editor.o.beautifyHTMLCDNUrlsJS).then(function() {
+                                addEventListener() && _this.beautifyUntouched();
+                            }, function() {
                                 return null;
                             });
                         };
@@ -51010,10 +51087,8 @@ var SourceEditor = /*#__PURE__*/ function() {
                 if (editor.o.sourceEditor !== 'area') {
                     var sourceEditor = (0,_editor_factory__WEBPACK_IMPORTED_MODULE_14__.createSourceEditor)(editor.o.sourceEditor, editor, this.mirrorContainer, this.toWYSIWYG, this.fromWYSIWYG);
                     sourceEditor.onReadyAlways(function() {
-                        var _this_sourceEditor, _editor_events;
-                        (_this_sourceEditor = _this.sourceEditor) === null || _this_sourceEditor === void 0 ? void 0 : _this_sourceEditor.destruct();
-                        _this.sourceEditor = sourceEditor;
-                        _this.syncValueFromWYSIWYG(true);
+                        var _editor_events;
+                        _this.takeOver(sourceEditor);
                         (_editor_events = editor.events) === null || _editor_events === void 0 ? void 0 : _editor_events.fire('sourceEditorReady', editor);
                     });
                 } else {
@@ -51026,6 +51101,55 @@ var SourceEditor = /*#__PURE__*/ function() {
                 }
             }
         },
+        {
+            key: "takeOver",
+            value: /**
+	 * Replaces the source editor (the textarea shown while ACE loads) with
+	 * the one that just became ready, carrying its text, selection and focus
+	 * over. Filling the new editor from WYSIWYG instead would drop what was
+	 * typed since the last, debounced, sync and normalise half-typed markup.
+	 */ function takeOver(sourceEditor) {
+                var previous = this.sourceEditor;
+                if (!previous || previous === sourceEditor) {
+                    this.sourceEditor = sourceEditor;
+                    this.syncValueFromWYSIWYG(true);
+                    return;
+                }
+                var value = previous.getValue(), start = previous.getSelectionStart(), end = previous.getSelectionEnd(), focused = previous.isFocused, untouched = value === this.__filledValue;
+                previous.destruct();
+                this.sourceEditor = sourceEditor;
+                if (untouched) {
+                    this.syncValueFromWYSIWYG(true);
+                } else {
+                    sourceEditor.setValue(value);
+                    this.toWYSIWYG();
+                }
+                if (start >= 0) {
+                    sourceEditor.setSelectionRange(start, end);
+                }
+                focused && sourceEditor.focus();
+            }
+        },
+        {
+            key: "beautifyUntouched",
+            value: /**
+	 * The beautifier arrived after the source view was opened: format the
+	 * view if nothing has been typed into it, otherwise leave the typing alone
+	 */ function beautifyUntouched() {
+                var value = this.getMirrorValue();
+                if (this.j.o.editHTMLDocumentMode || !value || value !== this.__filledValue) {
+                    return;
+                }
+                var html = this.j.e.fire('beautifyHTML', value);
+                if ((0,jodit_core_helpers__WEBPACK_IMPORTED_MODULE_11__.isString)(html) && html !== value) {
+                    var _this_sourceEditor, _this_sourceEditor1;
+                    var focused = (_this_sourceEditor = this.sourceEditor) === null || _this_sourceEditor === void 0 ? void 0 : _this_sourceEditor.isFocused;
+                    this.setMirrorValue(html);
+                    this.__filledValue = this.getMirrorValue();
+                    focused && ((_this_sourceEditor1 = this.sourceEditor) === null || _this_sourceEditor1 === void 0 ? void 0 : _this_sourceEditor1.focus());
+                }
+            }
+        },
         {
             /** @override */ key: "beforeDestruct",
             value: function beforeDestruct() {
@@ -53601,10 +53725,21 @@ jodit_core_global__WEBPACK_IMPORTED_MODULE_11__.pluginSystem.add('toolbarNavigat
 
 
 
+function insertVideos(data) {
+    var _this = this;
+    var _data_files;
+    (_data_files = data.files) === null || _data_files === void 0 ? void 0 : _data_files.forEach(function(file) {
+        _this.s.insertNode(_this.createInside.element('video', {
+            controls: '',
+            src: data.baseurl + file
+        }));
+    });
+}
 jodit_config__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.video = {
     parseUrlToVideoEmbed: jodit_core_helpers__WEBPACK_IMPORTED_MODULE_0__.convertMediaUrlToVideoEmbed,
     defaultWidth: 400,
-    defaultHeight: 345
+    defaultHeight: 345,
+    defaultHandlerSuccess: insertVideos
 };
 jodit_core_ui_icon__WEBPACK_IMPORTED_MODULE_3__.Icon.set('video', (_video_svg__WEBPACK_IMPORTED_MODULE_6___default()));
 jodit_config__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.controls.video = {
@@ -53645,6 +53780,19 @@ jodit_config__WEBPACK_IMPORTED_MODULE_4__.Config.prototype.controls.video = {
             close();
         };
         jodit.s.save();
+        var uploader = jodit.o.uploader;
+        // Base64 alone would put whole video files into the content
+        if (uploader.showTabInFileSelector !== false && (uploader.url || uploader.customUploadFunction)) {
+            tabs.push((0,jodit_modules_widget__WEBPACK_IMPORTED_MODULE_5__.UploadTab)(jodit, function(data) {
+                var _ref;
+                var _jodit_o_video;
+                jodit.s.restore();
+                ((_ref = (_jodit_o_video = jodit.o.video) === null || _jodit_o_video === void 0 ? void 0 : _jodit_o_video.defaultHandlerSuccess) !== null && _ref !== void 0 ? _ref : insertVideos).call(jodit, data);
+            }, {
+                label: 'Drop file',
+                accept: 'video/*'
+            }));
+        }
         tabs.push({
             icon: 'link',
             name: 'Link',

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