pageflow 15.8.0 → 16.1.0

data/lib/pageflow/seeds.rb

@@ -19,7 +19,7 @@ module Pageflow
   module Seeds
     DEFAULT_USER_PASSWORD = '!Pass123'
 
-    # Create an {Account} with a default {Theming} if no account by
+    # Create an {Account} with a default {Site} if no account by
     # that name exists.
     #
     # @param [Hash] attributes  attributes to override defaults
@@ -30,29 +30,29 @@ module Pageflow
       Account.find_or_create_by!(attributes.slice(:name)) do |account|
         account.attributes = attributes.reverse_merge(name: 'Pageflow')
 
-        build_default_theming_for(account)
+        build_default_site_for(account)
 
         say_creating_account(account)
         yield(account) if block_given?
       end
     end
 
-    # Build a default {Theming} for an {Account}. To be used inside a
+    # Build a default {Site} for an {Account}. To be used inside a
     # block passed to {#account}.
     #
     # @example
     #
     #   account(name: 'example') do |account|
-    #     build_default_theming_for(account) do |theming|
-    #       theming.theme_name = 'mdr'
+    #     build_default_site_for(account) do |site|
+    #       site.theme_name = 'mdr'
     #     end
     #   end
     #
     # @param [Account] account  the account to build a default themeing for
     # @param [Hash] attributes  further attributes to override defaults
-    # @yield [theming] a block which is passed the newly built theming
-    # @return [Theming] newly built theming
-    def build_default_theming_for(account, attributes = {}, &block)
+    # @yield [site] a block which is passed the newly built site
+    # @return [Site] newly built site
+    def build_default_site_for(account, attributes = {}, &block)
       default_attributes = {
         imprint_link_label: 'Impressum',
         imprint_link_url: 'http://example.com/impressum.html',
@@ -60,7 +60,7 @@ module Pageflow
         copyright_link_url: 'http://www.example.com/copyright.html'
       }
 
-      account.build_default_theming(default_attributes.merge(attributes), &block)
+      account.build_default_site(default_attributes.merge(attributes), &block)
     end
 
     # Create a {User} if none with the given email exists yet.
@@ -97,33 +97,36 @@ module Pageflow
       end
     end
 
-    # Create a sample {Entry} with some chapter and pages if no
-    # entry with that title exists in the given account.
+    # Create a sample {Entry} with some chapter, pages, and optional
+    # text if no entry with that title exists in the given account.
     #
     # @param [Hash] attributes  attributes to override defaults
     # @option attributes [Account] :account  required
-    # @option attributes [title] :title  required
+    # @option attributes [String] :title  required
+    # @option attributes [String] :text optional
     # @yield [entry] a block to be called before the entry is saved
     # @return [Entry] newly created entry
     def sample_entry(attributes)
       entry = Entry.where(attributes.slice(:account, :title)).first
+      page_text = attributes.delete(:text) { |_| '' }
 
       if entry.nil?
         entry = Entry.create!(attributes) do |created_entry|
-          created_entry.theming = attributes.fetch(:account).default_theming
+          created_entry.site = attributes.fetch(:account).default_site
 
           say_creating_entry(created_entry)
           yield(created_entry) if block_given?
         end
 
         storyline = entry.draft.storylines.first
-
         chapter = storyline.chapters.create!(title: 'Chapter 1', position: 0)
-        chapter.pages.create!(template: 'background_image')
-        chapter.pages.create!(template: 'background_image')
+        chapter.pages.create!(template: 'background_image',
+                              configuration: {text: page_text})
+        chapter.pages.create!(template: 'background_image',
+                              configuration: {text: page_text})
 
         chapter = storyline.chapters.create!(title: 'Chapter 2', position: 1)
-        chapter.pages.create!(template: 'video')
+        chapter.pages.create!(template: 'video', configuration: {text: page_text})
       end
 
       entry

data/lib/pageflow/theme_customizations.rb

@@ -5,10 +5,10 @@ module Pageflow
   # @since 15.7
   class ThemeCustomizations
     # Override theme options and files for entries of an entry type in
-    # a specific account.
-    def update(account:, entry_type_name:, overrides: {}, file_ids: {})
+    # a specific site.
+    def update(site:, entry_type_name:, overrides: {}, file_ids: {})
       ThemeCustomization
