From 0b18941e33a8bc63f3ca2418e452b2e11bb9be55 Mon Sep 17 00:00:00 2001 From: Markus Mattes Date: Thu, 1 Oct 2015 21:48:53 +0200 Subject: [PATCH] [IMP] web_editor: rename range variable rng to r Put all rng to r to have the same concept in the whole file as well as in the summernote codebase. closes #8845 --- addons/web_editor/static/src/js/summernote.js | 58 +++++++++---------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/addons/web_editor/static/src/js/summernote.js b/addons/web_editor/static/src/js/summernote.js index eda0e33cf5f..e2bf1acdf45 100644 --- a/addons/web_editor/static/src/js/summernote.js +++ b/addons/web_editor/static/src/js/summernote.js @@ -996,12 +996,12 @@ options.keyMap.mac['ESCAPE'] = 'cancel'; $.summernote.pluginEvents.insertTable = function (event, editor, layoutInfo, sDim) { var $editable = layoutInfo.editable(); var dimension = sDim.split('x'); - var rng = range.create(); - rng = rng.deleteContents(); + var r = range.create(); + r = r.deleteContents(); var isBodyContainer = dom.isBodyContainer; dom.isBodyContainer = dom.isNotBreakable; - rng.insertNode(editor.table.createTable(dimension[0], dimension[1])); + r.insertNode(editor.table.createTable(dimension[0], dimension[1])); dom.isBodyContainer = isBodyContainer; editor.afterCommand($editable); @@ -1177,9 +1177,9 @@ $.summernote.pluginEvents.visible = function (event, editor, layoutInfo) { $editable.data('NoteHistory').recordUndo($editable, "visible"); var r = range.create(); - if (!r) return; + if (!r) return; - if (!r.isCollapsed()) { + if (!r.isCollapsed()) { r = r.deleteContents(true); r.select(); } @@ -1278,7 +1278,7 @@ $.summernote.pluginEvents.delete = function (event, editor, layoutInfo) { if (dom.isImg(node) || (!contentAfter && dom.isImg(dom.hasContentAfter(node)))) { var parent; var index; - var rng; + var r; if (!dom.isImg(node)) { node = dom.hasContentAfter(node); } @@ -1287,16 +1287,16 @@ $.summernote.pluginEvents.delete = function (event, editor, layoutInfo) { index = dom.position(node); if (index>0) { var next = node.previousSibling; - rng = range.create(next, next.textContent.length); + r = range.create(next, next.textContent.length); } else { - rng = range.create(parent, 0); + r = range.create(parent, 0); } if (!dom.hasContentAfter(node) && !dom.hasContentBefore(node)) { parent.appendChild($('
')[0]); } parent.removeChild(node); node = parent; - rng.select(); + r.select(); } } // empty tag @@ -1507,10 +1507,10 @@ $.summernote.pluginEvents.backspace = function (event, editor, layoutInfo) { } } - var rng = range.create(); - if (rng) { - $(dom.node(rng.sc)).trigger("click"); // trigger click to disable and reanable editor and image handler - dom.scrollIntoViewIfNeeded(rng.sc.parentNode.previousElementSibling || rng.sc); + var r = range.create(); + if (r) { + $(dom.node(r.sc)).trigger("click"); // trigger click to disable and reanable editor and image handler + dom.scrollIntoViewIfNeeded(r.sc.parentNode.previousElementSibling || r.sc); } event.preventDefault(); @@ -1529,8 +1529,8 @@ $.summernote.pluginEvents.insertUnorderedList = function (event, editor, layoutI $editable.data('NoteHistory').recordUndo($editable); var parent; - var rng = range.create(); - var node = rng.sc; + var r = range.create(); + var node = r.sc; while (node && node !== $editable[0]) { parent = node.parentNode; @@ -1543,7 +1543,7 @@ $.summernote.pluginEvents.insertUnorderedList = function (event, editor, layoutI ul.appendChild(node.firstChild); } parent.removeChild(node); - rng.select(); + r.select(); return; } else if (node.tagName === (sorted ? "OL" : "UL")) { @@ -1568,19 +1568,19 @@ $.summernote.pluginEvents.insertUnorderedList = function (event, editor, layoutI } parent.removeChild(node); - rng.select(); + r.select(); return; } node = parent; } - var p0 = rng.sc; + var p0 = r.sc; while (p0 && p0.parentNode && p0.parentNode !== $editable[0] && !isFormatNode(p0)) { p0 = p0.parentNode; } if (!p0) return; - var p1 = rng.ec; + var p1 = r.ec; while (p1 && p1.parentNode && p1.parentNode !== $editable[0] && !isFormatNode(p1)) { p1 = p1.parentNode; } @@ -1619,7 +1619,7 @@ $.summernote.pluginEvents.insertUnorderedList = function (event, editor, layoutI for (var i=0; i