Skip to content

Commit f4740a2

Browse files
author
Oliver Pulges
committed
Deleting in list outdenting row is unexpected. Using shift+tab instead.
1 parent d616332 commit f4740a2

File tree

1 file changed

+17
-19
lines changed

1 file changed

+17
-19
lines changed

src/views/composer.observe.js

Lines changed: 17 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -113,23 +113,17 @@
113113
element = composer.element;
114114

115115
if (selection.isCollapsed()) {
116-
if (selection.caretIsInTheBeginnig('li')) {
117-
// delete in the beginnig of LI will outdent not delete
116+
if (fixDeleteInTheBeginnigOfHeading(composer)) {
118117
event.preventDefault();
119-
composer.commands.exec('outdentList');
120-
} else {
121-
if (fixDeleteInTheBeginnigOfHeading(composer)) {
122-
event.preventDefault();
123-
return;
124-
}
125-
if (fixLastBrDeletionInTable(composer)) {
126-
event.preventDefault();
127-
return;
128-
}
129-
if (handleUneditableDeletion(composer)) {
130-
event.preventDefault();
131-
return;
132-
}
118+
return;
119+
}
120+
if (fixLastBrDeletionInTable(composer)) {
121+
event.preventDefault();
122+
return;
123+
}
124+
if (handleUneditableDeletion(composer)) {
125+
event.preventDefault();
126+
return;
133127
}
134128
} else {
135129
if (selection.containsUneditable()) {
@@ -139,11 +133,15 @@
139133
}
140134
};
141135

142-
var handleTabKeyDown = function(composer, element) {
136+
var handleTabKeyDown = function(composer, element, shiftKey) {
143137
if (!composer.selection.isCollapsed()) {
144138
composer.selection.deleteContents();
145139
} else if (composer.selection.caretIsInTheBeginnig('li')) {
146-
if (composer.commands.exec('indentList')) return;
140+
if (shiftKey) {
141+
if (composer.commands.exec('outdentList')) return;
142+
} else {
143+
if (composer.commands.exec('indentList')) return;
144+
}
147145
}
148146

149147
// Is   close enough to tab. Could not find enough counter arguments for now.
@@ -306,7 +304,7 @@
306304
if (this.config.handleTabKey && keyCode === wysihtml5.TAB_KEY) {
307305
// TAB key handling
308306
event.preventDefault();
309-
handleTabKeyDown(this, this.element);
307+
handleTabKeyDown(this, this.element, event.shiftKey);
310308
}
311309

312310
};

0 commit comments

Comments
 (0)