-        .find_or_initialize_by(account: account, entry_type_name: entry_type_name)
+        .find_or_initialize_by(site: site, entry_type_name: entry_type_name)
         .update!(overrides: overrides, selected_file_ids: file_ids)
     end
 
@@ -16,10 +16,10 @@ module Pageflow
     # its theme without actually updating the theme customization.
     #
     # @return [PublishedEntry]
-    def preview(account:, entry:, overrides: {}, file_ids: {})
+    def preview(site:, entry:, overrides: {}, file_ids: {})
       theme_customization =
         ThemeCustomization
-        .find_or_initialize_by(account: account, entry_type_name: entry.type_name)
+        .find_or_initialize_by(site: site, entry_type_name: entry.type_name)
 
       theme_customization.assign_attributes(overrides: overrides, selected_file_ids: file_ids)
 
@@ -30,12 +30,12 @@ module Pageflow
       PublishedEntry.new(entry, entry.draft, theme: theme)
     end
 
-    # Get customization for entry type and account.
+    # Get customization for entry type and site.
     #
     # @return [ThemeCustomization]
-    def get(account:, entry_type_name:)
+    def get(site:, entry_type_name:)
       ThemeCustomization
-        .find_or_initialize_by(account: account, entry_type_name: entry_type_name)
+        .find_or_initialize_by(site: site, entry_type_name: entry_type_name)
     end
 
     # Upload a file that shall be used to customize a theme. Uploading
@@ -43,10 +43,10 @@ module Pageflow
     # assign a role via the `file_ids` parameter.
     #
     # @return [ThemeCustomizationFile]
-    def upload_file(account:, entry_type_name:, type_name:, attachment:)
+    def upload_file(site:, entry_type_name:, type_name:, attachment:)
       theme_customization_file =
         ThemeCustomization
-        .find_or_create_by(account: account, entry_type_name: entry_type_name)
+        .find_or_create_by(site: site, entry_type_name: entry_type_name)
         .uploaded_files
         .build(type_name: type_name)
 

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '15.8.0'.freeze
+  VERSION = '16.1.0'.freeze
 end

data/lib/pageflow/widget_types.rb

@@ -41,6 +41,10 @@ module Pageflow
       @widget_types.fetch(name, &block)
     end
 
+    def type_name?(name)
+      @widget_types.key?(name)
+    end
+
     def default_configuration(name)
       @default_configurations[name]
     end

data/package/config/webpack5.js

@@ -0,0 +1,14 @@
+module.exports = {
+  externals: {
+    'backbone': 'Backbone',
+    'backbone.babysitter': 'Backbone.ChildViewContainer',
+    'cocktail': 'Cocktail',
+    'jquery': 'jQuery',
+    'jquery-ui': 'jQuery',
+    'jquery.minicolors': 'jQuery',
+    'underscore': '_',
+    'backbone.marionette': 'Backbone.Marionette',
+    'iscroll': 'IScroll',
+    'wysihtml5': 'wysihtml5'
+  }
+};

data/package/editor.js

@@ -1,12 +1,13 @@
 import Backbone from 'backbone';
 import _ from 'underscore';
-import { Object as Object$1, ConfigurationEditorTabView, TextInputView, UrlDisplayView, TabsView, ConfigurationEditorView, CollectionView, tooltipContainer, SelectInputView, inputView, TextAreaInputView, CheckBoxGroupInputView, i18nUtils, TableView, TextTableCellView, PresenceTableCellView, SortableCollectionView, DeleteRowTableCellView, CheckBoxInputView, SliderInputView, IconTableCellView } from 'pageflow/ui';
+import { Object as Object$1, ConfigurationEditorTabView, TextInputView, UrlDisplayView, TabsView, ConfigurationEditorView, CollectionView, tooltipContainer, SelectInputView, inputView, TextAreaInputView, CheckBoxGroupInputView, i18nUtils, TableView, TextTableCellView, PresenceTableCellView, SortableCollectionView, attributeBinding, DeleteRowTableCellView, CheckBoxInputView, SliderInputView, IconTableCellView } from 'pageflow/ui';
 export * from 'pageflow/ui';
 import Cocktail from 'cocktail';
 import I18n$1 from 'i18n-js';
 import Marionette from 'backbone.marionette';
 import $ from 'jquery';
 import { browser, features, Audio, events } from 'pageflow/frontend';
