feature(browser): upgrading to platform.js 1.3.3

rodneyrehm · rodneyrehm · commit f32430a4b797 · 2016-11-11T19:00:33.000+01:00
properly distinguishing between IE9-11 and Edge12+
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # ally.js change log
 
+## master
+
+* Updated to platform.js [1.3.3](https://github.com/bestiejs/platform.js/wiki/Changelog#133)
+* Separated Edge 12+ from IE9-11 (Trident)
+
+
 ## 1.3.0 - Return Of The Focus
 
 *September 17th 2016*. We're continuing our journey to *make accessibility simpler*. Version 1.3.0 comes 6 months after the last feature release. We pushed [about 90 commits](https://github.com/medialize/ally.js/compare/1.1.0...1.3.0) in an effort to reduce the bundle's file size, improve startup performance, convert test suites to BDD and add DOM focus utilities.
diff --git a/package.json b/package.json
@@ -145,6 +145,6 @@
   "dependencies": {
     "array.prototype.findindex": "^1.0.0",
     "css.escape": "^1.5.0",
-    "platform": "^1.3.1"
+    "platform": "1.3.3"
   }
 }
diff --git a/src/is/only-tabbable.js b/src/is/only-tabbable.js
@@ -23,7 +23,7 @@ function isOnlyTabbableRules({
     return false;
   }
 
-  if (!except.onlyFocusableBrowsingContext && (platform.is.GECKO || platform.is.TRIDENT)) {
+  if (!except.onlyFocusableBrowsingContext && (platform.is.GECKO || platform.is.TRIDENT || platform.is.EDGE)) {
     const frameElement = getFrameElement(element);
     if (frameElement) {
       if (tabindexValue(frameElement) < 0) {
@@ -42,7 +42,7 @@ function isOnlyTabbableRules({
     return tabindex !== null && tabindex >= 0;
   }
 
-  if (nodeName === 'svg' && platform.is.TRIDENT) {
+  if (nodeName === 'svg' && (platform.is.TRIDENT || platform.is.EDGE)) {
     return element.getAttribute('focusable') !== 'false';
   }
 
@@ -53,11 +53,11 @@ function isOnlyTabbableRules({
       if (platform.is.GECKO) {
         return true;
       }
-      if (platform.is.TRIDENT) {
+      if (platform.is.TRIDENT || platform.is.EDGE) {
         return element.getAttribute('focusable') !== 'false';
       }
     }
-    if (platform.is.TRIDENT) {
+    if (platform.is.TRIDENT || platform.is.EDGE) {
       return element.getAttribute('focusable') === 'true';
     }
   }
diff --git a/src/is/tabbable.js b/src/is/tabbable.js
@@ -101,8 +101,8 @@ function isTabbableRules({
 
   if (nodeName === 'video') {
     if (!element.hasAttribute('controls')) {
-      if (platform.is.TRIDENT) {
-        // In Internet Explorer the <video> element is focusable, but not tabbable, and tabIndex property is wrong
+      if (platform.is.TRIDENT || platform.is.EDGE) {
+        // In Internet Explorer and Edge the <video> element is focusable, but not tabbable, and tabIndex property is wrong
         return false;
       }
     } else if (platform.is.BLINK || platform.is.GECKO) {
@@ -153,8 +153,8 @@ function isTabbableRules({
     }
   }
 
-  if (platform.is.TRIDENT) {
-    // IE degrades <area> to script focusable, if the image
+  if (platform.is.TRIDENT || platform.is.EDGE) {
+    // IE and Edge degrade <area> to script focusable, if the image
     // using the <map> has been given tabindex="-1"
     if (nodeName === 'area') {
       const img = getImageOfArea(element);
diff --git a/src/supports/focus-object-swf.js b/src/supports/focus-object-swf.js
@@ -2,7 +2,7 @@
 import platform from '../util/platform';
 
 // Every Environment except IE9 considers SWF objects focusable
-const result = !platform.is.TRIDENT || !platform.is.IE9;
+const result = !platform.is.IE9;
 
 export default function() {
   return result;
diff --git a/src/supports/focus-svg-focusable-attribute.js b/src/supports/focus-svg-focusable-attribute.js
@@ -10,7 +10,7 @@ export default {
   },
   validate: function(element, _document) {
     const focus = element.querySelector('text');
-    if (platform.is.TRIDENT) {
+    if (platform.is.TRIDENT || platform.is.EDGE) {
       // Edge 13 does not allow polyfilling the missing SVGElement.prototype.focus anymore
       return true;
     }
diff --git a/src/supports/focus-svg.js b/src/supports/focus-svg.js
@@ -9,7 +9,7 @@ export default {
   },
   validate: function(element, _document) {
     const focus = element.firstChild;
-    if (platform.is.TRIDENT) {
+    if (platform.is.TRIDENT || platform.is.EDGE) {
       // Edge 13 does not allow polyfilling the missing SVGElement.prototype.focus anymore
       return true;
     }
diff --git a/src/supports/tabsequence-area-at-img-position.js b/src/supports/tabsequence-area-at-img-position.js
@@ -2,7 +2,7 @@
 import platform from '../util/platform';
 
 // https://jsbin.com/vafaba/3/edit?html,js,console,output
-const result = platform.is.GECKO || platform.is.TRIDENT;
+const result = platform.is.GECKO || platform.is.TRIDENT || platform.is.EDGE;
 
 export default function() {
   return result;
diff --git a/src/util/platform.js b/src/util/platform.js
@@ -20,6 +20,7 @@ const IOS = os === 'iOS';
 const BLINK = platform.layout === 'Blink';
 const GECKO = platform.layout === 'Gecko';
 const TRIDENT = platform.layout === 'Trident';
+const EDGE = platform.layout === 'EdgeHTML';
 const WEBKIT = platform.layout === 'WebKit';
 
 // browser version (not layout engine version!)
@@ -36,7 +37,8 @@ platform.is = {
   // layout
   BLINK, // "Chrome", "Chrome Mobile", "Opera"
   GECKO, // "Firefox"
-  TRIDENT, // "Internet Explorer", ("Edge")
+  TRIDENT, // "Internet Explorer"
+  EDGE, // "Microsoft Edge"
   WEBKIT, // "Safari"
   // INTERNET EXPLORERS
   IE9: TRIDENT && majorVersion === 9,
diff --git a/test/functional/maintain.tab-focus.test.js b/test/functional/maintain.tab-focus.test.js
@@ -2,7 +2,6 @@ define(function(require) {
   'use strict';
 
   var bdd = require('intern!bdd');
-  var pollUntil = require('intern/dojo/node!leadfoot/helpers/pollUntil');
   require('../helper/leadfoot-commands');
 
   bdd.describe('maintain/tab-focus', function() {
@@ -19,9 +18,6 @@ define(function(require) {
         .skipPlatform(this, function(platform) {
           return platform.is.IE10;
         }, 'This Test will not run on BrowserStack in IE10')
-
-        // wait until we're really initialized
-        .then(pollUntil('return window.platform'));
     });
 
     bdd.it('should wrap tab to next element', function() {
diff --git a/test/functional/observe.interaction-type.test.js b/test/functional/observe.interaction-type.test.js
@@ -3,7 +3,6 @@ define(function(require) {
 
   var bdd = require('intern!bdd');
   var expect = require('intern/chai!expect');
-  var pollUntil = require('intern/dojo/node!leadfoot/helpers/pollUntil');
   var makeCustomCommand = require('../helper/leadfoot-commands');
 
   var InteractionTypeCommand = makeCustomCommand({
@@ -24,7 +23,7 @@ define(function(require) {
         .setTimeouts(timeout)
         .get(require.toUrl('test/pages/observe.interaction-type.test.html'))
         // wait until we're really initialized
-        .then(pollUntil('return window.platform'));
+        .getPlatform();
     });
 
     bdd.it('should identify pointer input', function() {
diff --git a/test/functional/prepare.js b/test/functional/prepare.js
@@ -15,7 +15,7 @@ define(function(require) {
         .setFindTimeout(timeout)
         .setExecuteAsyncTimeout(timeout)
         // wait until we're really initialized
-        .then(pollUntil('return window.platform'));
+        .then(pollUntil('return window._platform'));
     });
 
     bdd.it('should understand "shiftFocusOnTab"', function() {
diff --git a/test/functional/style.focus-within.test.js b/test/functional/style.focus-within.test.js
@@ -3,7 +3,6 @@ define(function(require) {
 
   var bdd = require('intern!bdd');
   var expect = require('intern/chai!expect');
-  var pollUntil = require('intern/dojo/node!leadfoot/helpers/pollUntil');
   var makeCustomCommand = require('../helper/leadfoot-commands');
 
   var FocusWithinCommand = makeCustomCommand({
@@ -41,7 +40,7 @@ define(function(require) {
 
         .get(require.toUrl('test/pages/style.focus-within.test.html'))
         // wait until we're really initialized
-        .then(pollUntil('return window.platform'));
+        .getPlatform();
     });
 
     bdd.it('should follow into inline SVG', function() {
diff --git a/test/helper/browser-focusable-data.js b/test/helper/browser-focusable-data.js
@@ -3,8 +3,8 @@ define([
   'intern/dojo/text!../../tests/focusable/data/chrome-stable.json',
   'intern/dojo/text!../../tests/focusable/data/firefox-nightly.json',
   'intern/dojo/text!../../tests/focusable/data/firefox-stable.json',
-  'intern/dojo/text!../../tests/focusable/data/ie-13.json',
-  'intern/dojo/text!../../tests/focusable/data/ie-12.json',
+  'intern/dojo/text!../../tests/focusable/data/edge-13.json',
+  'intern/dojo/text!../../tests/focusable/data/edge-12.json',
   'intern/dojo/text!../../tests/focusable/data/ie-11.json',
   'intern/dojo/text!../../tests/focusable/data/ie-10.json',
   'intern/dojo/text!../../tests/focusable/data/ie-9.json',
diff --git a/test/helper/leadfoot-commands.js b/test/helper/leadfoot-commands.js
@@ -92,7 +92,7 @@ define(function(require) {
   Command.prototype.skipPlatform = function(test, callback, message) {
     return new this.constructor(this, function () {
       return this.parent
-        .then(pollUntil('return window.platform'))
+        .getPlatform()
         .then(function(platform) {
           if (callback(platform)) {
             test.skip(message);
@@ -101,6 +101,13 @@ define(function(require) {
     });
   };
 
+  Command.prototype.getPlatform = function() {
+    return new this.constructor(this, function () {
+      return this.parent
+        .then(pollUntil('return window._platform'));
+    });
+  };
+
   Command.prototype.useCommand = function(CustomCommand) {
     return new CustomCommand(this, function () {});
   };
diff --git a/test/pages/element.disabled.test.html b/test/pages/element.disabled.test.html
@@ -61,7 +61,7 @@ <h1>Element Disabled</h1>
       'ally/query/focusable',
       'ally/element/disabled',
     ], function(platform, queryFocusable, elementDisabled) {
-      window.platform = platform;
+      window._platform = platform;
 
       window.disableElements = function() {
         queryFocusable({
diff --git a/test/pages/fix.pointer-focus-children.test.html b/test/pages/fix.pointer-focus-children.test.html
@@ -120,7 +120,7 @@ <h2>Flexed Redirect</h2>
       'ally/util/platform',
       'ally/fix/pointer-focus-children',
     ], function(platform, fixPointerFocusChildren) {
-      window.platform = platform;
+      window._platform = platform;
 
       fixPointerFocusChildren({
         context: '#engage-fix',
diff --git a/test/pages/fix.pointer-focus-input.test.html b/test/pages/fix.pointer-focus-input.test.html
@@ -111,7 +111,7 @@ <h2>Non-Focusable</h2>
       'ally/util/platform',
       'ally/fix/pointer-focus-input',
     ], function(platform, fixPointerFocusInput) {
-      window.platform = platform;
+      window._platform = platform;
 
       fixPointerFocusInput({
         context: '#engage-fix',
diff --git a/test/pages/fix.pointer-focus-parent.test.html b/test/pages/fix.pointer-focus-parent.test.html
@@ -57,7 +57,7 @@ <h2>Link</h2>
       'ally/util/platform',
       'ally/fix/pointer-focus-parent',
     ], function(platform, fixPointerFocusParent) {
-      window.platform = platform;
+      window._platform = platform;
 
       fixPointerFocusParent({
         context: '#engage-fix',
diff --git a/test/pages/intern.events.test.html b/test/pages/intern.events.test.html
@@ -26,7 +26,7 @@
     require([
       'ally/util/platform',
     ], function(platform) {
-      window.platform = platform;
+      window._platform = platform;
     });
   </script>
 
diff --git a/test/pages/maintain.tab-focus.test.html b/test/pages/maintain.tab-focus.test.html
@@ -40,7 +40,7 @@ <h1>Maintain Tab Focus</h1>
       'ally/util/platform',
       'ally/maintain/tab-focus',
     ], function(platform, maintainTabFocus) {
-      window.platform = platform;
+      window._platform = platform;
 
       maintainTabFocus({
         context: '#container',
diff --git a/test/pages/observe.interaction-type.test.html b/test/pages/observe.interaction-type.test.html
@@ -23,7 +23,7 @@ <h1>Observe Interaction Type</h1>
       'ally/util/platform',
       'ally/observe/interaction-type',
     ], function(platform, observeInteractionType) {
-      window.platform = platform;
+      window._platform = platform;
       window.handle = observeInteractionType();
     });
   </script>
diff --git a/test/pages/style.focus-within.test.html b/test/pages/style.focus-within.test.html
@@ -43,7 +43,7 @@ <h1>Style focus-within</h1>
       'ally/util/platform',
       'ally/style/focus-within',
     ], function(platform, styleFocusWithin) {
-      window.platform = platform;
+      window._platform = platform;
 
       styleFocusWithin();
     });
diff --git a/test/unit/core.browser-compatibility.test.js b/test/unit/core.browser-compatibility.test.js
@@ -80,7 +80,7 @@ define(function(require) {
       }
     }
 
-    if (data.platform.layout === 'Trident') {
+    if (data.platform.layout === 'Trident' || data.platform.layout === 'EdgeHTML') {
       // IE and Edge do not forward focus upon script-focus, but does on pointer-focus,
       // we'll act as if script-focus worked just like pointer-focus
       data.elements['label:has(input)'].scriptFocus.redirected = 'label:has(input) input';
diff --git a/test/unit/element.blur.test.js b/test/unit/element.blur.test.js
@@ -62,7 +62,7 @@ define(function(require) {
       });
 
       var result = elementBlur(element);
-      var canFocusSvg = supports.svgFocusMethod || platform.is.TRIDENT && platform.majorVersion < 13;
+      var canFocusSvg = supports.svgFocusMethod || platform.is.TRIDENT || platform.is.EDGE && platform.majorVersion < 13;
       expect(result).to.equal(canFocusSvg ? document.body : null);
     });
 
diff --git a/test/unit/element.focus.test.js b/test/unit/element.focus.test.js
@@ -79,7 +79,7 @@ define(function(require) {
     });
 
     bdd.describe('for SVG elements', function() {
-      var canFocusSvg = supports.svgFocusMethod || platform.is.TRIDENT && platform.majorVersion < 13;
+      var canFocusSvg = supports.svgFocusMethod || platform.is.TRIDENT || platform.is.EDGE && platform.majorVersion < 13;
 
       bdd.it('should focus SVG links', function() {
         var element = document.getElementById('svg-link');
@@ -95,7 +95,7 @@ define(function(require) {
           defaultToAncestor: true,
         });
 
-        var canFocusSvg = supports.svgFocusMethod || platform.is.TRIDENT && platform.majorVersion < 13;
+        var canFocusSvg = supports.svgFocusMethod || platform.is.TRIDENT || platform.is.EDGE && platform.majorVersion < 13;
         expect(result).to.equal(canFocusSvg ? target : null);
       });
     });
diff --git a/test/unit/is.only-tabbable.test.js b/test/unit/is.only-tabbable.test.js
@@ -213,18 +213,21 @@ define(function(require) {
     bdd.describe('for SVG', function() {
       bdd.it('should return {browser-specific} for <svg>', function() {
         var element = document.getElementById('svg');
-        expect(isOnlyTabbable(element)).to.equal(platform.is.TRIDENT);
+        var expected = platform.is.TRIDENT || platform.is.EDGE;
+        expect(isOnlyTabbable(element)).to.equal(expected);
       });
 
       bdd.it('should return {browser-specific} for <svg tabindex="-1">', function() {
         var element = document.getElementById('svg');
         element.setAttribute('tabindex', '-1');
-        expect(isOnlyTabbable(element)).to.equal(platform.is.TRIDENT);
+        var expected = platform.is.TRIDENT || platform.is.EDGE;
+        expect(isOnlyTabbable(element)).to.equal(expected);
       });
 
       bdd.it('should return {browser-specific} for <a xlink:href="…">', function() {
         var element = document.getElementById('svg-link');
-        expect(isOnlyTabbable(element)).to.equal(platform.is.TRIDENT || platform.is.GECKO);
+        var expected = platform.is.TRIDENT || platform.is.EDGE || platform.is.GECKO;
+        expect(isOnlyTabbable(element)).to.equal(expected);
       });
 
       bdd.it('should return false for <text>', function() {
diff --git a/test/unit/query.focusable.all.test.js b/test/unit/query.focusable.all.test.js
@@ -74,7 +74,7 @@ define(function(require) {
         '#image-map-area-nolink',
         supports.focusRedirectImgUsemap && '#img-usemap',
         supports.focusObjectSvg && '#object-svg',
-        platform.is.TRIDENT && '#svg',
+        (platform.is.TRIDENT || platform.is.EDGE) && '#svg',
         supports.focusObjectSvg && '#object-tabindex-svg',
         '#svg-link',
         !supports.AVOID_QUICKTIME && '#embed',
diff --git a/test/unit/query.focusable.strict.test.js b/test/unit/query.focusable.strict.test.js
@@ -56,7 +56,7 @@ define(function(require) {
           supports.focusAreaWithoutHref && '#image-map-area-nolink',
           supports.focusObjectSvg && '#object-svg',
           supports.focusObjectSvg && '#object-tabindex-svg',
-          platform.is.TRIDENT && '#svg',
+          (platform.is.TRIDENT || platform.is.EDGE) && '#svg',
           '#svg-link',
           supports.focusAudioWithoutControls && '#audio',
           '#audio-controls',
diff --git a/tests/focusable/data/edge-12.json b/tests/focusable/data/edge-12.json
@@ -1,7 +1,7 @@
 {
   "platform": {
-    "description": "Microsoft Edge 12.10240 on Windows NT 10.0 64-bit",
-    "layout": "Trident",
+    "description": "Microsoft Edge 12.10240 on Windows 10 64-bit",
+    "layout": "EdgeHTML",
     "manufacturer": null,
     "name": "Microsoft Edge",
     "prerelease": null,
@@ -10,8 +10,8 @@
     "version": "12.10240",
     "os": {
       "architecture": 64,
-      "family": "Windows NT",
-      "version": "10.0"
+      "family": "Windows",
+      "version": "10"
     }
   },
   "elements": {
diff --git a/tests/focusable/data/edge-13.json b/tests/focusable/data/edge-13.json
diff --git a/tests/focusable/data/ie-11.json b/tests/focusable/data/ie-11.json

Original file line number	Diff line number	Diff line change
`@@ -145,6 +145,6 @@`
`145`	`145`	`"dependencies": {`
`146`	`146`	`"array.prototype.findindex": "^1.0.0",`
`147`	`147`	`"css.escape": "^1.5.0",`
`148`		`- "platform": "^1.3.1"`
	`148`	`+ "platform": "1.3.3"`
`149`	`149`	`}`
`150`	`150`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ function isOnlyTabbableRules({`
`23`	`23`	`return false;`
`24`	`24`	`}`
`25`	`25`
`26`		`- if (!except.onlyFocusableBrowsingContext && (platform.is.GECKO \|\| platform.is.TRIDENT)) {`
	`26`	`+ if (!except.onlyFocusableBrowsingContext && (platform.is.GECKO \|\| platform.is.TRIDENT \|\| platform.is.EDGE)) {`
`27`	`27`	`const frameElement = getFrameElement(element);`
`28`	`28`	`if (frameElement) {`
`29`	`29`	`if (tabindexValue(frameElement) < 0) {`
`@@ -42,7 +42,7 @@ function isOnlyTabbableRules({`
`42`	`42`	`return tabindex !== null && tabindex >= 0;`
`43`	`43`	`}`
`44`	`44`
`45`		`- if (nodeName === 'svg' && platform.is.TRIDENT) {`
	`45`	`+ if (nodeName === 'svg' && (platform.is.TRIDENT \|\| platform.is.EDGE)) {`
`46`	`46`	`return element.getAttribute('focusable') !== 'false';`
`47`	`47`	`}`
`48`	`48`
`@@ -53,11 +53,11 @@ function isOnlyTabbableRules({`
`53`	`53`	`if (platform.is.GECKO) {`
`54`	`54`	`return true;`
`55`	`55`	`}`
`56`		`- if (platform.is.TRIDENT) {`
	`56`	`+ if (platform.is.TRIDENT \|\| platform.is.EDGE) {`
`57`	`57`	`return element.getAttribute('focusable') !== 'false';`
`58`	`58`	`}`
`59`	`59`	`}`
`60`		`- if (platform.is.TRIDENT) {`
	`60`	`+ if (platform.is.TRIDENT \|\| platform.is.EDGE) {`
`61`	`61`	`return element.getAttribute('focusable') === 'true';`
`62`	`62`	`}`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -101,8 +101,8 @@ function isTabbableRules({`
`101`	`101`
`102`	`102`	`if (nodeName === 'video') {`
`103`	`103`	`if (!element.hasAttribute('controls')) {`
`104`		`- if (platform.is.TRIDENT) {`
`105`		`- // In Internet Explorer the <video> element is focusable, but not tabbable, and tabIndex property is wrong`
	`104`	`+ if (platform.is.TRIDENT \|\| platform.is.EDGE) {`
	`105`	`+ // In Internet Explorer and Edge the <video> element is focusable, but not tabbable, and tabIndex property is wrong`
`106`	`106`	`return false;`
`107`	`107`	`}`
`108`	`108`	`} else if (platform.is.BLINK \|\| platform.is.GECKO) {`
`@@ -153,8 +153,8 @@ function isTabbableRules({`
`153`	`153`	`}`
`154`	`154`	`}`
`155`	`155`
`156`		`- if (platform.is.TRIDENT) {`
`157`		`- // IE degrades <area> to script focusable, if the image`
	`156`	`+ if (platform.is.TRIDENT \|\| platform.is.EDGE) {`
	`157`	`+ // IE and Edge degrade <area> to script focusable, if the image`
`158`	`158`	`// using the <map> has been given tabindex="-1"`
`159`	`159`	`if (nodeName === 'area') {`
`160`	`160`	`const img = getImageOfArea(element);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ export default {`
`10`	`10`	`},`
`11`	`11`	`validate: function(element, _document) {`
`12`	`12`	`const focus = element.querySelector('text');`
`13`		`- if (platform.is.TRIDENT) {`
	`13`	`+ if (platform.is.TRIDENT \|\| platform.is.EDGE) {`
`14`	`14`	`// Edge 13 does not allow polyfilling the missing SVGElement.prototype.focus anymore`
`15`	`15`	`return true;`
`16`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ export default {`
`9`	`9`	`},`
`10`	`10`	`validate: function(element, _document) {`
`11`	`11`	`const focus = element.firstChild;`
`12`		`- if (platform.is.TRIDENT) {`
	`12`	`+ if (platform.is.TRIDENT \|\| platform.is.EDGE) {`
`13`	`13`	`// Edge 13 does not allow polyfilling the missing SVGElement.prototype.focus anymore`
`14`	`14`	`return true;`
`15`	`15`	`}`