pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web_editor: stop removing empty block after deleting its contents

Browse Source 
Deleting all the contents of a block node replaced it with a blank
paragraph node. To restore v12 behavior, it should only do that when
pressing backspace in an already empty block, which is now what it does.
This commit is contained in:
Antoine Guenet
2019-02-21 09:13:30 +00:00
parent 8b8d6d0a5b
commit 00a78af98e
1 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web_editor/static/src/js/wysiwyg/plugin/keyboard.js
+20 -10
View File
@@ -42,7 +42,6 @@ var KeyboardPlugin = AbstractPlugin.extend({
range = direction === 'prev' ? this._insertInvisibleCharAfterSingleBR(range) : range;
range = this._rerangeOutOfBR(range, direction);
range = this._cleanRangeAfterDeletion(range);
range = this._replaceEmptyParentWithEmptyP(range);
return range;
},
/**
@@ -219,8 +218,15 @@ var KeyboardPlugin = AbstractPlugin.extend({
* @returns {Boolean} true if case handled
*/
_handleDeletion: function (direction) {
var didDeleteNodes = this.context.invoke('HelperPlugin.deleteSelection')
var range = this.context.invoke('editor.createRange');
range = direction === 'prev' && this._replaceEmptyParentWithEmptyP(range);
if (range) {
range = this._afterDeletion(range, direction);
range.select();
return true;
}
var didDeleteNodes = this.context.invoke('HelperPlugin.deleteSelection');
range = this.context.invoke('editor.createRange');
var wasOnStartOfBR = direction === 'prev' && !range.so && range.sc.tagName === 'BR';
this._removeNextEmptyUnbreakable(range.sc);
@@ -837,23 +843,27 @@ var KeyboardPlugin = AbstractPlugin.extend({
*
* @private
* @param {Object} range
* @returns {Object} range
* @returns {Object|undefined} range
*/
_replaceEmptyParentWithEmptyP: function (range) {
if (range.sc === this.editable || range.sc.parentNode === this.editable) {
return range;
var node = range.sc.childElementCount === 1 && range.sc.firstChild.tagName === 'BR' ? range.sc.firstChild : range.sc;
if (node === this.editable || !node.parentNode || node.parentNode === this.editable) {
return;
}
var node = dom.isVoid(range.sc) && range.sc.parentNode ? range.sc.parentNode : range.sc;
var parentOnlyHasNode = node.parentNode && this.context.invoke('HelperPlugin.onlyContains', node.parentNode, node);
if (dom.isEmpty(node) && node.tagName !== 'LI' && parentOnlyHasNode) {
if (
dom.isEmpty(node) &&
this.context.invoke('HelperPlugin.onlyContains', node.parentNode, node) &&
['LI', 'P'].indexOf(node.parentNode.tagName) === -1
) {
var emptyP = this.document.createElement('p');
var br = this.document.createElement('br');
$(emptyP).append(br);
$(node).before(emptyP).remove();
$(node.parentNode).before(emptyP).remove();
range.sc = range.ec = br;
range.so = range.eo = 0;
return range.collapse(true);
}
return range;
return;
},
/**
* Replace all leading space from a text node with one non-breakable space.