+import 'jquery-ui';
 
 (function () {
   var sync = Backbone.sync;
@@ -234,7 +235,7 @@ var UnmatchedUploadError = UploadError.extend({
 });
 var validFileTypeTranslationList = {
   validFileTypeTranslations: function validFileTypeTranslations(validFileTypes) {
-    return _.map(validFileTypes, function (validFileType) {
+    return validFileTypes.map(function (validFileType) {
       return I18n$1.t('activerecord.models.' + validFileType.i18nKey + '.other');
     }).join(', ');
   }
@@ -264,7 +265,7 @@ var InvalidNestedTypeError = UploadError.extend({
   initialize: function initialize(upload, options) {
     var editor = options.editor;
     var fileType = options.fileType;
-    var validFileTypes = editor.nextUploadTargetFile.fileType().nestedFileTypes.fileTypes;
+    var validFileTypes = editor.nextUploadTargetFile.fileType().nestedFileTypes;
     var validFileTypeTranslations = this.validFileTypeTranslations(validFileTypes);
     var typeI18nKey = fileType.i18nKey;
     var typeSingularTranslation = I18n$1.t('activerecord.models.' + typeI18nKey + '.one');
@@ -578,22 +579,31 @@ var FileTypes = Object$1.extend({
     this.clientSideConfigModifications[name].push(config);
   },
   setup: function setup(serverSideConfigs) {
+    var _this = this;
+
     var clientSideConfigs = this.clientSideConfigs;
     this._setup = true;
-    this.collection = new FileTypesCollection(_.map(serverSideConfigs, function (serverSideConfig) {
+
+    var configs = _.chain(serverSideConfigs).map(function (serverSideConfig) {
       var clientSideConfig = clientSideConfigs[serverSideConfig.collectionName];
 
       if (!clientSideConfig) {
         throw 'Missing client side config for file type "' + serverSideConfig.collectionName + '"';
       }
 
-      _(this.clientSideConfigModifications[serverSideConfig.collectionName]).each(function (modification) {
+      _(_this.clientSideConfigModifications[serverSideConfig.collectionName]).each(function (modification) {
         this.lintModification(modification, serverSideConfig.collectionName);
         this.applyModification(clientSideConfig, modification);
-      }, this);
+      }, _this);
 
-      return new FileType(_.extend({}, serverSideConfig, clientSideConfig));
-    }, this));
+      return _.extend({}, serverSideConfig, clientSideConfig);
+    }).sortBy(function (config) {
+      return config.priority || 10;
+    }).value();
+
+    this.collection = new FileTypesCollection(_.map(configs, function (config) {
+      return new FileType(config);
+    }));
     var those = this;
 
     _.map(serverSideConfigs, function (serverSideConfig) {
@@ -1107,10 +1117,12 @@ var EditorApi = Object$1.extend(
    * Trigger selection of the given file type with the given
    * handler. Payload hash is passed to selection handler as options.
    *
-   * @param {string|{name: string, filter: string}} fileType
+   * @param {string|{name: string, filter: string}|{defaultTab: string, filter: string}} fileType
    *   Either collection name of a file type or and object containing
    *   the collection name a file type and a the name of a file type
-   *   filter.
+   *   filter or an object containingn a defaultTab property that controls
+   *   which tab will visible initially, while allowing selecting files of
+   *   any type.
    *
    * @param {string} handlerName
    *   The name of a handler registered via {@link
@@ -1136,7 +1148,7 @@ var EditorApi = Object$1.extend(
       };
     }
 
-    this.navigate('/files/' + fileType.name + '?handler=' + handlerName + '&payload=' + encodeURIComponent(JSON.stringify(payload)) + (fileType.filter ? '&filter=' + fileType.filter : ''), {
+    this.navigate('/files/' + (fileType.defaultTab ? "".concat(fileType.defaultTab, ":default") : fileType.name) + '?handler=' + handlerName + '&payload=' + encodeURIComponent(JSON.stringify(payload)) + (fileType.filter ? '&filter=' + fileType.filter : ''), {
       trigger: true
     });
   },
@@ -2684,10 +2696,10 @@ var EditLockContainer = Backbone.Model.extend({
   handleError: function handleError() {}
 });
 
-var Theming = Backbone.Model.extend({
-  modelName: 'theming',
-  i18nKey: 'pageflow/theming',
-  collectionName: 'themings'
+var Site = Backbone.Model.extend({
+  modelName: 'site',
+  i18nKey: 'pageflow/site',
+  collectionName: 'sites'
 });
 
 var ChapterConfiguration = Configuration.extend({
@@ -3555,6 +3567,13 @@ var ForeignKeySubsetCollection = SubsetCollection.extend({
     var parent = options.parent;
     var parentModel = options.parentModel;
     this.autoConsolidatePositions = options.autoConsolidatePositions;
+    this.listenTo(this, 'add', function (model) {
+      if (options.parentReferenceAttribute) {
+        model[options.parentReferenceAttribute] = parentModel;
+      }
+
+      model.set(options.foreignKeyAttribute, parentModel.id);
+    });
     SubsetCollection.prototype.constructor.call(this, {
       parent: parent,
       parentModel: parentModel,
@@ -3565,13 +3584,6 @@ var ForeignKeySubsetCollection = SubsetCollection.extend({
         return item.get('position');
       }
     });
-    this.listenTo(this, 'add', function (model) {
-      if (options.parentReferenceAttribute) {
-        model[options.parentReferenceAttribute] = parentModel;
-      }
-
-      model.set(options.foreignKeyAttribute, parentModel.id);
-    });
     this.listenTo(parentModel, 'destroy dependentDestroy', function () {
       this.invoke('trigger', 'dependentDestroy');
       this.clear();
@@ -3824,6 +3836,64 @@ var SidebarRouter = Marionette.AppRouter.extend({
   }
 });
 
+function _arrayWithHoles(arr) {
+  if (Array.isArray(arr)) return arr;
+}
+
+function _iterableToArrayLimit(arr, i) {
+  if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
+  var _arr = [];
+  var _n = true;
+  var _d = false;
+  var _e = undefined;
+
+  try {
+    for (var _i = arr[Symbol.iterator](), _s; !(_n = (_s = _i.next()).done); _n = true) {
+      _arr.push(_s.value);
+
+      if (i && _arr.length === i) break;
+    }
+  } catch (err) {
+    _d = true;
+    _e = err;
+  } finally {
+    try {
+      if (!_n && _i["return"] != null) _i["return"]();
+    } finally {
+      if (_d) throw _e;
+    }
+  }
+
+  return _arr;
+}
+
+function _arrayLikeToArray(arr, len) {
+  if (len == null || len > arr.length) len = arr.length;
+
+  for (var i = 0, arr2 = new Array(len); i < len; i++) {
+    arr2[i] = arr[i];
+  }
+
+  return arr2;
+}
+
+function _unsupportedIterableToArray(o, minLen) {
+  if (!o) return;
+  if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+  var n = Object.prototype.toString.call(o).slice(8, -1);
+  if (n === "Object" && o.constructor) n = o.constructor.name;
+  if (n === "Map" || n === "Set") return Array.from(n);
+  if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+}
+
+function _nonIterableRest() {
+  throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
+}
+
+function _slicedToArray(arr, i) {
+  return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
+}
+
 function template$3(data) {
 var __t, __p = '';
 __p += '<a class="back">' +
@@ -4514,6 +4584,13 @@ return __p
  *   Require click to open menu. By default, menu opens on when the
  *   mouse enters the button.
  *
+ * @param {String} [options.alignMenu]
+ *   "right" to align menu on the right. Aligned on the left by
+ *   default.
+ *
+ * @param {String} [options.buttonClassName]
+ *   CSS class name for button element.
+ *
  * ## Item Models
  *
  * The following model attributes can be used to control the
@@ -4553,7 +4630,9 @@ var DropDownButtonView = Marionette.ItemView.extend({
     this.$el.toggleClass('full_width', !!this.options.fullWidth);
     this.ui.button.toggleClass('has_icon_and_text', !!this.options.label);
     this.ui.button.toggleClass('has_icon_only', !this.options.label);
+    this.ui.button.toggleClass('ellipsis_icon', !!this.options.ellipsisIcon);
     this.ui.button.text(this.options.label);
+    this.ui.button.addClass(this.options.buttonClassName);
     this.ui.menu.append(this.subview(new DropDownButtonItemListView({
       items: this.options.items
     })).el);
@@ -4577,7 +4656,7 @@ var DropDownButtonView = Marionette.ItemView.extend({
     var offset = this.$el.offset();
     this.ui.menu.css({
       top: offset.top + this.$el.height(),
-      left: offset.left,
+      left: this.options.alignMenu === 'right' ? offset.left + this.$el.width() - this.ui.menu.outerWidth() : offset.left,
       width: this.options.fullWidth ? this.$el.width() : null
     });
   },
@@ -4712,6 +4791,7 @@ var FileInputView = Marionette.ItemView.extend({
     if (dropDownMenuItems.length) {
       this.appendSubview(new DropDownButtonView({
         items: dropDownMenuItems,
+        ellipsisIcon: true,
         openOnClick: true
       }));
     }
@@ -5272,7 +5352,7 @@ var EditMetaDataView = Marionette.Layout.extend({
     configurationEditor.tab('widgets', function () {
       editor.entryType.appearanceInputs && editor.entryType.appearanceInputs(this, {
         entry: entry,
-        theming: state.theming
+        site: state.site
       });
       entry.widgets && this.view(EditWidgetsView, {
         model: entry,
@@ -6302,7 +6382,7 @@ var FilesView = Marionette.ItemView.extend({
     this.$el.append(this.subview(this.tabsView).el);
   },
   tab: function tab(fileType) {
-    var selectionMode = this.options.tabName === fileType.collectionName;
+    var selectionMode = this.options.allowSelectingAny || this.options.tabName === fileType.collectionName;
     this.tabsView.tab(fileType.collectionName, _.bind(function () {
       return this.subview(new FilteredFilesView({
         entry: state.entry,
@@ -6488,10 +6568,10 @@ var PublishEntryView = Marionette.ItemView.extend({
       this.ui.publishUntilField.datepicker('setDate', publishedUntil);
       this.ui.publishUntilTimeField.val(timeStr(publishedUntil));
     } else {
-      this.ui.publishUntilField.datepicker('setDate', oneYearFromNow());
+      this.ui.publishUntilField.datepicker('setDate', this.defaultPublishedUntilDate());
     }
 
-    this.ui.userNameField.val(state.account.get('name'));
+    this.ui.userNameField.val(this.options.account.get('name'));
 
     if (this.model.get('password_protected')) {
       this.ui.passwordProtectedCheckBox.prop('checked', true);
@@ -6511,12 +6591,6 @@ var PublishEntryView = Marionette.ItemView.extend({
         return ("0" + val).slice(-2);
       }
     }
-
-    function oneYearFromNow() {
-      var date = new Date();
-      date.setFullYear(date.getFullYear() + 1);
-      return date;
-    }
   },
   save: function save() {
     var publishedUntil = null;
@@ -6591,6 +6665,11 @@ var PublishEntryView = Marionette.ItemView.extend({
       return false;
     }
   },
+  defaultPublishedUntilDate: function defaultPublishedUntilDate() {
+    var date = new Date();
+    date.setMonth(date.getMonth() + this.options.config.defaultPublishedUntilDurationInMonths);
+    return date;
+  },
   enableSave: function enableSave() {
     this.ui.saveButton.removeAttr('disabled');
   },
@@ -6690,10 +6769,16 @@ var SidebarController = Marionette.Controller.extend({
     }));
   },
   files: function files(collectionName, handler, payload, filterName) {
+    var _split = (collectionName || '').split(':'),
+        _split2 = _slicedToArray(_split, 2),
+        tabName = _split2[0],
+        suffix = _split2[1];
+
     this.region.show(new FilesView({
       model: this.entry,
       selectionHandler: handler && editor.createFileSelectionHandler(handler, payload),
-      tabName: collectionName,
+      tabName: tabName,
+      allowSelectingAny: suffix === 'default',
       filterName: filterName
     }));
     editor.setDefaultHelpEntry('pageflow.help_entries.files');
@@ -6720,7 +6805,9 @@ var SidebarController = Marionette.Controller.extend({
   publish: function publish() {
     this.region.show(PublishEntryView.create({
       model: this.entry,
-      entryPublication: new EntryPublication()
+      account: state.account,
+      entryPublication: new EntryPublication(),
+      config: state.config
     }));
     editor.setDefaultHelpEntry('pageflow.help_entries.publish');
   },
@@ -7090,7 +7177,15 @@ var HelpImageView = Marionette.View.extend({
 
 var InfoBoxView = Marionette.View.extend({
   className: 'info_box',
+  mixins: [attributeBinding],
+  initialize: function initialize() {
+    this.setupBooleanAttributeBinding('visible', this.updateVisible);
+  },
+  updateVisible: function updateVisible() {
+    this.$el.toggleClass('hidden_via_binding', this.getBooleanAttributBoundOption('visible') === false);
+  },
   render: function render() {
+    this.$el.addClass(this.options.level);
     this.$el.html(this.options.text);
     return this;
   }
@@ -8006,6 +8101,10 @@ app.addInitializer(function () {
   });
 });
 
+var OtherFile = UploadableFile.extend({
+  thumbnailPictogram: 'other'
+});
+
 app.addInitializer(function (options) {
   var textTracksMetaDataAttribute = {
     name: 'text_tracks',
@@ -8115,6 +8214,18 @@ app.addInitializer(function (options) {
       binding: 'label'
     }
   });
+  editor.fileTypes.register('other_files', {
+    model: OtherFile,
+    metaDataAttributes: [altMetaDataAttribute],
+    matchUpload: function matchUpload() {
+      return true;
+    },
+    priority: 100,
+    configurationEditorInputs: [{
+      name: 'alt',
+      inputView: TextInputView
+    }]
+  });
   editor.fileTypes.setup(options.config.fileTypes);
 });
 
@@ -8141,7 +8252,7 @@ app.addInitializer(function (options) {
   state.entry = editor.createEntryModel(options, {
     widgets: widgets
   });
-  state.theming = new Theming(options.theming);
+  state.site = new Site(options.site);
   state.account = new Backbone.Model(options.account);
   widgets.subject = state.entry;
   state.storylineOrdering = new StorylineOrdering(state.storylines, state.pages);
@@ -8257,4 +8368,4 @@ app.addRegions({
   sidebarFooterRegion: 'sidebar .sidebar_footer_container'
 });
 
-export { AudioFile, BackButtonDecoratorView, BackgroundImageEmbeddedView, BackgroundPositioningPreviewView, BackgroundPositioningSlidersView, BackgroundPositioningView, ChangeThemeDialogView, Chapter, ChapterConfiguration, ChapterPagesCollection, ChapterScaffold, ChaptersCollection, ChooseImporterView, Configuration, ConfirmEncodingView, ConfirmFileImportUploadView, ConfirmUploadView, ConfirmableFileItemView, DropDownButtonItemListView, DropDownButtonItemView, DropDownButtonView, EditConfigurationView, EditEntryView, EditFileView, EditLock, EditLockContainer, EditMetaDataView, EditWidgetView, EditWidgetsView, EditorApi, EditorView, EmulationModeButtonView, EncodedFile, EncodingConfirmation, Entry, EntryMetadata, EntryMetadataFileSelectionHandler, EntryPublication, EntryPublicationQuotaDecoratorView, ExplorerFileItemView, Failure, FileConfiguration, FileImport, FileInputView, FileItemView, FileMetaDataItemValueView, FileMetaDataItemView, FileProcessingStateDisplayView, FileReuse, FileSettingsDialogView, FileStage, FileStageItemView, FileThumbnailView, FileTypes, FileTypesCollection, FileUploader, FilesCollection, FilesExplorerView, FilesImporterView, FilesView, FilteredFilesView, ForeignKeySubsetCollection, HelpButtonView, HelpImageView, HelpView, ImageFile, InfoBoxView, InvalidNestedTypeError, LazyVideoEmbeddedView, ListItemView, ListView, LoadingView, LockedView, ModelThumbnailView, NestedFilesCollection, NestedFilesView, NestedTypeError, NotificationsView, OrderedPageLinksCollection, OtherEntriesCollection, OtherEntriesCollectionView, OtherEntry, OtherEntryItemView, Page, PageConfigurationFileSelectionHandler, PageLink, PageLinkConfigurationEditorView, PageLinkFileSelectionHandler, PageLinkItemView, PageLinksCollection, PageLinksView, PageThumbnailView, PagesCollection, PublishEntryView, ReferenceInputView, ReusableFile, Scaffold, ScrollingView, SelectButtonView, SidebarController, SidebarFooterView, SidebarRouter, StaticThumbnailView, Storyline, StorylineChaptersCollection, StorylineConfiguration, StorylineOrdering, StorylineScaffold, StorylineTransitiveChildPages, StorylinesCollection, SubsetCollection, TextFileMetaDataItemValueView, TextTrackFile, TextTracksFileMetaDataItemValueView, TextTracksView, Theme, ThemeInputView, ThemeItemView, ThemesCollection, Theming, UnmatchedUploadError, UploadError, UploadableFile, UploadableFilesView, UploaderView, VideoFile, Widget, WidgetConfiguration, WidgetConfigurationFileSelectionHandler, WidgetItemView, WidgetTypes, WidgetsCollection, addAndReturnModel, app, authenticationProvider, configurationContainer, delayedDestroying, dialogView, editor, entryTypeEditorControllerUrls, failureIndicatingView, failureTracking, fileWithType, filesCountWatcher, formDataUtils, loadable, modelLifecycleTrackingView, orderedCollection, persistedPromise, polling, retryable, selectableView, stageProvider, startEditor, state, stylesheet, transientReferences, validFileTypeTranslationList };
+export { AudioFile, BackButtonDecoratorView, BackgroundImageEmbeddedView, BackgroundPositioningPreviewView, BackgroundPositioningSlidersView, BackgroundPositioningView, ChangeThemeDialogView, Chapter, ChapterConfiguration, ChapterPagesCollection, ChapterScaffold, ChaptersCollection, ChooseImporterView, Configuration, ConfirmEncodingView, ConfirmFileImportUploadView, ConfirmUploadView, ConfirmableFileItemView, DropDownButtonItemListView, DropDownButtonItemView, DropDownButtonView, EditConfigurationView, EditEntryView, EditFileView, EditLock, EditLockContainer, EditMetaDataView, EditWidgetView, EditWidgetsView, EditorApi, EditorView, EmulationModeButtonView, EncodedFile, EncodingConfirmation, Entry, EntryMetadata, EntryMetadataFileSelectionHandler, EntryPublication, EntryPublicationQuotaDecoratorView, ExplorerFileItemView, Failure, FileConfiguration, FileImport, FileInputView, FileItemView, FileMetaDataItemValueView, FileMetaDataItemView, FileProcessingStateDisplayView, FileReuse, FileSettingsDialogView, FileStage, FileStageItemView, FileThumbnailView, FileTypes, FileTypesCollection, FileUploader, FilesCollection, FilesExplorerView, FilesImporterView, FilesView, FilteredFilesView, ForeignKeySubsetCollection, HelpButtonView, HelpImageView, HelpView, ImageFile, InfoBoxView, InvalidNestedTypeError, LazyVideoEmbeddedView, ListItemView, ListView, LoadingView, LockedView, ModelThumbnailView, NestedFilesCollection, NestedFilesView, NestedTypeError, NotificationsView, OrderedPageLinksCollection, OtherEntriesCollection, OtherEntriesCollectionView, OtherEntry, OtherEntryItemView, Page, PageConfigurationFileSelectionHandler, PageLink, PageLinkConfigurationEditorView, PageLinkFileSelectionHandler, PageLinkItemView, PageLinksCollection, PageLinksView, PageThumbnailView, PagesCollection, PublishEntryView, ReferenceInputView, ReusableFile, Scaffold, ScrollingView, SelectButtonView, SidebarController, SidebarFooterView, SidebarRouter, Site, StaticThumbnailView, Storyline, StorylineChaptersCollection, StorylineConfiguration, StorylineOrdering, StorylineScaffold, StorylineTransitiveChildPages, StorylinesCollection, SubsetCollection, TextFileMetaDataItemValueView, TextTrackFile, TextTracksFileMetaDataItemValueView, TextTracksView, Theme, ThemeInputView, ThemeItemView, ThemesCollection, UnmatchedUploadError, UploadError, UploadableFile, UploadableFilesView, UploaderView, VideoFile, Widget, WidgetConfiguration, WidgetConfigurationFileSelectionHandler, WidgetItemView, WidgetTypes, WidgetsCollection, addAndReturnModel, app, authenticationProvider, configurationContainer, delayedDestroying, dialogView, editor, entryTypeEditorControllerUrls, failureIndicatingView, failureTracking, fileWithType, filesCountWatcher, formDataUtils, loadable, modelLifecycleTrackingView, orderedCollection, persistedPromise, polling, retryable, selectableView, stageProvider, startEditor, state, stylesheet, transientReferences, validFileTypeTranslationList };

data/package/frontend.js

@@ -1240,7 +1240,7 @@ var volumeBinding = function volumeBinding(player, settings, options) {
   };
 
   player.targetVolume = function () {
-    return settings.get('volume') * volumeFactor;
+    return (options.ignoreVolumeSetting ? 1 : settings.get('volume')) * volumeFactor;
   };
 
   function listenToVolumeSetting() {
@@ -1615,6 +1615,21 @@ mediaPlayer.loadWaiting = loadWaiting;
 mediaPlayer.hooks = hooks;
 mediaPlayer.asyncPlay = asyncPlay;
 
+// Replacement for Underscore's throttle, because scrolled entries
+// don't have Underscore anymore
+function throttle(func, timeFrame) {
+  var lastTime = 0;
+  return function (options) {
+    var now = new Date();
+    func = func.bind(this);
+
+    if (now - lastTime >= timeFrame) {
+      func(options);
+      lastTime = now;
+    }
+  };
+}
+
 var mediaEvents = function mediaEvents(player, context) {
   function triggerMediaEvent(name) {
     events.trigger('media:' + name, {
@@ -1633,6 +1648,9 @@ var mediaEvents = function mediaEvents(player, context) {
   player.on('timeupdate', function () {
     triggerMediaEvent('timeupdate');
   });
+  player.on('timeupdate', throttle(function () {
+    triggerMediaEvent('timeupdate_throttled');
+  }, 5000));
   player.on('pause', function () {
     triggerMediaEvent('pause');
   });
@@ -2150,6 +2168,9 @@ var mediaEvents$1 = function mediaEvents(player, context) {
   player.on('timeupdate', function () {
     triggerMediaEvent('timeupdate');
   });
+  player.on('timeupdate', throttle(function () {
+    triggerMediaEvent('timeupdate_throttled');
+  }, 5000));
   player.on('pause', function () {
     triggerMediaEvent('pause');
   });
@@ -2291,11 +2312,13 @@ var createMediaPlayer = function createMediaPlayer(options) {
       nativeCaptions: !isAudio && browser.has('iphone platform'),
       // Only used by pageflow-scrolled
       vhs: {
-        useBandwidthFromLocalStorage: true
+        useBandwidthFromLocalStorage: true,
+        usePlayerObjectFit: true
       }
     },
     bufferUnderrunWaiting: true,
     fallbackToMutedAutoplay: !isAudio,
+    ignoreVolumeSetting: true,
     volumeFading: true,
     hooks: {},
     mediaEvents: true,
@@ -2524,6 +2547,7 @@ var MediaPool = /*#__PURE__*/function () {
         tagName: type
       });
       mediaEl.setAttribute('src', blankSources[type].src);
+      player.muted(true);
       this.unAllocatedPlayers[type].push(player);
       return player;
     }

data/package/testHelpers.js

@@ -174,7 +174,7 @@ var ConfigurationEditorTab = Base.extend({
     }).get();
   },
   visibleInputPropertyNames: function visibleInputPropertyNames() {
-    return this.$el.find('.input:not(.input-hidden_via_binding)').map(function () {
+    return this.$el.find('.input:not(.hidden_via_binding)').map(function () {
       return $(this).data('inputPropertyName');
     }).get();
   },