pageflow 12.0.1 → 12.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38b651a6838c18e932f4aa388ff6056538003958
-  data.tar.gz: 8fb568b33219a77b03288fccec3a910f290b8fc3
+  metadata.gz: 56358a772f2ffd39c8ff1e923381474a84e7479d
+  data.tar.gz: 24450abb51ff9fda63c25df4e1a1886bf015636c
 SHA512:
-  metadata.gz: e7cfec9c5b6573463fbef5f19dae0591b4f0100ff5512aec0fde2eb057e53e2ac274509a90c6d212d13e66ddb8f240788f889bc5ba31818f4fa215266d81f83b
-  data.tar.gz: 36f4bc205f70ae0676f590442fbba3bda6cdbdaff9fa24aa676f394c4764be4f7e7196917a023c544f593faf1501957760e85609034cedeab9f0844a36bd4118
+  metadata.gz: 9ba66d120beb537080abf0eb7ad8e9d6c8ac623de3f215a41d2796ba58d70aae9c611666458c5666d2da36df7146dc6df03edf5c17b82b4b509782ac4f657835
+  data.tar.gz: 1dad4196be1ce9d5f2fd5cdc9e2d90462193503277377408d2d48772fe73ec40235f24a9e1ad752ef96c41ce1e291d9f25e9eaf7d6bf79985b7c47fc834ac89a

data/CHANGELOG.md

@@ -1,5 +1,33 @@
 # CHANGELOG
 
