projects
/
GitHub
/
WoltLab
/
WCF.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
a0cec9f
)
Merge pull request #5745 from WoltLab/remove-text-formatting
author
Olaf Braun
<olaf_schmitz_1@t-online.de>
Mon, 8 Jan 2024 12:22:22 +0000
(13:22 +0100)
committer
GitHub
<noreply@github.com>
Mon, 8 Jan 2024 12:22:22 +0000
(13:22 +0100)
Remove unused userOption `editorPastePreserveFormatting`
ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
patch
|
blob
|
blame
|
history
wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
patch
|
blob
|
blame
|
history
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeSpan.class.php
patch
|
blob
|
blame
|
history
diff --git
a/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
b/ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
index f3ac00b3f3a4b2ab335b04090c9aab400079ff61..bf4a37188292bdb352932048997898ca04e8f181 100644
(file)
--- a/
ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
+++ b/
ts/WoltLabSuite/Core/Component/Ckeditor/Configuration.ts
@@
-348,7
+348,7
@@
class ConfigurationBuilder {
],
},
fontSize: {
- options: [
8, 10, 12, "default", 18, 24, 36
],
+ options: [
12, "default", 18, 23, 28
],
},
toolbar: this.#getToolbar(),
ui: {
diff --git
a/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
b/wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
index 687404b063491952d7591ec9d9ca4c64f487f3cf..6670c5cfcd73b7afcbdfb9e6b3df5099ccf118f5 100644
(file)
--- a/
wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
+++ b/
wcfsetup/install/files/js/WoltLabSuite/Core/Component/Ckeditor/Configuration.js
@@
-309,7
+309,7
@@
define(["require", "exports", "../../Language"], function (require, exports, Lan
],
},
fontSize: {
- options: [
8, 10, 12, "default", 18, 24, 36
],
+ options: [
12, "default", 18, 23, 28
],
},
toolbar: this.#getToolbar(),
ui: {
diff --git
a/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeSpan.class.php
b/wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeSpan.class.php
index d9865ae895f94a56567015d98a3ff9e87ed9611f..8841acef44127bf2c8734be4ac9661b28c87764a 100644
(file)
--- a/
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeSpan.class.php
+++ b/
wcfsetup/install/files/lib/system/html/input/node/HtmlInputNodeSpan.class.php
@@
-46,7
+46,7
@@
class HtmlInputNodeSpan extends AbstractHtmlInputNode
$min = 8;
$max = 36;
} else {
- $min = 1
1
;
+ $min = 1
2
;
$max = 48;
}