MAGETWO-69152: Removed workaround for old Webkit bug in the TinyMCE e…

…ditor for selec… #9540
magento · May 15, 2017 · a77cc1d · a77cc1d
2 parents 7201bc0 + 6550f87
commit a77cc1d
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 19 deletions.
diff --git a/lib/web/tiny_mce/classes/util/Quirks.js b/lib/web/tiny_mce/classes/util/Quirks.js
@@ -152,11 +152,8 @@
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);

diff --git a/lib/web/tiny_mce/tiny_mce.js b/lib/web/tiny_mce/tiny_mce.js
diff --git a/lib/web/tiny_mce/tiny_mce_jquery.js b/lib/web/tiny_mce/tiny_mce_jquery.js
diff --git a/lib/web/tiny_mce/tiny_mce_jquery_src.js b/lib/web/tiny_mce/tiny_mce_jquery_src.js
@@ -1441,11 +1441,8 @@ tinymce.create('static tinymce.util.XHR', {
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);

diff --git a/lib/web/tiny_mce/tiny_mce_prototype.js b/lib/web/tiny_mce/tiny_mce_prototype.js
diff --git a/lib/web/tiny_mce/tiny_mce_prototype_src.js b/lib/web/tiny_mce/tiny_mce_prototype_src.js
@@ -1193,11 +1193,8 @@ tinymce.create('static tinymce.util.XHR', {
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);

diff --git a/lib/web/tiny_mce/tiny_mce_src.js b/lib/web/tiny_mce/tiny_mce_src.js
@@ -1166,11 +1166,8 @@ tinymce.create('static tinymce.util.XHR', {
 		ed.onClick.add(function(ed, e) {
 			e = e.target;
 
-			// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
-			// WebKit can't even do simple things like selecting an image
-			// Needs tobe the setBaseAndExtend or it will fail to select floated images
 			if (/^(IMG|HR)$/.test(e.nodeName))
-				ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
+				ed.selection.select(e);
 
 			if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
 				ed.selection.select(e);