[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
This commit is contained in:
Markus Mattes
2015-10-09 08:43:31 +02:00
committed by Nicolas Lempereur
parent ede596f2ec
commit 0b18941e33
+29 -29
View File
@@ -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($('<br/>')[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<brs.length; i++) {
parent.removeChild(brs[i]);
}
rng.clean().select();
r.clean().select();
event.preventDefault();
return false;
};
@@ -1895,21 +1895,21 @@ eventHandler.modules.editor.currentStyle = function(target) {
// with our changes for inline editor, the targeted element could be a button of the editor
if(!styleInfo.image || !dom.isEditable(styleInfo.image)) {
styleInfo.image = undefined;
var rng = range.create();
if(rng)
styleInfo.image = rng.isOnImg();
var r = range.create();
if(r)
styleInfo.image = r.isOnImg();
}
return styleInfo;
}
options.fontSizes = [_t('Default'), 8, 9, 10, 11, 12, 14, 18, 24, 36, 48, 62];
$.summernote.pluginEvents.applyFont = function (event, editor, layoutInfo, color, bgcolor, size) {
var rng = range.create();
if(!rng) return;
var startPoint = rng.getStartPoint();
var endPoint = rng.getEndPoint();
var r = range.create();
if(!r) return;
var startPoint = r.getStartPoint();
var endPoint = r.getEndPoint();
if (rng.isCollapsed() && !dom.isFont(rng.sc)) {
if (r.isCollapsed() && !dom.isFont(r.sc)) {
return {
sc: startPoint.node,
so: startPoint.offset,
@@ -1958,7 +1958,7 @@ $.summernote.pluginEvents.applyFont = function (event, editor, layoutInfo, color
nodes = list.unique(nodes);
// If ico fa
if (rng.isCollapsed()) {
if (r.isCollapsed()) {
nodes.push(startPoint.node);
}