diff --git a/CHANGELOG.md b/CHANGELOG.md index cbdb9fbec..ff5517d8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ CHANGELOG ## HEAD (Unreleased) * @typcn bumped grunt-sass to ^1.0.0 to support node 4.x ([view](https://github.com/videojs/video.js/pull/2645)) +* @gkatsev removed unhelpful isCrossOrigin test ([view](https://github.com/videojs/video.js/pull/2715)) -------------------- diff --git a/src/js/utils/url.js b/src/js/utils/url.js index 653f58157..6532c28fe 100644 --- a/src/js/utils/url.js +++ b/src/js/utils/url.js @@ -105,8 +105,8 @@ export const getFileExtension = function(path) { * @method isCrossOrigin */ export const isCrossOrigin = function(url) { - let urlInfo = parseUrl(url); let winLoc = window.location; + let urlInfo = parseUrl(url); // IE8 protocol relative urls will return ':' for protocol let srcProtocol = urlInfo.protocol === ':' ? winLoc.protocol : urlInfo.protocol; diff --git a/test/unit/utils/url.test.js b/test/unit/utils/url.test.js index 79d9ab7a7..4e2ed9aba 100644 --- a/test/unit/utils/url.test.js +++ b/test/unit/utils/url.test.js @@ -93,7 +93,6 @@ test('isCrossOrigin can identify cross origin urls', function() { win.location.protocol = 'https:'; win.location.host = 'google.com'; ok(Url.isCrossOrigin('http://google.com/example.vtt'), 'http://google.com from https://google.com is cross origin'); - ok(Url.isCrossOrigin('//google.com/example.vtt'), '//google.com from https://google.com is cross origin'); ok(Url.isCrossOrigin('http://example.com/example.vtt'), 'http://example.com from https://google.com is cross origin'); ok(Url.isCrossOrigin('https://example.com/example.vtt'), 'https://example.com from https://google.com is cross origin'); ok(Url.isCrossOrigin('//example.com/example.vtt'), '//example.com from https://google.com is cross origin');