Permalink
Browse files

Merge branch '2017.12' into 2018.09

  • Loading branch information...
mateuszbieniek committed Jan 8, 2019
2 parents e3256eb + a668857 commit f1eaaa1c6adb8911a8f570866cdbd02ca6cbeb4d
@@ -876,12 +876,11 @@

try {
s.removeAllRanges();
s.addRange(r);
} catch (ex) {
// IE9 might throw errors here don't know why
// IE might throw errors here if the editor is within a hidden container and selection is changed
}

s.addRange(r);


// Forward is set to false and we have an extend function
if (forward === false && s.extend) {
s.collapse(r.endContainer, r.endOffset);

Large diffs are not rendered by default.

Oops, something went wrong.

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -8831,12 +8831,11 @@ tinymce.dom.TreeWalker = function(start_node, root_node) {

try {
s.removeAllRanges();
s.addRange(r);
} catch (ex) {
// IE9 might throw errors here don't know why
// IE might throw errors here if the editor is within a hidden container and selection is changed
}

s.addRange(r);


// Forward is set to false and we have an extend function
if (forward === false && s.extend) {
s.collapse(r.endContainer, r.endOffset);

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -10077,12 +10077,11 @@ window.tinymce.dom.Sizzle = Sizzle;

try {
s.removeAllRanges();
s.addRange(r);
} catch (ex) {
// IE9 might throw errors here don't know why
// IE might throw errors here if the editor is within a hidden container and selection is changed
}

s.addRange(r);


// Forward is set to false and we have an extend function
if (forward === false && s.extend) {
s.collapse(r.endContainer, r.endOffset);
@@ -10050,12 +10050,11 @@ window.tinymce.dom.Sizzle = Sizzle;

try {
s.removeAllRanges();
s.addRange(r);
} catch (ex) {
// IE9 might throw errors here don't know why
// IE might throw errors here if the editor is within a hidden container and selection is changed
}

s.addRange(r);


// Forward is set to false and we have an extend function
if (forward === false && s.extend) {
s.collapse(r.endContainer, r.endOffset);

0 comments on commit f1eaaa1

Please sign in to comment.