+### Version 12.0.2
+
+2017-09-13
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v12.0.1...v12.0.2)
+
+#### Manual Update Step
+
+The database migration for Pageflow 12.0 which updates output
+presences of existing video files is missing the HLS variant. This
+causes HLS urls of existing video files to be rendered as `undefined`.
+([#870](https://github.com/codevise/pageflow/pull/870))
+
+To apply the fix, install migrations and migrate your database.
+
+#### Bug Fixes
+
+- Update videojs and videojs-dash to improve Dash playback
+  ([#843](https://github.com/codevise/pageflow/pull/843))
+- Bug fix: Prevent calling `localeCompare` of null.
+  ([#865](https://github.com/codevise/pageflow/pull/865))
+- Bug fix: Prevent background videos from stopping on fullscreen toggle
+  ([#864](https://github.com/codevise/pageflow/pull/864))
+- Bug fix: Activate text track after it has been added
+  ([#859](https://github.com/codevise/pageflow/pull/859))
+- Bug fix: Fix file type detection for vtt uploads on safari
+  ([#851](https://github.com/codevise/pageflow/pull/851))
+
 ### Version 12.0.1
 
 2017-08-25

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

@@ -23081,7 +23081,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	    return {
 	      files: files.sort(function (file1, file2) {
-	        return file1.displayLabel.localeCompare(file2.displayLabel);
+	        return (file1.displayLabel || '').localeCompare(file2.displayLabel || '');
 	      }),
 	      autoFile: autoFile,
 	      activeFileId: getActiveTextTrackFileId(files, autoFile, textTrackSettings),
@@ -24102,6 +24102,10 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	    updateOnNextPlay(player, getActiveTexTrackFileId, getPosition);
 	  });
 
+	  player.textTracks().on('addtrack', function () {
+	    updateTextTracks(player, null, getActiveTexTrackFileId(), getPosition());
+	  });
+
 	  updateTextTracks(player, null, getActiveTexTrackFileId(), getPosition());
 	  updateOnNextPlay(player, getActiveTexTrackFileId, getPosition);
 	}

data/app/assets/javascripts/pageflow/editor/initializers/setup_file_types.js

@@ -85,7 +85,7 @@ pageflow.app.addInitializer(function(options) {
   pageflow.editor.fileTypes.register('text_track_files', {
     model: pageflow.TextTrackFile,
     matchUpload: function(upload) {
-      return upload.type.match(/\/vtt$/) ||
+      return upload.name.match(/\.vtt$/) ||
         upload.name.match(/\.srt$/);
     },
     skipUploadConfirmation: true,

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

@@ -50,7 +50,8 @@ pageflow.VideoPlayer.cueSettingsMethods = function(player) {
     // for a cue even though the previous call had the same
     // parameters.
     if ((this.prevLine !== line || changed) && (command != 'lazy')) {
-      player.tech({IWillNotUseThisInPlugins: true}).trigger('texttrackchange');
+      var tech = player.tech({IWillNotUseThisInPlugins: true});
+      tech && tech.trigger('texttrackchange');
     }
 
     this.prevLine = line;

data/db/migrate/20170913105048_fix_hls_output_presences_for_legacy_video_files.rb

@@ -0,0 +1,12 @@
+class FixHlsOutputPresencesForLegacyVideoFiles < ActiveRecord::Migration
+  def up
+    execute(<<-SQL)
+      UPDATE pageflow_video_files
+        SET output_presences = '{"high":true,"medium":true,"low":true,"hls-playlist":true}'
+        WHERE output_presences = '{"high":true,"medium":true,"low":true}';
+    SQL
+  end
+
+  def down
+  end
+end

data/lib/pageflow/version.rb

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

data/vendor/assets/javascripts/jquery.fullscreen.js

@@ -7,6 +7,7 @@
  */
 
 /*jshint browser: true, jquery: true */
+// We shrank the plugin so that it contains only what Pageflow needs.
 (function($){
   "use strict";
 
@@ -50,17 +51,6 @@
     $(document).on("fullscreenchange mozfullscreenchange webkitfullscreenchange", function(){
       // The full screen status is automatically
       // passed to our callback as an argument.
-
-
-      // Customized for Pageflow-Background-Audio
-
-      if(pageflow.activeBackgroundVideo) {
-        setTimeout(function() {
-          if(pageflow.activeBackgroundVideo.paused() && !pageflow.features.has('mobile platform')) {
-            pageflow.activeBackgroundVideo.play();
-          }
-        }, 300);
-      }
       callback(fullScreenStatus());
     });
   }
@@ -69,7 +59,7 @@
   $.support.fullscreen = supportFullScreen();
 
   // Creating the plugin
-  $.fn.fullScreen = function(props){
+  $.fn.fullScreen = function(options){
     if(!$.support.fullscreen || this.length !== 1) {
       // The plugin can be called only
       // on one element at a time
@@ -83,46 +73,9 @@
       return this;
     }
 
-    // You can potentially pas two arguments a color
-    // for the background and a callback function
-
-    var options = $.extend({
-        'background'      : '#111',
-        'callback'        : $.noop( ),
-        'fullscreenClass' : 'fullScreen'
-      }, props),
-
-      elem = this,
-
-    // This temporary div is the element that is
-    // actually going to be enlarged in full screen
-
-      fs = $('<div>', {
-        'css' : {
-          'overflow-y' : 'auto',
-          'background' : options.background,
-          'width'      : '100%',
-          'height'     : '100%'
-        }
-      })
-        .insertBefore(elem)
-        .append(elem);
-
-    // You can use the .fullScreen class to
-    // apply styling to your element
-    elem.addClass( options.fullscreenClass );
+    var elem = this;
 
-    // Inserting our element in the temporary
-    // div, after which we zoom it in fullscreen
-
-    requestFullScreen(fs.get(0));
-
-    fs.click(function(e){
-      if(e.target == this){
-        // If the black bar was clicked
-        cancelFullScreen();
-      }
-    });
+    requestFullScreen(elem.get(0));
 
     elem.cancel = function(){
       cancelFullScreen();
@@ -134,14 +87,9 @@
         // We have exited full screen.
         // Detach event listener
         $(document).off( 'fullscreenchange mozfullscreenchange webkitfullscreenchange' );
-        // Remove the class and destroy
-        // the temporary div
-
-        elem.removeClass( options.fullscreenClass ).insertBefore(fs);
-        fs.remove();
       }
 
-      // Calling the facultative user supplied callback
+      // Calling callback if user provided it
       if(options.callback) {
         options.callback(fullScreen);
       }
@@ -149,10 +97,4 @@
 
     return elem;
   };
-
-  $.fn.cancelFullScreen = function( ) {
-    cancelFullScreen();
-
-    return this;
-  };
 }(jQuery));

data/vendor/assets/javascripts/videojs-dash.js

@@ -1,14 +1,318 @@
-/*! videojs-contrib-dash - v2.6.0 - 2016-12-12
- * Copyright (c) 2016 Brightcove  */
-(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
+/**
+ * videojs-contrib-dash
+ * @version 2.9.1
+ * @copyright 2017 Brightcove, Inc
+ * @license Apache-2.0
+ */
+(function(f){if(typeof exports==="object"&&typeof module!=="undefined"){module.exports=f()}else if(typeof define==="function"&&define.amd){define([],f)}else{var g;if(typeof window!=="undefined"){g=window}else if(typeof global!=="undefined"){g=global}else if(typeof self!=="undefined"){g=self}else{g=this}g.videojsDash = f()}})(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
 (function (global){
 'use strict';
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
+exports.__esModule = true;
+exports['default'] = setupAudioTracks;
+
+var _dashjs = (typeof window !== "undefined" ? window['dashjs'] : typeof global !== "undefined" ? global['dashjs'] : null);
+
+var _dashjs2 = _interopRequireDefault(_dashjs);
+
+var _video = (typeof window !== "undefined" ? window['videojs'] : typeof global !== "undefined" ? global['videojs'] : null);
+
+var _video2 = _interopRequireDefault(_video);
 
-var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+/**
+ * Setup audio tracks. Take the tracks from dash and add the tracks to videojs. Listen for when
+ * videojs changes tracks and apply that to the dash player because videojs doesn't do this
+ * natively.
+ *
+ * @private
+ * @param {videojs} player the videojs player instance
+ * @param {videojs.tech} tech the videojs tech being used
+ */
+function handlePlaybackMetadataLoaded(player, tech) {
+  var mediaPlayer = player.dash.mediaPlayer;
+
+  var dashAudioTracks = mediaPlayer.getTracksFor('audio');
+  var videojsAudioTracks = player.audioTracks();
+
+  function generateIdFromTrackIndex(index) {
+    return 'dash-audio-' + index;
+  }
+
+  function findDashAudioTrack(dashAudioTracks, videojsAudioTrack) {
+    return dashAudioTracks.find(function (_ref) {
+      var index = _ref.index;
+      return generateIdFromTrackIndex(index) === videojsAudioTrack.id;
+    });
+  }
+
+  // Safari creates a single native `AudioTrack` (not `videojs.AudioTrack`) when loading. Clear all
+  // automatically generated audio tracks so we can create them all ourself.
+  if (videojsAudioTracks.length) {
+    tech.clearTracks(['audio']);
+  }
+
+  var currentAudioTrack = mediaPlayer.getCurrentTrackFor('audio');
+
+  dashAudioTracks.forEach(function (dashTrack) {
+    var label = dashTrack.lang;
+
+    if (dashTrack.roles && dashTrack.roles.length) {
+      label += ' (' + dashTrack.roles.join(', ') + ')';
+    }
+
+    // Add the track to the player's audio track list.
+    videojsAudioTracks.addTrack(new _video2['default'].AudioTrack({
+      enabled: dashTrack === currentAudioTrack,
+      id: generateIdFromTrackIndex(dashTrack.index),
+      kind: dashTrack.kind || 'main',
+      label: label,
+      language: dashTrack.lang
+    }));
+  });
+
+  videojsAudioTracks.addEventListener('change', function () {
+    for (var i = 0; i < videojsAudioTracks.length; i++) {
+      var track = videojsAudioTracks[i];
+
+      if (track.enabled) {
+        // Find the audio track we just selected by the id
+        var dashAudioTrack = findDashAudioTrack(dashAudioTracks, track);
+
+        // Set is as the current track
+        mediaPlayer.setCurrentTrack(dashAudioTrack);
+
+        // Stop looping
+        continue;
+      }
+    }
+  });
+}
+
+/*
+ * Call `handlePlaybackMetadataLoaded` when `mediaPlayer` emits
+ * `dashjs.MediaPlayer.events.PLAYBACK_METADATA_LOADED`.
+ */
+function setupAudioTracks(player, tech) {
+  // When `dashjs` finishes loading metadata, create audio tracks for `video.js`.
+  player.dash.mediaPlayer.on(_dashjs2['default'].MediaPlayer.events.PLAYBACK_METADATA_LOADED, handlePlaybackMetadataLoaded.bind(null, player, tech));
+}
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],2:[function(require,module,exports){
+(function (global){
+'use strict';
+
+exports.__esModule = true;
+exports['default'] = setupTextTracks;
+
+var _dashjs = (typeof window !== "undefined" ? window['dashjs'] : typeof global !== "undefined" ? global['dashjs'] : null);
+
+var _dashjs2 = _interopRequireDefault(_dashjs);
+
+var _video = (typeof window !== "undefined" ? window['videojs'] : typeof global !== "undefined" ? global['videojs'] : null);
+
+var _video2 = _interopRequireDefault(_video);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+function find(l, f) {
+  for (var i = 0; i < l.length; i++) {
+    if (f(l[i])) {
+      return l[i];
+    }
+  }
+}
+
+/*
+ * Attach text tracks from dash.js to videojs
+ *
+ * @param {videojs} player the videojs player instance
+ * @param {array} tracks the tracks loaded by dash.js to attach to videojs
+ *
+ * @private
+ */
+function attachDashTextTracksToVideojs(player, tech, tracks) {
+  var trackDictionary = [];
+
+  // Add remote tracks
+  var tracksAttached = tracks
+  // Map input data to match HTMLTrackElement spec
+  // https://developer.mozilla.org/en-US/docs/Web/API/HTMLTrackElement
+  .map(function (track) {
+    return {
+      dashTrack: track,
+      trackConfig: {
+        label: track.lang,
+        language: track.lang,
+        srclang: track.lang
+      }
+    };
+  }
+
+  // Add track to videojs track list
+  ).map(function (_ref) {
+    var trackConfig = _ref.trackConfig,
+        dashTrack = _ref.dashTrack;
+
+    var remoteTextTrack = player.addRemoteTextTrack(trackConfig, true);
+    trackDictionary.push({ textTrack: remoteTextTrack.track, dashTrack: dashTrack });
+
+    // Don't add the cues becuase we're going to let dash handle it natively. This will ensure
+    // that dash handle external time text files and fragmented text tracks.
+    //
+    // Example file with external time text files:
+    // https://storage.googleapis.com/shaka-demo-assets/sintel-mp4-wvtt/dash.mpd
+
+    return remoteTextTrack;
+  });
+
+  /*
+   * Scan `videojs.textTracks()` to find one that is showing. Set the dash text track.
+   */
+  function updateActiveDashTextTrack() {
+    var dashMediaPlayer = player.dash.mediaPlayer;
+    var textTracks = player.textTracks();
+    var activeTextTrackIndex = -1;
+
+    // Iterate through the tracks and find the one marked as showing. If none are showing,
+    // `activeTextTrackIndex` will be set to `-1`, disabling text tracks.
+
+    var _loop = function _loop(i) {
+      var textTrack = textTracks[i];
+
+      if (textTrack.mode === 'showing') {
+        // Find the dash track we want to use
+
+        /* jshint loopfunc: true */
+        var dictionaryLookupResult = find(trackDictionary, function (track) {
+          return track.textTrack === textTrack;
+        });
+        /* jshint loopfunc: false */
+
+        var dashTrackToActivate = dictionaryLookupResult ? dictionaryLookupResult.dashTrack : null;
+
+        // If we found a track, get it's index.
+        if (dashTrackToActivate) {
+          activeTextTrackIndex = tracks.indexOf(dashTrackToActivate);
+        }
+      }
+    };
+
+    for (var i = 0; i < textTracks.length; i += 1) {
+      _loop(i);
+    }
+
+    // If the text track has changed, then set it in dash
+    if (activeTextTrackIndex !== dashMediaPlayer.getCurrentTextTrackIndex()) {
+      dashMediaPlayer.setTextTrack(activeTextTrackIndex);
+    }
+  }
+
+  // Update dash when videojs's selected text track changes.
+  player.textTracks().on('change', updateActiveDashTextTrack);
+
+  // Cleanup event listeners whenever we start loading a new source
+  player.one('loadstart', function () {
+    player.textTracks().off('change', updateActiveDashTextTrack);
+  });
+
+  // Initialize the text track on our first run-through
+  updateActiveDashTextTrack();
+
+  return tracksAttached;
+}
+
+/*
+ * Wait for dash to emit `TEXT_TRACKS_ADDED` and then attach the text tracks loaded by dash if
+ * we're not using native text tracks.
+ *
+ * @param {videojs} player the videojs player instance
+ * @private
+ */
+function setupTextTracks(player, tech, options) {
+  // Clear VTTCue if it was shimmed by vttjs and let dash.js use TextTrackCue.
+  // This is necessary because dash.js creates text tracks
+  // using addTextTrack which is incompatible with vttjs.VTTCue in IE11
+  if (window.VTTCue && !/\[native code\]/.test(window.VTTCue.toString())) {
+    window.VTTCue = false;
+  }
+
+  // Store the tracks that we've added so we can remove them later.
+  var dashTracksAttachedToVideoJs = [];
+
+  // We're relying on the user to disable native captions. Show an error if they didn't do so.
+  if (tech.featuresNativeTextTracks) {
+    _video2['default'].log.error('You must pass {html: {nativeCaptions: false}} in the videojs constructor ' + 'to use text tracks in videojs-contrib-dash');
+    return;
+  }
+
+  var mediaPlayer = player.dash.mediaPlayer;
+
+  // Clear the tracks that we added. We don't clear them all because someone else can add tracks.
+  function clearDashTracks() {
+    dashTracksAttachedToVideoJs.forEach(player.removeRemoteTextTrack.bind(player));
+
+    dashTracksAttachedToVideoJs = [];
+  }
+
+  function handleTextTracksAdded(_ref2) {
+    var index = _ref2.index,
+        tracks = _ref2.tracks;
+
+    // Stop listening for this event. We only want to hear it once.
+    mediaPlayer.off(_dashjs2['default'].MediaPlayer.events.TEXT_TRACKS_ADDED, handleTextTracksAdded);
+
+    // Cleanup old tracks
+    clearDashTracks();
+
+    if (!tracks.length) {
+      // Don't try to add text tracks if there aren't any
+      return;
+    }
+
+    // Save the tracks so we can remove them later
+    dashTracksAttachedToVideoJs = attachDashTextTracksToVideojs(player, tech, tracks, options);
+  }
+
+  // Attach dash text tracks whenever we dash emits `TEXT_TRACKS_ADDED`.
+  mediaPlayer.on(_dashjs2['default'].MediaPlayer.events.TEXT_TRACKS_ADDED, handleTextTracksAdded);
+
+  function cleanup() {
+    mediaPlayer.off(_dashjs2['default'].MediaPlayer.events.TEXT_TRACKS_ADDED, handleTextTracksAdded);
+
+    player.one('loadstart', clearDashTracks);
+  }
+
+  // When the player can play, remove the initialization events. We might not have received
+  // TEXT_TRACKS_ADDED` so we have to stop listening for it or we'll get errors when we load new
+  // videos and are listening for the same event in multiple places, including cleaned up
+  // mediaPlayers.
+  mediaPlayer.on(_dashjs2['default'].MediaPlayer.events.CAN_PLAY, cleanup);
+}
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],3:[function(require,module,exports){
+(function (global){
+var win;
+
+if (typeof window !== "undefined") {
+    win = window;
+} else if (typeof global !== "undefined") {
+    win = global;
+} else if (typeof self !== "undefined"){
+    win = self;
+} else {
+    win = {};
+}
+
+module.exports = win;
+
+}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
+},{}],4:[function(require,module,exports){
+(function (global){
+'use strict';
+
+exports.__esModule = true;
 
 var _window = require('global/window');
 
@@ -22,20 +326,23 @@ var _dashjs = (typeof window !== "undefined" ? window['dashjs'] : typeof global
 
 var _dashjs2 = _interopRequireDefault(_dashjs);
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var _setupAudioTracks = require('./setup-audio-tracks');
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _setupAudioTracks2 = _interopRequireDefault(_setupAudioTracks);
 
-var isArray = function isArray(a) {
-  return Object.prototype.toString.call(a) === '[object Array]';
-};
+var _setupTextTracks = require('./setup-text-tracks');
+
+var _setupTextTracks2 = _interopRequireDefault(_setupTextTracks);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 /**
  * videojs-contrib-dash
  *
  * Use Dash.js to playback DASH content inside of Video.js via a SourceHandler
  */
-
 var Html5DashJS = function () {
   function Html5DashJS(source, tech, options) {
     var _this = this;
@@ -45,7 +352,7 @@ var Html5DashJS = function () {
     // Get options from tech if not provided for backwards compatibility
     options = options || tech.options_;
 
-    this.player = (0, _video2.default)(options.playerId);
+    this.player = (0, _video2['default'])(options.playerId);
     this.player.dash = this.player.dash || {};
 
     this.tech_ = tech;
@@ -63,7 +370,7 @@ var Html5DashJS = function () {
     tech.isReady_ = false;
 
     if (Html5DashJS.updateSourceData) {
-      _video2.default.log.warn('updateSourceData has been deprecated.' + ' Please switch to using hook("updatesource", callback).');
+      _video2['default'].log.warn('updateSourceData has been deprecated.' + ' Please switch to using hook("updatesource", callback).');
       source = Html5DashJS.updateSourceData(source);
     }
 
@@ -75,18 +382,18 @@ var Html5DashJS = function () {
     var manifestSource = source.src;
     this.keySystemOptions_ = Html5DashJS.buildDashJSProtData(source.keySystemOptions);
 
-    this.player.dash.mediaPlayer = _dashjs2.default.MediaPlayer().create();
+    this.player.dash.mediaPlayer = _dashjs2['default'].MediaPlayer().create();
 
     this.mediaPlayer_ = this.player.dash.mediaPlayer;
 
     // Log MedaPlayer messages through video.js
     if (Html5DashJS.useVideoJSDebug) {
-      _video2.default.log.warn('useVideoJSDebug has been deprecated.' + ' Please switch to using hook("beforeinitialize", callback).');
+      _video2['default'].log.warn('useVideoJSDebug has been deprecated.' + ' Please switch to using hook("beforeinitialize", callback).');
       Html5DashJS.useVideoJSDebug(this.mediaPlayer_);
     }
 
     if (Html5DashJS.beforeInitialize) {
-      _video2.default.log.warn('beforeInitialize has been deprecated.' + ' Please switch to using hook("beforeinitialize", callback).');
+      _video2['default'].log.warn('beforeInitialize has been deprecated.' + ' Please switch to using hook("beforeinitialize", callback).');
       Html5DashJS.beforeInitialize(this.player, this.mediaPlayer_);
     }
 
@@ -98,11 +405,35 @@ var Html5DashJS = function () {
     // element to bind to.
     this.mediaPlayer_.initialize();
 
-    // Apply any options that are set
-    if (options.dash && options.dash.limitBitrateByPortal) {
-      this.mediaPlayer_.setLimitBitrateByPortal(true);
-    } else {
-      this.mediaPlayer_.setLimitBitrateByPortal(false);
+    // Apply all dash options that are set
+    if (options.dash) {
+      Object.keys(options.dash).forEach(function (key) {
+        var _mediaPlayer_;
+
+        var dashOptionsKey = 'set' + key.charAt(0).toUpperCase() + key.slice(1);
+        var value = options.dash[key];
+
+        if (_this.mediaPlayer_.hasOwnProperty(dashOptionsKey)) {
+          // Providing a key without `set` prefix is now deprecated.
+          _video2['default'].log.warn('Using dash options in videojs-contrib-dash without the set prefix ' + ('has been deprecated. Change \'' + key + '\' to \'' + dashOptionsKey + '\''));
+
+          // Set key so it will still work
+          key = dashOptionsKey;
+        }
+
+        if (!_this.mediaPlayer_.hasOwnProperty(key)) {
+          _video2['default'].log.warn('Warning: dash configuration option unrecognized: ' + key);
+
+          return;
+        }
+
+        // Guarantee `value` is an array
+        if (!Array.isArray(value)) {
+          value = [value];
+        }
+
+        (_mediaPlayer_ = _this.mediaPlayer_)[key].apply(_mediaPlayer_, value);
+      });
     }
 
     this.mediaPlayer_.attachView(this.el_);
@@ -110,6 +441,12 @@ var Html5DashJS = function () {
     // Dash.js autoplays by default, video.js will handle autoplay
     this.mediaPlayer_.setAutoPlay(false);
 
+    // Setup audio tracks
+    _setupAudioTracks2['default'].call(null, this.player, tech);
+
+    // Setup text tracks
+    _setupTextTracks2['default'].call(null, this.player, tech, options);
+
     // Attach the source with any protection data
     this.mediaPlayer_.setProtectionData(this.keySystemOptions_);
     this.mediaPlayer_.attachSource(manifestSource);
@@ -125,100 +462,101 @@ var Html5DashJS = function () {
    */
 
 
-  _createClass(Html5DashJS, [{
-    key: 'dispose',
-    value: function dispose() {
-      if (this.mediaPlayer_) {
-        this.mediaPlayer_.reset();
-      }
+  Html5DashJS.buildDashJSProtData = function buildDashJSProtData(keySystemOptions) {
+    var output = {};
 
-      if (this.player.dash) {
-        delete this.player.dash;
-      }
+    if (!keySystemOptions || !Array.isArray(keySystemOptions)) {
+      return null;
     }
 
-    /**
-     * Get a list of hooks for a specific lifecycle
-     *
-     * @param {string} type the lifecycle to get hooks from
-     * @param {Function=|Function[]=} hook Optionally add a hook tothe lifecycle
-     * @return {Array} an array of hooks or epty if none
-     * @method hooks
-     */
-
-  }], [{
-    key: 'buildDashJSProtData',
-    value: function buildDashJSProtData(keySystemOptions) {
-      var output = {};
-
-      if (!keySystemOptions || !isArray(keySystemOptions)) {
-        return null;
-      }
+    for (var i = 0; i < keySystemOptions.length; i++) {
+      var keySystem = keySystemOptions[i];
+      var options = _video2['default'].mergeOptions({}, keySystem.options);
 
-      for (var i = 0; i < keySystemOptions.length; i++) {
-        var keySystem = keySystemOptions[i];
-        var options = _video2.default.mergeOptions({}, keySystem.options);
+      if (options.licenseUrl) {
+        options.serverURL = options.licenseUrl;
+        delete options.licenseUrl;
+      }
 
-        if (options.licenseUrl) {
-          options.serverURL = options.licenseUrl;
-          delete options.licenseUrl;
-        }
+      output[keySystem.name] = options;
+    }
 
-        output[keySystem.name] = options;
-      }
+    return output;
+  };
 
-      return output;
+  Html5DashJS.prototype.dispose = function dispose() {
+    if (this.mediaPlayer_) {
+      this.mediaPlayer_.reset();
     }
-  }, {
-    key: 'hooks',
-    value: function hooks(type, hook) {
-      Html5DashJS.hooks_[type] = Html5DashJS.hooks_[type] || [];
 
-      if (hook) {
-        Html5DashJS.hooks_[type] = Html5DashJS.hooks_[type].concat(hook);
-      }
+    if (this.player.dash) {
+      delete this.player.dash;
+    }
+  };
 
-      return Html5DashJS.hooks_[type];
+  Html5DashJS.prototype.duration = function duration() {
+    var duration = this.el_.duration;
+    if (duration === Number.MAX_VALUE) {
+      return Infinity;
     }
+    return duration;
+  };
+
+  /**
+   * Get a list of hooks for a specific lifecycle
+   *
+   * @param {string} type the lifecycle to get hooks from
+   * @param {Function=|Function[]=} hook Optionally add a hook tothe lifecycle
+   * @return {Array} an array of hooks or epty if none
+   * @method hooks
+   */
+
 
-    /**
-     * Add a function hook to a specific dash lifecycle
-     *
-     * @param {string} type the lifecycle to hook the function to
-     * @param {Function|Function[]} hook the function or array of functions to attach
-     * @method hook
-     */
-
-  }, {
-    key: 'hook',
-    value: function hook(type, _hook) {
-      Html5DashJS.hooks(type, _hook);
+  Html5DashJS.hooks = function hooks(type, hook) {
+    Html5DashJS.hooks_[type] = Html5DashJS.hooks_[type] || [];
+
+    if (hook) {
+      Html5DashJS.hooks_[type] = Html5DashJS.hooks_[type].concat(hook);
     }
 
-    /**
-     * Remove a hook from a specific dash lifecycle.
-     *
-     * @param {string} type the lifecycle that the function hooked to
-     * @param {Function} hook The hooked function to remove
-     * @return {boolean} True if the function was removed, false if not found
-     * @method removeHook
-     */
-
-  }, {
-    key: 'removeHook',
-    value: function removeHook(type, hook) {
-      var index = Html5DashJS.hooks(type).indexOf(hook);
-
-      if (index === -1) {
-        return false;
-      }
+    return Html5DashJS.hooks_[type];
+  };
+
+  /**
+   * Add a function hook to a specific dash lifecycle
+   *
+   * @param {string} type the lifecycle to hook the function to
+   * @param {Function|Function[]} hook the function or array of functions to attach
+   * @method hook
+   */
+
+
+  Html5DashJS.hook = function hook(type, _hook) {
+    Html5DashJS.hooks(type, _hook);
+  };
+
+  /**
+   * Remove a hook from a specific dash lifecycle.
+   *
+   * @param {string} type the lifecycle that the function hooked to
+   * @param {Function} hook The hooked function to remove
+   * @return {boolean} True if the function was removed, false if not found
+   * @method removeHook
+   */
+
 
-      Html5DashJS.hooks_[type] = Html5DashJS.hooks_[type].slice();
-      Html5DashJS.hooks_[type].splice(index, 1);
+  Html5DashJS.removeHook = function removeHook(type, hook) {
+    var index = Html5DashJS.hooks(type).indexOf(hook);
 
-      return true;
+    if (index === -1) {
+      return false;
     }
-  }]);
+
+    Html5DashJS.hooks_[type] = Html5DashJS.hooks_[type].slice();
+    Html5DashJS.hooks_[type].splice(index, 1);
+
+    return true;
+  };
 
   return Html5DashJS;
 }();
@@ -226,10 +564,19 @@ var Html5DashJS = function () {
 Html5DashJS.hooks_ = {};
 
 var canHandleKeySystems = function canHandleKeySystems(source) {
+  // copy the source
+  source = JSON.parse(JSON.stringify(source));
+
   if (Html5DashJS.updateSourceData) {
+    _video2['default'].log.warn('updateSourceData has been deprecated.' + ' Please switch to using hook("updatesource", callback).');
     source = Html5DashJS.updateSourceData(source);
   }
 
+  // call updatesource hooks
+  Html5DashJS.hooks('updatesource').forEach(function (hook) {
+    source = hook(source);
+  });
+
   var videoEl = document.createElement('video');
   if (source.keySystemOptions && !(navigator.requestMediaKeySystemAccess ||
   // IE11 Win 8.1
@@ -240,7 +587,7 @@ var canHandleKeySystems = function canHandleKeySystems(source) {
   return true;
 };
 
-_video2.default.DashSourceHandler = function () {
+_video2['default'].DashSourceHandler = function () {
   return {
     canHandleSource: function canHandleSource(source) {
       var dashExtRE = /\.mpd/i;
@@ -249,7 +596,7 @@ _video2.default.DashSourceHandler = function () {
         return '';
       }
 
-      if (_video2.default.DashSourceHandler.canPlayType(source.type)) {
+      if (_video2['default'].DashSourceHandler.canPlayType(source.type)) {
         return 'probably';
       } else if (dashExtRE.test(source.src)) {
         return 'maybe';
@@ -263,12 +610,12 @@ _video2.default.DashSourceHandler = function () {
     },
 
     canPlayType: function canPlayType(type) {
-      return _video2.default.DashSourceHandler.canPlayType(type);
+      return _video2['default'].DashSourceHandler.canPlayType(type);
     }
   };
 };
 
-_video2.default.DashSourceHandler.canPlayType = function (type) {
+_video2['default'].DashSourceHandler.canPlayType = function (type) {
   var dashTypeRE = /^application\/dash\+xml/i;
   if (dashTypeRE.test(type)) {
     return 'probably';
@@ -278,25 +625,12 @@ _video2.default.DashSourceHandler.canPlayType = function (type) {
 };
 
 // Only add the SourceHandler if the browser supports MediaSourceExtensions
-if (!!_window2.default.MediaSource) {
-  _video2.default.getComponent('Html5').registerSourceHandler(_video2.default.DashSourceHandler(), 0);
+if (!!_window2['default'].MediaSource) {
+  _video2['default'].getTech('Html5').registerSourceHandler(_video2['default'].DashSourceHandler(), 0);
 }
 
-_video2.default.Html5DashJS = Html5DashJS;
-exports.default = Html5DashJS;
-
+_video2['default'].Html5DashJS = Html5DashJS;
+exports['default'] = Html5DashJS;
 }).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{"global/window":2}],2:[function(require,module,exports){
-(function (global){
-if (typeof window !== "undefined") {
-    module.exports = window;
-} else if (typeof global !== "undefined") {
-    module.exports = global;
-} else if (typeof self !== "undefined"){
-    module.exports = self;
-} else {
-    module.exports = {};
-}
-
-}).call(this,typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : typeof window !== "undefined" ? window : {})
-},{}]},{},[1]);
+},{"./setup-audio-tracks":1,"./setup-text-tracks":2,"global/window":3}]},{},[4])(4)
+});