Skip to content

Commit be83f5b

Browse files
ishakhsuvarovishakhsuvarov
authored
MAGETWO-69234: Backport of MAGETWO-69152: Removed workaround for old Webkit bug in t… #9655 
2 parents 9dc4c95 + 8677d51 commit be83f5b

File tree

7 files changed

+7
-19
lines changed

7 files changed

+7
-19
lines changed

Diff for: ‎lib/web/tiny_mce/classes/util/Quirks.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -152,11 +152,8 @@
152152
ed.onClick.add(function(ed, e) {
153153
e = e.target;
154154

155-
// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
156-
// WebKit can't even do simple things like selecting an image
157-
// Needs tobe the setBaseAndExtend or it will fail to select floated images
158155
if (/^(IMG|HR)$/.test(e.nodeName))
159-
ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
156+
ed.selection.select(e);
160157

161158
if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
162159
ed.selection.select(e);

Diff for: ‎lib/web/tiny_mce/tiny_mce.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎lib/web/tiny_mce/tiny_mce_jquery.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎lib/web/tiny_mce/tiny_mce_jquery_src.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1441,11 +1441,8 @@ tinymce.create('static tinymce.util.XHR', {
14411441
ed.onClick.add(function(ed, e) {
14421442
e = e.target;
14431443

1444-
// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
1445-
// WebKit can't even do simple things like selecting an image
1446-
// Needs tobe the setBaseAndExtend or it will fail to select floated images
14471444
if (/^(IMG|HR)$/.test(e.nodeName))
1448-
ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
1445+
ed.selection.select(e);
14491446

14501447
if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
14511448
ed.selection.select(e);

Diff for: ‎lib/web/tiny_mce/tiny_mce_prototype.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎lib/web/tiny_mce/tiny_mce_prototype_src.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1193,11 +1193,8 @@ tinymce.create('static tinymce.util.XHR', {
11931193
ed.onClick.add(function(ed, e) {
11941194
e = e.target;
11951195

1196-
// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
1197-
// WebKit can't even do simple things like selecting an image
1198-
// Needs tobe the setBaseAndExtend or it will fail to select floated images
11991196
if (/^(IMG|HR)$/.test(e.nodeName))
1200-
ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
1197+
ed.selection.select(e);
12011198

12021199
if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
12031200
ed.selection.select(e);

Diff for: ‎lib/web/tiny_mce/tiny_mce_src.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -1166,11 +1166,8 @@ tinymce.create('static tinymce.util.XHR', {
11661166
ed.onClick.add(function(ed, e) {
11671167
e = e.target;
11681168

1169-
// Workaround for bug, http://bugs.webkit.org/show_bug.cgi?id=12250
1170-
// WebKit can't even do simple things like selecting an image
1171-
// Needs tobe the setBaseAndExtend or it will fail to select floated images
11721169
if (/^(IMG|HR)$/.test(e.nodeName))
1173-
ed.selection.getSel().setBaseAndExtent(e, 0, e, 1);
1170+
ed.selection.select(e);
11741171

11751172
if (e.nodeName == 'A' && ed.dom.hasClass(e, 'mceItemAnchor'))
11761173
ed.selection.select(e);

0 commit comments

Comments
 (0)