Skip to content

Commit 3a2ecde

Browse files
committed
Just use insertHTML for all browsers for link breaks
1 parent 997e506 commit 3a2ecde

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

vendor/assets/javascripts/bootstrap-wysihtml5/wysihtml5.js

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -5867,12 +5867,11 @@ wysihtml5.quirks.cleanPastedHTML = (function() {
58675867

58685868
if (keyCode === wysihtml5.ENTER_KEY && !wysihtml5.browser.insertsLineBreaksOnReturn()) {
58695869
composer.commands.exec("insertLineBreak");
5870-
event.preventDefault();
58715870
}
5871+
5872+
// keypress doesn't fire when you hit backspace
5873+
dom.observe(composer.element.ownerDocument, "keydown", keyDown);
58725874
}
5873-
5874-
// keypress doesn't fire when you hit backspace
5875-
dom.observe(composer.element.ownerDocument, "keydown", keyDown);
58765875
};
58775876
})(wysihtml5);/**
58785877
* Force rerendering of a given element
@@ -7472,14 +7471,7 @@ wysihtml5.Commands = Base.extend(
74727471

74737472
wysihtml5.commands.insertLineBreak = {
74747473
exec: function(composer, command) {
7475-
if (composer.commands.support(command)) {
7476-
composer.doc.execCommand(command, false, null);
7477-
if (!wysihtml5.browser.autoScrollsToCaret()) {
7478-
composer.selection.scrollIntoView();
7479-
}
7480-
} else {
7481-
composer.commands.exec("insertHTML", LINE_BREAK);
7482-
}
7474+
composer.commands.exec("insertHTML", LINE_BREAK);
74837475
},
74847476

74857477
state: function() {

0 commit comments

Comments
 (0)