Merge branch '2017.12' into 2018.09

ezpublishlegacy · Jan 8, 2019 · f1eaaa1 · f1eaaa1
2 parents e3256eb + a668857
commit f1eaaa1
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 19 deletions.
diff --git a/extension/ezoe/design/standard/javascript/classes/dom/Selection.js b/extension/ezoe/design/standard/javascript/classes/dom/Selection.js
@@ -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);

diff --git a/extension/ezoe/design/standard/javascript/tiny_mce.js b/extension/ezoe/design/standard/javascript/tiny_mce.js
diff --git a/extension/ezoe/design/standard/javascript/tiny_mce_jquery.js b/extension/ezoe/design/standard/javascript/tiny_mce_jquery.js
diff --git a/extension/ezoe/design/standard/javascript/tiny_mce_jquery_src.js b/extension/ezoe/design/standard/javascript/tiny_mce_jquery_src.js
@@ -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);

diff --git a/extension/ezoe/design/standard/javascript/tiny_mce_prototype.js b/extension/ezoe/design/standard/javascript/tiny_mce_prototype.js
diff --git a/extension/ezoe/design/standard/javascript/tiny_mce_prototype_src.js b/extension/ezoe/design/standard/javascript/tiny_mce_prototype_src.js
@@ -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);

diff --git a/extension/ezoe/design/standard/javascript/tiny_mce_src.js b/extension/ezoe/design/standard/javascript/tiny_mce_src.js
@@ -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);