pageflow 12.0.2 → 12.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56358a772f2ffd39c8ff1e923381474a84e7479d
-  data.tar.gz: 24450abb51ff9fda63c25df4e1a1886bf015636c
+  metadata.gz: c54e2d1eaa625de6e8658a049e21b086c2ffe8fc
+  data.tar.gz: f686b049c0bce278a4ec2a7ee608235ea8c14d62
 SHA512:
-  metadata.gz: 9ba66d120beb537080abf0eb7ad8e9d6c8ac623de3f215a41d2796ba58d70aae9c611666458c5666d2da36df7146dc6df03edf5c17b82b4b509782ac4f657835
-  data.tar.gz: 1dad4196be1ce9d5f2fd5cdc9e2d90462193503277377408d2d48772fe73ec40235f24a9e1ad752ef96c41ce1e291d9f25e9eaf7d6bf79985b7c47fc834ac89a
+  metadata.gz: 5d1050a6b84a5545ec6c79d82e3bce94909caa50d19f1f7f6e438d4af1ea7262fdf5d61e898d545afec938e7527f64c196da06d6f1a90d0c584691cacd321b73
+  data.tar.gz: a3a50d30c0978f1d2edabe76373fd36470ec1816e2acc48ea5bf51557d7e6a102442c2d51bb227a44512f46a340ea7801d434afc641332a2b6a9df72e8d17f36

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+### Version 12.0.3
+
+2017-09-14
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v12.0.2...v12.0.3)
+
+- Bug fix: Handle async tech loading in VideoJS 6
+  ([#875](https://github.com/codevise/pageflow/pull/875))
+
 ### Version 12.0.2
 
 2017-09-13

data/app/assets/javascripts/pageflow/dist/react.js

@@ -23581,21 +23581,23 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	          playsInline: props.playsInline
 	        });
 
-	        (0, _handlePlayerState.initPlayer)(_this.player, function () {
-	          return _this.props.playerState;
-	        }, _this.props.playerActions, _this.prevFileId, _this.props.file.id);
-
-	        if (!_this.displaysTextTracksInNativePlayer) {
-	          (0, _textTracks.initTextTracks)(_this.player, function () {
-	            return _this.props.textTracks.activeFileId;
-	          }, function () {
-	            return _this.props.textTrackPosition;
-	          });
-	        }
+	        _this.player.ready(function () {
+	          (0, _handlePlayerState.initPlayer)(_this.player, function () {
+	            return _this.props.playerState;
+	          }, _this.props.playerActions, _this.prevFileId, _this.props.file.id);
+
+	          if (!_this.displaysTextTracksInNativePlayer) {
+	            (0, _textTracks.initTextTracks)(_this.player, function () {
+	              return _this.props.textTracks.activeFileId;
+	            }, function () {
+	              return _this.props.textTrackPosition;
+	            });
+	          }
 
-	        (0, _watchPlayer2.default)(_this.player, _this.props.playerActions);
+	          (0, _watchPlayer2.default)(_this.player, _this.props.playerActions);
 
-	        _this.prevFileId = _this.props.file.id;
+	          _this.prevFileId = _this.props.file.id;
+	        });
 	      };
 
 	      _this.disposeMediaTag = function () {

data/app/assets/javascripts/pageflow/media_player.js

@@ -1,4 +1,5 @@
 //= require_self
+//= require ./media_player/catch_play_promise
 //= require ./media_player/volume_fading
 //= require ./media_player/volume_binding
 //= require ./media_player/load_waiting
@@ -7,6 +8,7 @@
 
 pageflow.mediaPlayer = {
   enhance: function(player, options) {
+    pageflow.mediaPlayer.catchPlayerPromise(player);
     pageflow.mediaPlayer.asyncPlay(player);
 
     if (options.hooks) {

data/app/assets/javascripts/pageflow/media_player/catch_play_promise.js

@@ -0,0 +1,23 @@
+/*global Promise*/
+
+// Chrome returns a promise from `play` that is rejected if another
+// operation (like calling `pause` or updating the source) happens
+// before playing started. If the promise rejection is not handled,
+// the operation that caused `play` to abort will fail with an
+// exception. Code following the operation will not be executed. Catch
+// and ignore the promise to prevent this.
+pageflow.mediaPlayer.catchPlayerPromise = function(player) {
+  var originalPlay = player.play;
+
+  player.play = function(/* arguments */) {
+    var result = originalPlay.apply(player, arguments);
+
+    if (result && (typeof Promise !== 'undefined') && (result instanceof Promise)) {
+      result.catch(function() {
+        pageflow.log('Caught pending play exception - continuing');
+      });
+    }
+
+    return result;
+  };
+};

data/app/assets/javascripts/pageflow/video_player/use_slim_controls_during_phone_playback.js

@@ -11,6 +11,6 @@ pageflow.mediaPlayer.useSlimPlayerControlsDuringPhonePlayback = function(player)
       });
     }
 
-    originalPlay.apply(this, arguments);
+    return originalPlay.apply(this, arguments);
   };
 };

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.0.2'.freeze
+  VERSION = '12.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 12.0.2
+  version: 12.0.3
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1225,6 +1225,7 @@ files:
 - app/assets/javascripts/pageflow/manual_start.js
 - app/assets/javascripts/pageflow/media_player.js
 - app/assets/javascripts/pageflow/media_player/async_play.js
+- app/assets/javascripts/pageflow/media_player/catch_play_promise.js
 - app/assets/javascripts/pageflow/media_player/hooks.js
 - app/assets/javascripts/pageflow/media_player/load_waiting.js
 - app/assets/javascripts/pageflow/media_player/volume_binding.js