Release 4.2.2

mediaelement · Jun 27, 2017 · 53f12c4 · 53f12c4
1 parent f892fa7
commit 53f12c4
Show file tree

Hide file tree

Showing 10 changed files with 17 additions and 15 deletions.
diff --git a/.versions b/.versions
@@ -1,5 +1,6 @@
-johndyer:mediaelement@4.2.1
+johndyer:mediaelement@4.2.2
+jquery@1.11.10
 meteor@1.6.1
-modules@0.8.2
-modules-runtime@0.7.10
+modules@0.9.0
+modules-runtime@0.8.0
 underscore@1.0.10
diff --git a/build/mediaelement-and-player.js b/build/mediaelement-and-player.js
@@ -636,7 +636,7 @@ var MediaElement = function MediaElement(idOrNode, options, sources) {
 	t.mediaElement.appendChild(t.mediaElement.originalNode);
 
 	var processURL = function processURL(url, type) {
-		if (_window2.default.location.protocol === 'https:' && url.indexOf('https:') === 0 && _constants.IS_IOS && _mejs2.default.html5media.mediaTypes.indexOf(type) > -1) {
+		if (_window2.default.location.protocol === 'https:' && url.indexOf('http:') === 0 && _constants.IS_IOS && _mejs2.default.html5media.mediaTypes.indexOf(type) > -1) {
 			var xhr = new XMLHttpRequest();
 			xhr.onreadystatechange = function () {
 				if (this.readyState === 4 && this.status === 200) {
@@ -1008,7 +1008,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var mejs = {};
 
-mejs.version = '4.2.1';
+mejs.version = '4.2.2';
 
 mejs.html5media = {
 	properties: ['volume', 'src', 'currentTime', 'muted', 'duration', 'paused', 'ended', 'buffered', 'error', 'networkState', 'readyState', 'seeking', 'seekable', 'currentSrc', 'preload', 'bufferedBytes', 'bufferedTime', 'initialTime', 'startOffsetTime', 'defaultPlaybackRate', 'playbackRate', 'played', 'autoplay', 'loop', 'controls'],

diff --git a/build/mediaelement-and-player.min.js b/build/mediaelement-and-player.min.js
diff --git a/build/mediaelement.js b/build/mediaelement.js
@@ -636,7 +636,7 @@ var MediaElement = function MediaElement(idOrNode, options, sources) {
 	t.mediaElement.appendChild(t.mediaElement.originalNode);
 
 	var processURL = function processURL(url, type) {
-		if (_window2.default.location.protocol === 'https:' && url.indexOf('https:') === 0 && _constants.IS_IOS && _mejs2.default.html5media.mediaTypes.indexOf(type) > -1) {
+		if (_window2.default.location.protocol === 'https:' && url.indexOf('http:') === 0 && _constants.IS_IOS && _mejs2.default.html5media.mediaTypes.indexOf(type) > -1) {
 			var xhr = new XMLHttpRequest();
 			xhr.onreadystatechange = function () {
 				if (this.readyState === 4 && this.status === 200) {
@@ -1008,7 +1008,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 var mejs = {};
 
-mejs.version = '4.2.1';
+mejs.version = '4.2.2';
 
 mejs.html5media = {
 	properties: ['volume', 'src', 'currentTime', 'muted', 'duration', 'paused', 'ended', 'buffered', 'error', 'networkState', 'readyState', 'seeking', 'seekable', 'currentSrc', 'preload', 'bufferedBytes', 'bufferedTime', 'initialTime', 'startOffsetTime', 'defaultPlaybackRate', 'playbackRate', 'played', 'autoplay', 'loop', 'controls'],

diff --git a/build/mediaelement.min.js b/build/mediaelement.min.js
diff --git a/changelog.md b/changelog.md
@@ -1,8 +1,9 @@
 ### Version History
 
-*4.2.1 (2017/06/28)*
+*4.2.1/4.2.2 (2017/06/28)*
 
 * Added conditional to avoid AJAX request on non-SSL media on iOS @rafa8626
+* Fixed error with .versions file @rafa8626
 
 *4.2.0 (2017/06/26)*
 

diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
     name: 'johndyer:mediaelement',
     summary: '*Official* MediaElement.js: <video> and <audio> made easy. One file. Any browser. Same UI.',
-    version: '4.2.1',
+    version: '4.2.2',
     git: 'https://github.com/mediaelement/mediaelement'
 });
 

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "mediaelement",
   "license": "MIT",
-  "version": "4.2.1",
+  "version": "4.2.2",
   "main": "full.js",
   "repository": {
     "type": "git",

diff --git a/src/js/core/mediaelement.js b/src/js/core/mediaelement.js
@@ -93,12 +93,12 @@ class MediaElement {
 		t.mediaElement.appendChild(t.mediaElement.originalNode);
 
 		/**
-		 * Convert a URL to BLOB to avoid issues with regular media types playing under a HTTPS website
+		 * Convert a non-SSL URL to BLOB to avoid issues with regular media types playing under a SSL website
 		 * @see https://poodll.com/ios-10-and-html5-video-and-html5-audio-on-https-sites/
 		 * @private
 		 */
 		const processURL = (url, type) => {
-			if (window.location.protocol === 'https:' && url.indexOf('https:') === 0 && IS_IOS && mejs.html5media.mediaTypes.indexOf(type) > -1) {
+			if (window.location.protocol === 'https:' && url.indexOf('http:') === 0 && IS_IOS && mejs.html5media.mediaTypes.indexOf(type) > -1) {
 				const xhr = new XMLHttpRequest();
 				xhr.onreadystatechange = function () {
 					if (this.readyState === 4 && this.status === 200) {

diff --git a/src/js/core/mejs.js b/src/js/core/mejs.js
@@ -6,7 +6,7 @@ import window from 'global/window';
 const mejs = {};
 
 // version number
-mejs.version = '4.2.1';
+mejs.version = '4.2.2';
 
 // Basic HTML5 settings
 mejs.html5media = {