jodit 4.2.14 → 4.2.15

package/esm/modules/uploader/helpers/send-files.js

@@ -19,34 +19,7 @@ export function sendFiles(uploader, files, handlerSuccess, handlerError, process
     }
     const promises = [];
     if (o.insertImageAsBase64URI) {
-        let file, i;
-        for (i = 0; i < fileList.length; i += 1) {
-            file = fileList[i];
-            if (file && file.type) {
-                const mime = file.type.match(/\/([a-z0-9]+)/i);
-                const extension = mime[1] ? mime[1].toLowerCase() : '';
-                if (o.imagesExtensions.includes(extension)) {
-                    const reader = new FileReader();
-                    promises.push(uploader.j.async.promise((resolve, reject) => {
-                        reader.onerror = reject;
-                        reader.onloadend = () => {
-                            const resp = {
-                                baseurl: '',
-                                files: [reader.result],
-                                isImages: [true]
-                            };
-                            const handler = isFunction(handlerSuccess)
-                                ? handlerSuccess
-                                : o.defaultHandlerSuccess;
-                            handler.call(uploader, resp);
-                            resolve(resp);
-                        };
-                        reader.readAsDataURL(file);
-                    }));
-                    fileList[i] = null;
-                }
-            }
-        }
+        readImagesWithReader(fileList, o.imagesExtensions, promises, uploader, handlerSuccess, o.defaultHandlerSuccess);
     }
     fileList = fileList.filter(a => a);
     if (fileList.length) {
@@ -57,7 +30,7 @@ export function sendFiles(uploader, files, handlerSuccess, handlerError, process
         for (let i = 0; i < fileList.length; i += 1) {
             file = fileList[i];
             if (file) {
-                const hasRealExtension = /\.[\d\w]+$/.test(file.name);
+                const hasRealExtension = /\.\w+$/.test(file.name);
                 const mime = file.type.match(/\/([a-z0-9]+)/i);
                 const extension = mime && mime[1] ? mime[1].toLowerCase() : '';
                 let newName = fileList[i].name ||
@@ -106,3 +79,34 @@ export function sendFiles(uploader, files, handlerSuccess, handlerError, process
     }
     return Promise.all(promises);
 }
+function readImagesWithReader(fileList, imagesExtensions, promises, uploader, handlerSuccess, defaultHandlerSuccess) {
+    let file, i;
+    for (i = 0; i < fileList.length; i += 1) {
+        file = fileList[i];
+        if (file && file.type) {
+            const mime = file.type.match(/\/([a-z0-9]+)/i);
+            const extension = mime[1] ? mime[1].toLowerCase() : '';
+            if (!imagesExtensions.includes(extension)) {
+                continue;
+            }
+            const reader = new FileReader();
+            promises.push(uploader.j.async.promise((resolve, reject) => {
+                reader.onerror = reject;
+                reader.onloadend = () => {
+                    const resp = {
+                        baseurl: '',
+                        files: [reader.result],
+                        isImages: [true]
+                    };
+                    const handler = isFunction(handlerSuccess)
+                        ? handlerSuccess
+                        : defaultHandlerSuccess;
+                    handler.call(uploader, resp);
+                    resolve(resp);
+                };
+                reader.readAsDataURL(file);
+            }));
+            fileList[i] = null;
+        }
+    }
+}

package/esm/plugins/backspace/cases/check-remove-char.js

@@ -23,19 +23,12 @@ import { findMostNestedNeighbor } from "../helpers.js";
 export function checkRemoveChar(jodit, fakeNode, backspace, mode) {
     const step = backspace ? -1 : 1;
     const anotherSibling = Dom.sibling(fakeNode, !backspace);
-    let sibling = Dom.sibling(fakeNode, backspace), removeNeighbor = null;
-    let charRemoved = false, removed;
-    const getNextInlineSibling = (sibling) => {
-        let nextSibling = Dom.sibling(sibling, backspace);
-        if (!nextSibling &&
-            sibling.parentNode &&
-            sibling.parentNode !== jodit.editor) {
-            nextSibling = findMostNestedNeighbor(sibling, !backspace, jodit.editor, true);
-        }
-        return nextSibling;
-    };
+    let sibling = Dom.sibling(fakeNode, backspace);
+    let removeNeighbor = null;
+    let charRemoved = false;
+    let removed;
     if (!sibling) {
-        sibling = getNextInlineSibling(fakeNode);
+        sibling = getNextInlineSibling(fakeNode, backspace, jodit.editor);
     }
     while (sibling && (Dom.isText(sibling) || Dom.isInlineBlock(sibling))) {
         while (Dom.isInlineBlock(sibling)) {
@@ -45,57 +38,17 @@ export function checkRemoveChar(jodit, fakeNode, backspace, mode) {
             break;
         }
         if (sibling.nodeValue?.length) {
-            // For Unicode escapes
-            let value = toArray(sibling.nodeValue);
-            const length = value.length;
-            let index = backspace ? length - 1 : 0;
-            if (value[index] === INVISIBLE_SPACE) {
-                while (value[index] === INVISIBLE_SPACE) {
-                    index += step;
-                }
-            }
-            removed = value[index];
-            if (value[index + step] === INVISIBLE_SPACE) {
-                index += step;
-                while (value[index] === INVISIBLE_SPACE) {
-                    index += step;
-                }
-                index += backspace ? 1 : -1;
-            }
-            if (backspace && index < 0) {
-                value = [];
-            }
-            else {
-                value = value.slice(backspace ? 0 : index + 1, backspace ? index : length);
-            }
-            if (!anotherSibling ||
-                !Dom.isText(anotherSibling) ||
-                (!backspace ? / $/ : /^ /).test(anotherSibling.nodeValue ?? '') ||
-                !trimInv(anotherSibling.nodeValue || '').length) {
-                for (let i = backspace ? value.length - 1 : 0; backspace ? i >= 0 : i < value.length; i += backspace ? -1 : 1) {
-                    if (value[i] === ' ') {
-                        value[i] = NBSP_SPACE;
-                    }
-                    else {
-                        break;
-                    }
-                }
-            }
-            sibling.nodeValue = value.join('');
+            removed = tryRemoveChar(sibling, backspace, step, anotherSibling);
         }
         if (!sibling.nodeValue?.length) {
             removeNeighbor = sibling;
         }
         if (!isVoid(removed) && removed !== INVISIBLE_SPACE) {
+            checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed, jodit);
             charRemoved = true;
-            call(backspace ? Dom.after : Dom.before, sibling, fakeNode);
-            if (mode === 'sentence' ||
-                (mode === 'word' && removed !== ' ' && removed !== NBSP_SPACE)) {
-                checkRemoveChar(jodit, fakeNode, backspace, mode);
-            }
             break;
         }
-        const nextSibling = getNextInlineSibling(sibling);
+        const nextSibling = getNextInlineSibling(sibling, backspace, jodit.editor);
         if (removeNeighbor) {
             Dom.safeRemove(removeNeighbor);
             removeNeighbor = null;
@@ -117,6 +70,13 @@ export function checkRemoveChar(jodit, fakeNode, backspace, mode) {
     }
     return charRemoved;
 }
+function getNextInlineSibling(sibling, backspace, root) {
+    let nextSibling = Dom.sibling(sibling, backspace);
+    if (!nextSibling && sibling.parentNode && sibling.parentNode !== root) {
+        nextSibling = findMostNestedNeighbor(sibling, !backspace, root, true);
+    }
+    return nextSibling;
+}
 /**
  * Helper removes all empty inline parents
  */
@@ -141,3 +101,53 @@ function addBRInsideEmptyBlock(jodit, node) {
         Dom.after(node, jodit.createInside.element('br'));
     }
 }
+function tryRemoveChar(sibling, backspace, step, anotherSibling) {
+    // For Unicode escapes
+    let value = toArray(sibling.nodeValue);
+    const length = value.length;
+    let index = backspace ? length - 1 : 0;
+    if (value[index] === INVISIBLE_SPACE) {
+        while (value[index] === INVISIBLE_SPACE) {
+            index += step;
+        }
+    }
+    const removed = value[index];
+    if (value[index + step] === INVISIBLE_SPACE) {
+        index += step;
+        while (value[index] === INVISIBLE_SPACE) {
+            index += step;
+        }
+        index += backspace ? 1 : -1;
+    }
+    if (backspace && index < 0) {
+        value = [];
+    }
+    else {
+        value = value.slice(backspace ? 0 : index + 1, backspace ? index : length);
+    }
+    replaceSpaceOnNBSP(anotherSibling, backspace, value);
+    sibling.nodeValue = value.join('');
+    return removed;
+}
+function replaceSpaceOnNBSP(anotherSibling, backspace, value) {
+    if (!anotherSibling ||
+        !Dom.isText(anotherSibling) ||
+        (!backspace ? / $/ : /^ /).test(anotherSibling.nodeValue ?? '') ||
+        !trimInv(anotherSibling.nodeValue || '').length) {
+        for (let i = backspace ? value.length - 1 : 0; backspace ? i >= 0 : i < value.length; i += backspace ? -1 : 1) {
+            if (value[i] === ' ') {
+                value[i] = NBSP_SPACE;
+            }
+            else {
+                break;
+            }
+        }
+    }
+}
+function checkRepeatRemoveCharAction(backspace, sibling, fakeNode, mode, removed, jodit) {
+    call(backspace ? Dom.after : Dom.before, sibling, fakeNode);
+    if (mode === 'sentence' ||
+        (mode === 'word' && removed !== ' ' && removed !== NBSP_SPACE)) {
+        checkRemoveChar(jodit, fakeNode, backspace, mode);
+    }
+}

package/esm/plugins/drag-and-drop/drag-and-drop.d.ts

@@ -21,6 +21,8 @@ export declare class dragAndDrop extends Plugin {
     private onDrag;
     private onDragEnd;
     private onDrop;
+    private __getWorkFragment;
+    private __insertFragment;
     private getText;
     /** @override */
     beforeDestruct(): void;

package/esm/plugins/drag-and-drop/drag-and-drop.js

@@ -107,45 +107,11 @@ export class dragAndDrop extends Plugin {
             const sel = this.j.s.sel;
             const range = this.bufferRange ||
                 (sel && sel.rangeCount ? sel.getRangeAt(0) : null);
-            let fragment = null;
-            if (!this.draggable && range) {
-                fragment = this.isCopyMode
-                    ? range.cloneContents()
-                    : range.extractContents();
-            }
-            else if (this.draggable) {
-                if (this.isCopyMode) {
-                    const [tagName, field] = attr(this.draggable, '-is-file') === '1'
-                        ? ['a', 'href']
-                        : ['img', 'src'];
-                    fragment = this.j.createInside.element(tagName);
-                    fragment.setAttribute(field, attr(this.draggable, 'data-src') ||
-                        attr(this.draggable, 'src') ||
-                        '');
-                    if (tagName === 'a') {
-                        fragment.textContent = attr(fragment, field) || '';
-                    }
-                }
-                else {
-                    fragment = dataBind(this.draggable, 'target');
-                }
-            }
-            else if (this.getText(event)) {
-                fragment = this.j.createInside.fromHTML(this.getText(event));
-            }
+            const fragment = this.__getWorkFragment(range, event);
             sel && sel.removeAllRanges();
             this.j.s.insertCursorAtPoint(event.clientX, event.clientY);
             if (fragment) {
-                this.j.s.insertNode(fragment, false, false);
-                if (range && fragment.firstChild && fragment.lastChild) {
-                    range.setStartBefore(fragment.firstChild);
-                    range.setEndAfter(fragment.lastChild);
-                    this.j.s.selectRange(range);
-                    this.j.e.fire('synchro');
-                }
-                if (Dom.isTag(fragment, 'img') && this.j.events) {
-                    this.j.e.fire('afterInsertImage', fragment);
-                }
+                this.__insertFragment.call(this, fragment, range);
             }
             event.preventDefault();
             event.stopPropagation();
@@ -153,6 +119,47 @@ export class dragAndDrop extends Plugin {
         this.isFragmentFromEditor = false;
         this.removeDragListeners();
     }
+    __getWorkFragment(range, event) {
+        let fragment = null;
+        if (!this.draggable && range) {
+            fragment = this.isCopyMode
+                ? range.cloneContents()
+                : range.extractContents();
+        }
+        else if (this.draggable) {
+            if (this.isCopyMode) {
+                const [tagName, field] = attr(this.draggable, '-is-file') === '1'
+                    ? ['a', 'href']
+                    : ['img', 'src'];
+                fragment = this.j.createInside.element(tagName);
+                fragment.setAttribute(field, attr(this.draggable, 'data-src') ||
+                    attr(this.draggable, 'src') ||
+                    '');
+                if (tagName === 'a') {
+                    fragment.textContent = attr(fragment, field) || '';
+                }
+            }
+            else {
+                fragment = dataBind(this.draggable, 'target');
+            }
+        }
+        else if (this.getText(event)) {
+            fragment = this.j.createInside.fromHTML(this.getText(event));
+        }
+        return fragment;
+    }
+    __insertFragment(fragment, range) {
+        this.j.s.insertNode(fragment, false, false);
+        if (range && fragment.firstChild && fragment.lastChild) {
+            range.setStartBefore(fragment.firstChild);
+            range.setEndAfter(fragment.lastChild);
+            this.j.s.selectRange(range);
+            this.j.e.fire('synchro');
+        }
+        if (Dom.isTag(fragment, 'img') && this.j.events) {
+            this.j.e.fire('afterInsertImage', fragment);
+        }
+    }
     /** @override */
     beforeDestruct() {
         this.onDragEnd();

package/esm/plugins/link/link.js

@@ -138,35 +138,7 @@ export class link extends Plugin {
         if (link) {
             url_input.value = attr(link, 'href') || '';
             if (modeClassName) {
-                switch (modeClassName) {
-                    case 'input':
-                        if (className_input) {
-                            className_input.value = attr(link, 'class') || '';
-                        }
-                        break;
-                    case 'select':
-                        if (className_select) {
-                            for (let i = 0; i < className_select.selectedOptions.length; i++) {
-                                const option = className_select.options.item(i);
-                                if (option) {
-                                    option.selected = false;
-                                }
-                            }
-                            const classNames = attr(link, 'class') || '';
-                            classNames.split(' ').forEach(className => {
-                                if (className) {
-                                    for (let i = 0; i < className_select.options.length; i++) {
-                                        const option = className_select.options.item(i);
-                                        if (option?.value &&
-                                            option.value === className) {
-                                            option.selected = true;
-                                        }
-                                    }
-                                }
-                            });
-                        }
-                        break;
-                }
+                readClassnames(modeClassName, className_input, link, className_select);
             }
             if (openInNewTabCheckbox && target_checkbox) {
                 target_checkbox.checked = attr(link, 'target') === '_blank';
@@ -228,42 +200,9 @@ export class link extends Plugin {
             }
             links.forEach(a => {
                 attr(a, 'href', url_input.value);
-                if (modeClassName && (className_input ?? className_select)) {
-                    if (modeClassName === 'input') {
-                        if (className_input.value === '' &&
-                            a.hasAttribute('class')) {
-                            attr(a, 'class', null);
-                        }
-                        if (className_input.value !== '') {
-                            attr(a, 'class', className_input.value);
-                        }
-                    }
-                    else if (modeClassName === 'select') {
-                        if (a.hasAttribute('class')) {
-                            attr(a, 'class', null);
-                        }
-                        for (let i = 0; i < className_select.selectedOptions.length; i++) {
-                            const className = className_select.selectedOptions.item(i)?.value;
-                            if (className) {
-                                a.classList.add(className);
-                            }
-                        }
-                    }
-                }
+                writeClasses(modeClassName, className_input, className_select, a);
                 if (!isImageContent) {
-                    let newContent = a.textContent;
-                    if (content_input.value.trim().length) {
-                        if (textWasChanged) {
-                            newContent = content_input.value;
-                        }
-                    }
-                    else {
-                        newContent = url_input.value;
-                    }
-                    const content = a.textContent;
-                    if (newContent !== content) {
-                        a.textContent = newContent;
-                    }
+                    writeImage(a, content_input, textWasChanged, url_input);
                 }
                 if (openInNewTabCheckbox && target_checkbox) {
                     attr(a, 'target', target_checkbox.checked ? '_blank' : null);
@@ -308,3 +247,71 @@ __decorate([
     autobind
 ], link.prototype, "__generateForm", null);
 pluginSystem.add('link', link);
+function writeClasses(modeClassName, className_input, className_select, a) {
+    if (modeClassName && (className_input ?? className_select)) {
+        if (modeClassName === 'input') {
+            if (className_input.value === '' && a.hasAttribute('class')) {
+                attr(a, 'class', null);
+            }
+            if (className_input.value !== '') {
+                attr(a, 'class', className_input.value);
+            }
+        }
+        else if (modeClassName === 'select') {
+            if (a.hasAttribute('class')) {
+                attr(a, 'class', null);
+            }
+            for (let i = 0; i < className_select.selectedOptions.length; i++) {
+                const className = className_select.selectedOptions.item(i)?.value;
+                if (className) {
+                    a.classList.add(className);
+                }
+            }
+        }
+    }
+}
+function readClassnames(modeClassName, className_input, link, className_select) {
+    switch (modeClassName) {
+        case 'input':
+            if (className_input) {
+                className_input.value = attr(link, 'class') || '';
+            }
+            break;
+        case 'select':
+            if (className_select) {
+                for (let i = 0; i < className_select.selectedOptions.length; i++) {
+                    const option = className_select.options.item(i);
+                    if (option) {
+                        option.selected = false;
+                    }
+                }
+                const classNames = attr(link, 'class') || '';
+                classNames.split(' ').forEach(className => {
+                    if (className) {
+                        for (let i = 0; i < className_select.options.length; i++) {
+                            const option = className_select.options.item(i);
+                            if (option?.value && option.value === className) {
+                                option.selected = true;
+                            }
+                        }
+                    }
+                });
+            }
+            break;
+    }
+}
+function writeImage(a, content_input, textWasChanged, url_input) {
+    let newContent = a.textContent;
+    if (content_input.value.trim().length) {
+        if (textWasChanged) {
+            newContent = content_input.value;
+        }
+    }
+    else {
+        newContent = url_input.value;
+    }
+    const content = a.textContent;
+    if (newContent !== content) {
+        a.textContent = newContent;
+    }
+}

package/esm/plugins/search/helpers/highlight-text-ranges.d.ts

@@ -23,7 +23,3 @@ export declare function clearSelectionWrappers(root: HTMLElement): void;
  * @private
  */
 export declare function clearSelectionWrappersFromHTML(root: string): string;
-/**
- * @private
- */
-export declare function isSelectionWrapper(node: unknown): boolean;

package/esm/plugins/search/helpers/highlight-text-ranges.js

@@ -17,60 +17,14 @@ export function highlightTextRanges(jodit, rng, restRanges, ci, root) {
         rng.endContainer.nodeValue == null) {
         return;
     }
-    if (jodit.o.search.useCustomHighlightAPI &&
-        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
-        typeof window.Highlight !== 'undefined') {
-        const ranges = [rng, ...restRanges].map(rng => {
-            const range = jodit.selection.createRange();
-            range.setStart(rng.startContainer, rng.startOffset);
-            range.setEnd(rng.endContainer, rng.endOffset);
-            return range;
-        });
-        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
-        const searchHighlight = new Highlight(...ranges);
-        // @ts-ignore
-        CSS.highlights.clear();
-        // @ts-ignore
-        CSS.highlights.set('jodit-search-result', searchHighlight);
-        restRanges.length = 0;
+    if (checkNativeSelectionMethod(jodit, rng, restRanges)) {
         return;
     }
     const span = ci.element('span', {
         [TMP_ATTR]: true
     });
     Dom.markTemporary(span);
-    const startText = rng.startContainer.nodeValue;
-    let diff = 0;
-    if (rng.startOffset !== 0) {
-        const text = ci.text(startText.substring(0, rng.startOffset));
-        rng.startContainer.nodeValue = startText.substring(rng.startOffset);
-        Dom.before(rng.startContainer, text);
-        if (rng.startContainer === rng.endContainer) {
-            diff = rng.startOffset;
-            rng.endOffset -= diff;
-        }
-        rng.startOffset = 0;
-    }
-    const endText = rng.endContainer.nodeValue;
-    if (rng.endOffset !== endText.length) {
-        const text = ci.text(endText.substring(rng.endOffset));
-        rng.endContainer.nodeValue = endText.substring(0, rng.endOffset);
-        Dom.after(rng.endContainer, text);
-        for (const range of restRanges) {
-            if (range.startContainer === rng.endContainer) {
-                range.startContainer = text;
-                range.startOffset = range.startOffset - rng.endOffset - diff;
-                if (range.endContainer === rng.endContainer) {
-                    range.endContainer = text;
-                    range.endOffset = range.endOffset - rng.endOffset - diff;
-                }
-            }
-            else {
-                break;
-            }
-        }
-        rng.endOffset = rng.endContainer.nodeValue.length;
-    }
+    normalizeRanges(rng, restRanges, ci);
     let next = rng.startContainer;
     do {
         if (!next) {
@@ -113,6 +67,61 @@ export function clearSelectionWrappersFromHTML(root) {
 /**
  * @private
  */
-export function isSelectionWrapper(node) {
+function isSelectionWrapper(node) {
     return Dom.isElement(node) && node.hasAttribute(TMP_ATTR);
 }
+function checkNativeSelectionMethod(jodit, rng, restRanges) {
+    if (jodit.o.search.useCustomHighlightAPI &&
+        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
+        typeof window.Highlight !== 'undefined') {
+        const ranges = [rng, ...restRanges].map(rng => {
+            const range = jodit.selection.createRange();
+            range.setStart(rng.startContainer, rng.startOffset);
+            range.setEnd(rng.endContainer, rng.endOffset);
+            return range;
+        });
+        // @ts-ignore Because Highlight is not defined in the types TS 5.3.3
+        const searchHighlight = new Highlight(...ranges);
+        // @ts-ignore
+        CSS.highlights.clear();
+        // @ts-ignore
+        CSS.highlights.set('jodit-search-result', searchHighlight);
+        restRanges.length = 0;
+        return true;
+    }
+    return false;
+}
+function normalizeRanges(rng, restRanges, ci) {
+    const startText = rng.startContainer.nodeValue;
+    let diff = 0;
+    if (rng.startOffset !== 0) {
+        const text = ci.text(startText.substring(0, rng.startOffset));
+        rng.startContainer.nodeValue = startText.substring(rng.startOffset);
+        Dom.before(rng.startContainer, text);
+        if (rng.startContainer === rng.endContainer) {
+            diff = rng.startOffset;
+            rng.endOffset -= diff;
+        }
+        rng.startOffset = 0;
+    }
+    const endText = rng.endContainer.nodeValue;
+    if (rng.endOffset !== endText.length) {
+        const text = ci.text(endText.substring(rng.endOffset));
+        rng.endContainer.nodeValue = endText.substring(0, rng.endOffset);
+        Dom.after(rng.endContainer, text);
+        for (const range of restRanges) {
+            if (range.startContainer === rng.endContainer) {
+                range.startContainer = text;
+                range.startOffset = range.startOffset - rng.endOffset - diff;
+                if (range.endContainer === rng.endContainer) {
+                    range.endContainer = text;
+                    range.endOffset = range.endOffset - rng.endOffset - diff;
+                }
+            }
+            else {
+                break;
+            }
+        }
+        rng.endOffset = rng.endContainer.nodeValue.length;
+    }
+}