jodit 4.18.11 → 4.18.12
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +6 -0
- package/es2015/jodit.css +1 -1
- package/es2015/jodit.fat.min.js +2 -2
- package/es2015/jodit.js +27 -7
- package/es2015/jodit.min.js +2 -2
- package/es2015/plugins/debug/debug.css +1 -1
- package/es2015/plugins/debug/debug.js +1 -1
- package/es2015/plugins/debug/debug.min.js +1 -1
- package/es2015/plugins/speech-recognize/speech-recognize.css +1 -1
- package/es2015/plugins/speech-recognize/speech-recognize.js +1 -1
- package/es2015/plugins/speech-recognize/speech-recognize.min.js +1 -1
- package/es2018/jodit.fat.min.js +2 -2
- package/es2018/jodit.min.js +2 -2
- package/es2018/plugins/debug/debug.min.js +1 -1
- package/es2018/plugins/speech-recognize/speech-recognize.min.js +1 -1
- package/es2021/jodit.css +1 -1
- package/es2021/jodit.fat.min.js +3 -3
- package/es2021/jodit.js +27 -7
- package/es2021/jodit.min.js +3 -3
- package/es2021/plugins/debug/debug.css +1 -1
- package/es2021/plugins/debug/debug.js +1 -1
- package/es2021/plugins/debug/debug.min.js +1 -1
- package/es2021/plugins/speech-recognize/speech-recognize.css +1 -1
- package/es2021/plugins/speech-recognize/speech-recognize.js +1 -1
- package/es2021/plugins/speech-recognize/speech-recognize.min.js +1 -1
- package/es2021.en/jodit.css +1 -1
- package/es2021.en/jodit.fat.min.js +3 -3
- package/es2021.en/jodit.js +27 -7
- package/es2021.en/jodit.min.js +3 -3
- package/es2021.en/plugins/debug/debug.css +1 -1
- package/es2021.en/plugins/debug/debug.js +1 -1
- package/es2021.en/plugins/debug/debug.min.js +1 -1
- package/es2021.en/plugins/speech-recognize/speech-recognize.css +1 -1
- package/es2021.en/plugins/speech-recognize/speech-recognize.js +1 -1
- package/es2021.en/plugins/speech-recognize/speech-recognize.min.js +1 -1
- package/es5/jodit.css +2 -2
- package/es5/jodit.fat.min.js +2 -2
- package/es5/jodit.js +52 -7
- package/es5/jodit.min.css +2 -2
- package/es5/jodit.min.js +2 -2
- package/es5/plugins/debug/debug.css +1 -1
- package/es5/plugins/debug/debug.js +1 -1
- package/es5/plugins/debug/debug.min.js +1 -1
- package/es5/plugins/speech-recognize/speech-recognize.css +1 -1
- package/es5/plugins/speech-recognize/speech-recognize.js +1 -1
- package/es5/plugins/speech-recognize/speech-recognize.min.js +1 -1
- package/es5/polyfills.fat.min.js +1 -1
- package/es5/polyfills.js +1 -1
- package/es5/polyfills.min.js +1 -1
- package/esm/core/constants.js +1 -1
- package/esm/core/selection/style/api/list/toggle-ordered-list.d.ts +1 -1
- package/esm/core/selection/style/api/list/toggle-ordered-list.js +30 -4
- package/esm/core/selection/style/transactions.js +1 -1
- package/package.json +1 -1
- package/types/core/selection/style/api/list/toggle-ordered-list.d.ts +1 -1
package/es5/polyfills.fat.min.js
CHANGED
package/es5/polyfills.js
CHANGED
package/es5/polyfills.min.js
CHANGED
package/esm/core/constants.js
CHANGED
|
@@ -3,7 +3,7 @@
|
|
|
3
3
|
* Released under MIT see LICENSE.txt in the project root for license information.
|
|
4
4
|
* Copyright (c) 2013-2026 Valerii Chupurnov. All rights reserved. https://xdsoft.net
|
|
5
5
|
*/
|
|
6
|
-
export const APP_VERSION = "4.18.
|
|
6
|
+
export const APP_VERSION = "4.18.12";
|
|
7
7
|
// prettier-ignore
|
|
8
8
|
export const ES = "es2020";
|
|
9
9
|
export const IS_ES_MODERN = true;
|
|
@@ -8,4 +8,4 @@ import type { CommitMode, ICommitStyle, IJodit } from "../../../../../types/inde
|
|
|
8
8
|
* Replaces `ul->ol` or `ol->ul`, apply styles to the list, or remove a list item from it
|
|
9
9
|
* @private
|
|
10
10
|
*/
|
|
11
|
-
export declare function toggleOrderedList(commitStyle: ICommitStyle, li: HTMLElement, jodit: IJodit, mode: CommitMode): CommitMode;
|
|
11
|
+
export declare function toggleOrderedList(commitStyle: ICommitStyle, li: HTMLElement, jodit: IJodit, mode: CommitMode, collapsed?: boolean): CommitMode;
|
|
@@ -15,7 +15,7 @@ import { wrapList } from "./wrap-list.js";
|
|
|
15
15
|
* Replaces `ul->ol` or `ol->ul`, apply styles to the list, or remove a list item from it
|
|
16
16
|
* @private
|
|
17
17
|
*/
|
|
18
|
-
export function toggleOrderedList(commitStyle, li, jodit, mode) {
|
|
18
|
+
export function toggleOrderedList(commitStyle, li, jodit, mode, collapsed = false) {
|
|
19
19
|
if (!li) {
|
|
20
20
|
return mode;
|
|
21
21
|
}
|
|
@@ -47,16 +47,42 @@ export function toggleOrderedList(commitStyle, li, jodit, mode) {
|
|
|
47
47
|
}
|
|
48
48
|
// ul => ol, ol => ul or ul => ul.class1
|
|
49
49
|
if (mode === REPLACE || isChangeMode || !isSameList) {
|
|
50
|
-
|
|
51
|
-
const
|
|
50
|
+
// With just a caret, Word converts the whole list
|
|
51
|
+
const items = collapsed && !isSameList
|
|
52
|
+
? Array.from(list.children).filter(item => Dom.isLeaf(item))
|
|
53
|
+
: [li];
|
|
54
|
+
let newList;
|
|
55
|
+
for (const item of items) {
|
|
56
|
+
newList = keepNumbering(item, itemList => wrapList(commitStyle, unwrapList(REPLACE, itemList, item, jodit, commitStyle), jodit));
|
|
57
|
+
}
|
|
52
58
|
hook(REPLACE, newList, commitStyle);
|
|
53
59
|
return REPLACE;
|
|
54
60
|
}
|
|
55
61
|
}
|
|
56
|
-
const wrapper = unwrapList(UNWRAP,
|
|
62
|
+
const wrapper = keepNumbering(li, itemList => unwrapList(UNWRAP, itemList, li, jodit, commitStyle));
|
|
57
63
|
hook(UNWRAP, wrapper, commitStyle);
|
|
58
64
|
return UNWRAP;
|
|
59
65
|
}
|
|
66
|
+
/**
|
|
67
|
+
* Takes `item` out of its list with `takeOut`, and carries a numbered list's
|
|
68
|
+
* count on past it, as Word does: 1, a bullet, then 2
|
|
69
|
+
*/
|
|
70
|
+
function keepNumbering(item, takeOut) {
|
|
71
|
+
const list = item.parentElement;
|
|
72
|
+
const rest = item.nextElementSibling;
|
|
73
|
+
const next = Dom.isTag(list, 'ol')
|
|
74
|
+
? (parseInt(list.getAttribute('start') || '1', 10) || 1) +
|
|
75
|
+
Array.from(list.children).indexOf(item)
|
|
76
|
+
: 0;
|
|
77
|
+
const result = takeOut(list);
|
|
78
|
+
const restList = rest === null || rest === void 0 ? void 0 : rest.parentElement;
|
|
79
|
+
if (next && Dom.isTag(restList, 'ol')) {
|
|
80
|
+
next > 1
|
|
81
|
+
? restList.setAttribute('start', String(next))
|
|
82
|
+
: restList.removeAttribute('start');
|
|
83
|
+
}
|
|
84
|
+
return result;
|
|
85
|
+
}
|
|
60
86
|
/**
|
|
61
87
|
* Other attributes, such as a class, still move the items into a new list,
|
|
62
88
|
* where the `beforeWrapList` hook can add markup to each of them
|
|
@@ -78,7 +78,7 @@ export const transactions = {
|
|
|
78
78
|
exec(value) {
|
|
79
79
|
return {
|
|
80
80
|
...value,
|
|
81
|
-
mode: toggleOrderedList(value.style, value.element, value.jodit, value.mode),
|
|
81
|
+
mode: toggleOrderedList(value.style, value.element, value.jodit, value.mode, value.collapsed),
|
|
82
82
|
next: states.END
|
|
83
83
|
};
|
|
84
84
|
}
|
package/package.json
CHANGED
|
@@ -8,4 +8,4 @@ import type { CommitMode, ICommitStyle, IJodit } from "../../../../../types/inde
|
|
|
8
8
|
* Replaces `ul->ol` or `ol->ul`, apply styles to the list, or remove a list item from it
|
|
9
9
|
* @private
|
|
10
10
|
*/
|
|
11
|
-
export declare function toggleOrderedList(commitStyle: ICommitStyle, li: HTMLElement, jodit: IJodit, mode: CommitMode): CommitMode;
|
|
11
|
+
export declare function toggleOrderedList(commitStyle: ICommitStyle, li: HTMLElement, jodit: IJodit, mode: CommitMode, collapsed?: boolean): CommitMode;
|