pageflow 15.3.0 → 15.4.0

data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/info_box.scss

@@ -74,7 +74,7 @@ $slim-player-controls-info-box-header-typography: () !default;
     pointer-events: none;
 
     a {
-      pointer-events: all;
+      pointer-events: auto;
     }
 
     position: absolute;

data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/quality_menu.scss

@@ -12,7 +12,7 @@ $slim-player-controls-quality-menu-annotation-color: #ff0000 !default;
     bottom: 0;
     right: 10px;
     z-index: 10;
-    pointer-events: all;
+    pointer-events: auto;
 
     @include transition(opacity 0.5s, visibility 0.5s);
   }
@@ -88,7 +88,7 @@ $slim-player-controls-quality-menu-annotation-color: #ff0000 !default;
   &-menu_bar_button-sub_menu_visible .player_controls-menu_bar_button_sub_menu {
     visibility: visible;
     opacity: 1;
-    pointer-events: all;
+    pointer-events: auto;
     @include transition(none);
   }
 

data/app/assets/stylesheets/pageflow/themes/default/player_controls/waveform/wave.scss

@@ -15,7 +15,7 @@
 
     position: relative;
     z-index: 1;
-    pointer-events: all;
+    pointer-events: auto;
     height: 70px;
 
     @media (min-height: 600px) {

data/app/assets/stylesheets/pageflow/ui/forms.scss

@@ -24,7 +24,8 @@ label:hover span.name {
 select,
 textarea,
 input {
-  font-family: Helvetica, "Sans-Serif";
+  font-family: Helvetica, Arial, "Sans-Serif";
+  font-size: 13px;
   display: block;
   width: 100%;
   border: solid 1px #888;
@@ -158,6 +159,12 @@ textarea.short {
     margin: 7px 0;
     float: left;
   }
+
+  &.disabled .slider,
+  &.disabled .value {
+    opacity: 0.5;
+    pointer-events: none;
+  }
 }
 
 .validation {
@@ -189,7 +196,7 @@ textarea.short {
     width: 20px;
     height: 17px;
     text-align: center;
-    pointer-events: all;
+    pointer-events: auto;
   }
 
   position: absolute;

data/app/assets/stylesheets/pageflow/ui/input/extended_select_input.scss

@@ -1,6 +1,6 @@
 .extended_select_input {
   .ui-selectmenu-button span.ui-selectmenu-text {
-    font-family: Helvetica, Sans-Serif;
+    font-family: Helvetica, Arial, Sans-Serif;
     font-size: 13px;
   }
 }
@@ -91,7 +91,7 @@
   }
 
   .ui-widget {
-    font-family: Helvetica, Sans-Serif;
+    font-family: Helvetica, Arial, Sans-Serif;
     font-size: 13px;
 
     .item-description {

data/app/models/pageflow/account_role_query.rb

@@ -32,7 +32,7 @@ module Pageflow
           INNER JOIN pageflow_memberships ON
           pageflow_memberships.user_id = :user_id AND
           pageflow_memberships.entity_id = pageflow_accounts.id AND
-          pageflow_memberships.entity_type = "Pageflow::Account" AND
+          pageflow_memberships.entity_type = 'Pageflow::Account' AND
           pageflow_memberships.role IN (:roles)
         SQL
       end

data/app/models/pageflow/managed_user_query.rb

@@ -26,7 +26,7 @@ module Pageflow
         <<-SQL
           INNER JOIN pageflow_memberships account_memberships ON
           account_memberships.user_id = users.id AND
-          account_memberships.entity_type = "Pageflow::Account"
+          account_memberships.entity_type = 'Pageflow::Account'
         SQL
       end
 

data/app/policies/pageflow/folder_policy.rb

@@ -24,9 +24,9 @@ module Pageflow
         user.accounts.joins(sanitize_sql_array([
           'LEFT OUTER JOIN pageflow_memberships as pageflow_memberships_2 ON ' \
           'pageflow_memberships_2.user_id = :user_id AND ' \
-          'pageflow_memberships_2.entity_type = "Pageflow::Account" AND ' \
+          'pageflow_memberships_2.entity_type = \'Pageflow::Account\' AND ' \
           'pageflow_memberships_2.entity_id = pageflow_accounts.id AND ' \
-          'pageflow_memberships_2.role IN ("previewer", "editor", "publisher", "manager")',
+          'pageflow_memberships_2.role IN (\'previewer\', \'editor\', \'publisher\', \'manager\')',
           user_id: user.id])).where('pageflow_memberships_2.entity_id IS NOT NULL')
       end
     end

data/app/policies/pageflow/membership_policy.rb

@@ -19,9 +19,9 @@ module Pageflow
       private
 
       def permissions_appropriate
-        sanitize_sql_array(['pageflow_memberships.entity_type = "Pageflow::Account" AND ' \
+        sanitize_sql_array(['pageflow_memberships.entity_type = \'Pageflow::Account\' AND ' \
                             'pageflow_memberships.entity_id IN (:managed_account_ids) OR ' \
-                            'pageflow_memberships.entity_type = "Pageflow::Entry" AND ' \
+                            'pageflow_memberships.entity_type = \'Pageflow::Entry\' AND ' \
                             'pageflow_memberships.entity_id IN (:common_entry_ids) OR '\
                             'pageflow_memberships.user_id = :user_id',
                             managed_account_ids: managed_account_ids,

data/app/policies/pageflow/theming_policy.rb

@@ -25,8 +25,8 @@ module Pageflow
                             'pageflow_memberships.user_id = :user_id AND ' \
                             'pageflow_themings.account_id IN (:accounts_ids) AND ' \
                             'pageflow_memberships.entity_id IN (:accounts_ids) AND ' \
-                            'pageflow_memberships.entity_type = "Pageflow::Account" AND ' \
-                            'pageflow_memberships.role IN ("publisher", "manager")',
+                            'pageflow_memberships.entity_type = \'Pageflow::Account\' AND ' \
+                            'pageflow_memberships.role IN (\'publisher\', \'manager\')',
                             user_id: user.id, accounts_ids: accounts_ids])
       end
 

data/app/policies/pageflow/user_policy.rb

@@ -16,7 +16,7 @@ module Pageflow
                                  .new(@user, Account).member_addable.map(&:id)
 
           scope.joins(:memberships)
-            .where('pageflow_memberships.entity_type = "Pageflow::Account"')
+            .where('pageflow_memberships.entity_type = \'Pageflow::Account\'')
             .where(membership_in_managed_account(manager_accounts_ids)).distinct
         end
       end

data/app/views/pageflow/video_files/_video_file.json.jbuilder

@@ -1,3 +1,10 @@
 json.call(video_file, :width, :height, :duration_in_ms)
 json.created_at video_file.created_at.try(:utc).try(:iso8601, 0)
-json.variants video_file.present_outputs + [:poster_medium, :poster_large, :poster_ultra, :print]
+
+variants = (video_file.present_outputs + [:poster_medium, :poster_large, :poster_ultra, :print])
+
+# Use JBuilder's private _key method to use format variants according
+# to current key format (camel case/underscored). This ensures
+# variants are consistent with the keys generated by
+# ConfigHelper#config_file_url_templates_seed.
+json.variants(variants.map { |varaint| json.__send__(:_key, varaint) })

data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/editor.js

@@ -1140,13 +1140,30 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
    *   A text that will be appended to the translation based inline
    *   text.
    *
-   * @param {boolean} [options.disabled]
-   *   Render input as disabled.
+   * @param {string|string[]} [options.disabledBinding]
+   *   Name of an attribute to control whether the input is disabled. If
+   *   the `disabled` and `disabledBinding` options are not set,
+   *   input will be disabled whenever this attribute has a truthy value.
+   *   When multiple attribute names are passed, the function passed to
+   *   the `disabled` option will receive an array of values in the same
+   *   order.
+   *
+   * @param {function|boolean} [options.disabled]
+   *   Render input as disabled. A Function taking the value of the
+   *  `disabledBinding` attribute as parameter. Input will be disabled
+   *  only if function returns `true`.
+   *
+   * @param {any} [options.disabledBindingValue]
+   *   Input will be disabled whenever the value of the `disabledBinding`
+   *   attribute equals the value of this option.
    *
-   * @param {string} [options.visibleBinding]
+   * @param {string|string[]} [options.visibleBinding]
    *   Name of an attribute to control whether the input is visible. If
    *   the `visible` and `visibleBindingValue` options are not set,
    *   input will be visible whenever this attribute has a truthy value.
+   *   When multiple attribute names are passed, the function passed to
+   *   the `visible` option will receive an array of values in the same
+   *   order.
    *
    * @param {function|boolean} [options.visible]
    *   A Function taking the value of the `visibleBinding` attribute as
@@ -1201,15 +1218,10 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       this.$el.data('labelText', this.labelText());
       this.$el.data('inlineHelpText', this.inlineHelpText());
       this.ui.labelText.text(this.labelText());
-      this.ui.inlineHelp.html(this.inlineHelpText());
-
-      if (!this.inlineHelpText()) {
-        this.ui.inlineHelp.hide();
-      }
-
+      this.updateInlineHelp();
       this.setLabelFor();
-      this.updateDisabled();
-      this.setupVisibleBinding();
+      this.setupAttributeBinding('disabled', this.updateDisabled);
+      this.setupAttributeBinding('visible', this.updateVisible);
     },
 
     /**
@@ -1224,6 +1236,13 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         fallbackPrefix: 'activerecord.attributes'
       }));
     },
+    updateInlineHelp: function updateInlineHelp() {
+      this.ui.inlineHelp.html(this.inlineHelpText());
+
+      if (!this.inlineHelpText()) {
+        this.ui.inlineHelp.hide();
+      }
+    },
 
     /**
      * The inline help text for the form field.
@@ -1234,7 +1253,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         fallbackPrefix: 'pageflow.ui.inline_help'
       });
 
-      if (this.options.disabled) {
+      if (this.isDisabled()) {
         keys = translationKeysWithSuffix(keys, 'disabled');
       }
 
@@ -1250,40 +1269,61 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         this.ui.label.attr('for', id);
       }
     },
+    isDisabled: function isDisabled() {
+      return this.getAttributeBoundOption('disabled');
+    },
     updateDisabled: function updateDisabled() {
+      this.updateInlineHelp();
+
       if (this.ui.input) {
         this.updateDisabledAttribute(this.ui.input);
       }
     },
     updateDisabledAttribute: function updateDisabledAttribute(element) {
-      if (this.options.disabled) {
+      if (this.isDisabled()) {
         element.attr('disabled', true);
       } else {
         element.removeAttr('disabled');
       }
     },
-    setupVisibleBinding: function setupVisibleBinding() {
+    updateVisible: function updateVisible() {
+      this.$el.toggleClass('input-hidden_via_binding', this.getAttributeBoundOption('visible') === false);
+    },
+    setupAttributeBinding: function setupAttributeBinding(optionName, updateMethod) {
+      var _this = this;
+
+      var binding = this.options["".concat(optionName, "Binding")];
       var view = this;
 
-      if (this.options.visibleBinding) {
-        this.listenTo(this.model, 'change:' + this.options.visibleBinding, updateVisible);
-        updateVisible(this.model, this.model.get(this.options.visibleBinding));
+      if (binding) {
+        _.flatten([binding]).forEach(function (attribute) {
+          _this.listenTo(_this.model, 'change:' + attribute, update);
+        });
       }
 
-      function updateVisible(model, value) {
-        view.$el.toggleClass('input-hidden_via_binding', !isVisible(value));
+      update();
+
+      function update() {
+        updateMethod.call(view, view.getAttributeBoundOption(optionName));
       }
+    },
+    getAttributeBoundOption: function getAttributeBoundOption(optionName) {
+      var _this2 = this;
 
-      function isVisible(value) {
-        if ('visibleBindingValue' in view.options) {
-          return value === view.options.visibleBindingValue;
-        } else if (typeof view.options.visible === 'function') {
-          return !!view.options.visible(value);
-        } else if ('visible' in view.options) {
-          return !!view.options.visible;
-        } else {
-          return !!value;
-        }
+      var binding = this.options["".concat(optionName, "Binding")];
+      var bindingValueOptionName = "".concat(optionName, "BindingValue");
+      var value = Array.isArray(binding) ? binding.map(function (attribute) {
+        return _this2.model.get(attribute);
+      }) : this.model.get(binding);
+
+      if (bindingValueOptionName in this.options) {
+        return value === this.options[bindingValueOptionName];
+      } else if (typeof this.options[optionName] === 'function') {
+        return !!this.options[optionName](value);
+      } else if (optionName in this.options) {
+        return !!this.options[optionName];
+      } else if (binding) {
+        return !!value;
       }
     }
   };
@@ -1434,11 +1474,14 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
         this.listenTo(this.model, 'change:' + this.options.placeholderBinding, this.updatePlaceholder);
       }
     },
+    updateDisabled: function updateDisabled() {
+      this.updatePlaceholder();
+    },
     updatePlaceholder: function updatePlaceholder() {
       this.ui.input.attr('placeholder', this.placeholderText());
     },
     placeholderText: function placeholderText() {
-      if (!this.options.disabled || !this.options.hidePlaceholderIfDisabled) {
+      if (!this.isDisabled() || !this.options.hidePlaceholderIfDisabled) {
         if (this.options.placeholder) {
           if (typeof this.options.placeholder == 'function') {
             return this.options.placeholder(this.model);
@@ -1449,6 +1492,8 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
           return this.placeholderModelValue();
         }
       }
+
+      return '';
     },
     placeholderModelValue: function placeholderModelValue() {
       return this.options.placeholderModel && this.options.placeholderModel.get(this.options.propertyName);
@@ -1600,12 +1645,22 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       this.updateSettings();
     },
     updateSettings: function updateSettings() {
+      this.resetSwatchesInStoredSettings();
       this.ui.input.minicolors('settings', {
         defaultValue: this.defaultValue(),
         swatches: this.getSwatches()
       });
       this.load();
     },
+    // see https://github.com/claviska/jquery-minicolors/issues/287
+    resetSwatchesInStoredSettings: function resetSwatchesInStoredSettings() {
+      var settings = this.ui.input.data('minicolors-settings');
+
+      if (settings) {
+        delete settings.swatches;
+        this.ui.input.data('minicolors-settings', settings);
+      }
+    },
     load: function load() {
       this.ui.input.minicolors('value', this.model.get(this.options.propertyName) || this.defaultValue());
       this.$el.toggleClass('is_default', !this.model.has(this.options.propertyName));
@@ -2430,6 +2485,15 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       });
       this.load();
     },
+    updateDisabled: function updateDisabled(disabled) {
+      this.$el.toggleClass('disabled', !!disabled);
+
+      if (disabled) {
+        this.ui.widget.slider('disable');
+      } else {
+        this.ui.widget.slider('enable');
+      }
+    },
     save: function save() {
       var value = this.ui.widget.slider('option', 'value');
       var unit = 'unit' in this.options ? this.options.unit : '%';
@@ -2554,8 +2618,11 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       this.load();
       this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
     },
+    updateDisabled: function updateDisabled() {
+      this.load();
+    },
     save: function save() {
-      if (!this.options.disabled) {
+      if (!this.isDisabled()) {
         this.model.set(this.options.propertyName, this.ui.input.is(':checked'));
       }
     },
@@ -2565,7 +2632,7 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
       }
     },
     displayValue: function displayValue() {
-      if (this.options.disabled && this.options.displayUncheckedIfDisabled) {
+      if (this.isDisabled() && this.options.displayUncheckedIfDisabled) {
         return false;
       } else {
         return this.model.get(this.options.propertyName);
@@ -4000,10 +4067,10 @@ var pageflow_paged = (function (exports, Backbone, _, Marionette, $, I18n$1, Chi
     I18n$1.translations = window.I18n.translations;
     $(function () {
       editor.ensureBrowserSupport(function () {
-        $.when($.getJSON('/editor/entries/' + options.entryId + '/seed'), frontend.browser.detectFeatures()).done(function (result) {
-          app.start(result[0]);
-        }).fail(function () {
-          alert('Error while starting editor.');
+        Promise.all([$.getJSON('/editor/entries/' + options.entryId + '/seed'), frontend.browser.detectFeatures()]).then(function (result) {
+          return app.start(result[0]);
+        }, function () {
+          return alert('Error while starting editor.');
         });
       });
     });

data/entry_types/paged/app/assets/javascripts/pageflow_paged/dist/frontend.js

@@ -382,7 +382,7 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
   (module.exports = function (key, value) {
     return sharedStore[key] || (sharedStore[key] = value !== undefined ? value : {});
   })('versions', []).push({
-    version: '3.6.4',
+    version: '3.6.5',
     mode:  'global',
     copyright: '© 2020 Denis Pushkarev (zloirock.ru)'
   });
@@ -1318,7 +1318,13 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
       defer = functionBindContext(port.postMessage, port, 1);
     // Browsers with postMessage, skip WebWorkers
     // IE8 has postMessage, but it's sync & typeof its postMessage is 'object'
-    } else if (global_1.addEventListener && typeof postMessage == 'function' && !global_1.importScripts && !fails(post)) {
+    } else if (
+      global_1.addEventListener &&
+      typeof postMessage == 'function' &&
+      !global_1.importScripts &&
+      !fails(post) &&
+      location$1.protocol !== 'file:'
+    ) {
       defer = post;
       global_1.addEventListener('message', listener, false);
     // IE8-
@@ -3295,6 +3301,9 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
   browser.feature('mse and native hls support', function (has) {
     return agent.matchesSafari() && !agent.matchesMobilePlatform();
   });
+  browser.feature('hls support', function (has) {
+    return agent.matchesSafari() || agent.matchesMobilePlatform();
+  });
   browser.feature('native video player', function (has) {
     return has('iphone platform');
   });
@@ -4347,6 +4356,10 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
     return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread();
   }
 
+  if (typeof window !== 'undefined') {
+    window.VIDEOJS_NO_DYNAMIC_STYLE = true;
+  }
+
   var filterSources = function filterSources(playerElement) {
     if (playerElement.tagName.toLowerCase() !== 'video') {
       return playerElement;
@@ -4692,12 +4705,6 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
     return player;
   };
 
-  if (VideoJS.Html5DashJS) {
-    VideoJS.Html5DashJS.hook('beforeinitialize', function (player, mediaPlayer) {
-      mediaPlayer.getDebug().setLogToBrowserConsole(false);
-    });
-  }
-
   VideoPlayer.useSlimPlayerControlsDuringPhonePlayback = useSlimPlayerControlsDuringPhonePlayback;
   VideoPlayer.prebuffering = prebuffering;
   VideoPlayer.filterSources = filterSources;
@@ -4764,8 +4771,14 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
   var BLANK_AUDIO_SRC = 'data:audio/wav;base64,UklGRjIAAABXQVZFZm10IBA' + 'AAAABAAEAIlYAAESsAAACABAAZGF0YRAAAAAAAAAAAAAAAAAAAAAAAA==';
   var BLANK_VIDEO_SRC = 'data:video/mp4;base64,AAAAHGZ0eXBNNFYgAAACAG' + 'lzb21pc28yYXZjMQAAAAhmcmVlAAAGF21kYXTeBAAAbGliZmFhYyAxLjI4AABCAJMgBDIARw' + 'AAArEGBf//rdxF6b3m2Ui3lizYINkj7u94MjY0IC0gY29yZSAxNDIgcjIgOTU2YzhkOCAtIE' + 'guMjY0L01QRUctNCBBVkMgY29kZWMgLSBDb3B5bGVmdCAyMDAzLTIwMTQgLSBodHRwOi8vd3' + 'd3LnZpZGVvbGFuLm9yZy94MjY0Lmh0bWwgLSBvcHRpb25zOiBjYWJhYz0wIHJlZj0zIGRlYm' + 'xvY2s9MTowOjAgYW5hbHlzZT0weDE6MHgxMTEgbWU9aGV4IHN1Ym1lPTcgcHN5PTEgcHN5X3' + 'JkPTEuMDA6MC4wMCBtaXhlZF9yZWY9MSBtZV9yYW5nZT0xNiBjaHJvbWFfbWU9MSB0cmVsbG' + 'lzPTEgOHg4ZGN0PTAgY3FtPTAgZGVhZHpvbmU9MjEsMTEgZmFzdF9wc2tpcD0xIGNocm9tYV' + '9xcF9vZmZzZXQ9LTIgdGhyZWFkcz02IGxvb2thaGVhZF90aHJlYWRzPTEgc2xpY2VkX3Rocm' + 'VhZHM9MCBucj0wIGRlY2ltYXRlPTEgaW50ZXJsYWNlZD0wIGJsdXJheV9jb21wYXQ9MCBjb2' + '5zdHJhaW5lZF9pbnRyYT0wIGJmcmFtZXM9MCB3ZWlnaHRwPTAga2V5aW50PTI1MCBrZXlpbn' + 'RfbWluPTI1IHNjZW5lY3V0PTQwIGludHJhX3JlZnJlc2g9MCByY19sb29rYWhlYWQ9NDAgcm' + 'M9Y3JmIG1idHJlZT0xIGNyZj0yMy4wIHFjb21wPTAuNjAgcXBtaW49MCBxcG1heD02OSBxcH' + 'N0ZXA9NCB2YnZfbWF4cmF0ZT03NjggdmJ2X2J1ZnNpemU9MzAwMCBjcmZfbWF4PTAuMCBuYW' + 'xfaHJkPW5vbmUgZmlsbGVyPTAgaXBfcmF0aW89MS40MCBhcT0xOjEuMDAAgAAAAFZliIQL8m' + 'KAAKvMnJycnJycnJycnXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' + 'XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXiEASZACGQAjgCEASZACGQAjgAAAAAdBmjgX4G' + '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' + 'AAAAAAAABAAAAAAAAAAAAAAAAAAAAkZWR0cwAAABxlbHN0AAAAAAAAAAEAAAQkAAADcAABAA' + 'AAAAPgbWRpYQAAACBtZGhkAAAAAAAAAAAAAAAAAAC7gAAAykBVxAAAAAAALWhkbHIAAAAAAA' + 'AAAHNvdW4AAAAAAAAAAAAAAABTb3VuZEhhbmRsZXIAAAADi21pbmYAAAAQc21oZAAAAAAAAA' + 'AAAAAAJGRpbmYAAAAcZHJlZgAAAAAAAAABAAAADHVybCAAAAABAAADT3N0YmwAAABnc3RzZA' + 'AAAAAAAAABAAAAV21wNGEAAAAAAAAAAQAAAAAAAAAAAAIAEAAAAAC7gAAAAAAAM2VzZHMAAA' + 'AAA4CAgCIAAgAEgICAFEAVBbjYAAu4AAAADcoFgICAAhGQBoCAgAECAAAAIHN0dHMAAAAAAA' + 'AAAgAAADIAAAQAAAAAAQAAAkAAAAFUc3RzYwAAAAAAAAAbAAAAAQAAAAEAAAABAAAAAgAAAA' + 'IAAAABAAAAAwAAAAEAAAABAAAABAAAAAIAAAABAAAABgAAAAEAAAABAAAABwAAAAIAAAABAA' + 'AACAAAAAEAAAABAAAACQAAAAIAAAABAAAACgAAAAEAAAABAAAACwAAAAIAAAABAAAADQAAAA' + 'EAAAABAAAADgAAAAIAAAABAAAADwAAAAEAAAABAAAAEAAAAAIAAAABAAAAEQAAAAEAAAABAA' + 'AAEgAAAAIAAAABAAAAFAAAAAEAAAABAAAAFQAAAAIAAAABAAAAFgAAAAEAAAABAAAAFwAAAA' + 'IAAAABAAAAGAAAAAEAAAABAAAAGQAAAAIAAAABAAAAGgAAAAEAAAABAAAAGwAAAAIAAAABAA' + 'AAHQAAAAEAAAABAAAAHgAAAAIAAAABAAAAHwAAAAQAAAABAAAA4HN0c3oAAAAAAAAAAAAAAD' + 'MAAAAaAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' + 'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAA' + 'kAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAA' + 'AACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAAAJAAAACQAAAAkAAACMc3RjbwAAAA' + 'AAAAAfAAAALAAAA1UAAANyAAADhgAAA6IAAAO+AAAD0QAAA+0AAAQAAAAEHAAABC8AAARLAA' + 'AEZwAABHoAAASWAAAEqQAABMUAAATYAAAE9AAABRAAAAUjAAAFPwAABVIAAAVuAAAFgQAABZ' + '0AAAWwAAAFzAAABegAAAX7AAAGFwAAAGJ1ZHRhAAAAWm1ldGEAAAAAAAAAIWhkbHIAAAAAAA' + 'AAAG1kaXJhcHBsAAAAAAAAAAAAAAAALWlsc3QAAAAlqXRvbwAAAB1kYXRhAAAAAQAAAABMYX' + 'ZmNTUuMzMuMTAw';
   var blankSources = {
-    'audio': BLANK_AUDIO_SRC,
-    'video': BLANK_VIDEO_SRC
+    audio: {
+      src: BLANK_AUDIO_SRC,
+      type: 'audio/wav'
+    },
+    video: {
+      src: BLANK_VIDEO_SRC,
+      type: 'video/mp4'
+    }
   };
   /** @const @enum {string} */
 
@@ -4816,7 +4829,8 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
             _ref$loop = _ref.loop,
             loop = _ref$loop === void 0 ? false : _ref$loop,
             _ref$controls = _ref.controls,
-            controls = _ref$controls === void 0 ? false : _ref$controls;
+            controls = _ref$controls === void 0 ? false : _ref$controls,
+            altText = _ref.altText;
         var player = undefined;
 
         if (!this.unAllocatedPlayers[playerType]) {
@@ -4832,6 +4846,7 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
         if (player) {
           player.pause();
           player.getMediaElement().loop = loop;
+          player.getMediaElement().setAttribute('alt', altText);
           player.poster(poster);
           player.controls(controls);
 
@@ -4864,7 +4879,7 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
           player.controls(false);
           player.getMediaElement().loop = false;
           player.playsinline(false);
-          player.getMediaElement().setAttribute('src', blankSources[type]);
+          player.src(blankSources[type]);
           player.poster('');
           clearTextTracks(player);
           this.unAllocatedPlayers[type].push(player);
@@ -4935,7 +4950,7 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
           mediaElement: mediaEl,
           tagName: type
         });
-        mediaEl.setAttribute('src', blankSources[type]);
+        mediaEl.setAttribute('src', blankSources[type].src);
         this.unAllocatedPlayers[type].push(player);
         return player;
       }
@@ -5194,6 +5209,14 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
         this[id] = sources;
       },
       get: function get(sourceID) {
+        if (!this[sourceID]) {
+          return new AudioPlayer.Null();
+        }
+
+        if (this.current && this.current.playerId === sourceID) {
+          return this.current;
+        }
+
         if (this.previous && this.previous.playerId === sourceID) {
           var holder = this.current;
           this.current = this.previous;
@@ -9144,14 +9167,18 @@ this.pageflow_paged.frontend = (function (exports, jqueryUi, $, Backbone, _, Vid
     }
   };
 
+  if (VideoJS.Html5DashJS) {
+    VideoJS.Html5DashJS.hook('beforeinitialize', function (player, mediaPlayer) {
+      mediaPlayer.getDebug().setLogToBrowserConsole(false);
+    });
+  }
+
   VideoPlayer.Lazy = Lazy;
 
   exports.AdjacentPreloader = AdjacentPreloader;
   exports.Atmo = Atmo;
   exports.Audio = Audio;
   exports.AudioPlayer = AudioPlayer;
-  exports.BLANK_AUDIO_SRC = BLANK_AUDIO_SRC;
-  exports.BLANK_VIDEO_SRC = BLANK_VIDEO_SRC;
   exports.ChapterFilter = ChapterFilter;
   exports.DelayedStart = DelayedStart;
   exports.DomOrderScrollNavigator = DomOrderScrollNavigator;