Changeset 42191 for trunk

Timestamp:

11/15/2017 06:58:26 PM (8 years ago)

Author:

westonruter

Message:

Editor: Disable wp_keep_scroll_position in IE11 since buggy; fix matches polyfill conflict with ME.js by doing runtime feature detection in context window.

Props westonruter, SergeyBiryukov, Clorith for testing.
See #41962, #42029.
Fixes #42553 for trunk.

Location:

trunk/src

Files:

• wp-admin/edit-form-advanced.php (modified) (1 diff)
• wp-includes/js/tinymce/tinymce.js (modified) (2 diffs)
• wp-includes/version.php (modified) (1 diff)

trunk/src/wp-admin/edit-form-advanced.php

@@ -640 +640 @@
         'wp_autoresize_on' => $_wp_editor_expand,
         'add_unload_trigger' => false,
-        'wp_keep_scroll_position' => true,
+        'wp_keep_scroll_position' => ! $is_IE,
     ),
 ) ); ?>

trunk/src/wp-includes/js/tinymce/tinymce.js

@@ -16387 +16387 @@
 
   function (Arr, Option, Element, NodeTypes, Error, document) {
-    /*
-     * There's a lot of code here; the aim is to allow the browser to optimise constant comparisons,
-     * instead of doing object lookup feature detection on every call
-     */
-    var STANDARD = 0;
-    var MSSTANDARD = 1;
-    var WEBKITSTANDARD = 2;
-    var FIREFOXSTANDARD = 3;
-
-    var selectorType = (function () {
-      var test = document.createElement('span');
-      // As of Chrome 34 / Safari 7.1 / FireFox 34, everyone except IE has the unprefixed function.
-      // Still check for the others, but do it last.
-      return test.matches !== undefined ? STANDARD :
-             test.msMatchesSelector !== undefined ? MSSTANDARD :
-             test.webkitMatchesSelector !== undefined ? WEBKITSTANDARD :
-             test.mozMatchesSelector !== undefined ? FIREFOXSTANDARD :
-             -1;
-    })();
-
-
     var ELEMENT = NodeTypes.ELEMENT;
     var DOCUMENT = NodeTypes.DOCUMENT;
@@ -16417 +16396 @@
       // As of Chrome 34 / Safari 7.1 / FireFox 34, everyone except IE has the unprefixed function.
       // Still check for the others, but do it last.
-      else if (selectorType === STANDARD) return elem.matches(selector);
-      else if (selectorType === MSSTANDARD) return elem.msMatchesSelector(selector);
-      else if (selectorType === WEBKITSTANDARD) return elem.webkitMatchesSelector(selector);
-      else if (selectorType === FIREFOXSTANDARD) return elem.mozMatchesSelector(selector);
+      else if (elem.matches !== undefined) return elem.matches(selector);
+      else if (elem.msMatchesSelector !== undefined) return elem.msMatchesSelector(selector);
+      else if (elem.webkitMatchesSelector !== undefined) return elem.webkitMatchesSelector(selector);
+      else if (elem.mozMatchesSelector !== undefined) return elem.mozMatchesSelector(selector);
       else throw new Error('Browser lacks native selectors'); // unfortunately we can't throw this on startup :(
     };

trunk/src/wp-includes/version.php

@@ -19 +19 @@
  * @global string $tinymce_version
  */
-$tinymce_version = '4607-20170918';
+$tinymce_version = '4607-20171115';
 
 /**