pageflow 15.1.0.beta3 → 15.1.0.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5d9a6a5ac383de659a43bebd5b2661ea4f6e4a23e7e38bcefec77081748c090
-  data.tar.gz: ede9d4a4348d772766395273832161b491610d8e3359981d2eadf84d7426f46d
+  metadata.gz: 166c3182b0589a880c80558131b53ef1ff295d2328465426ed3c092a70fc97cb
+  data.tar.gz: 55f8c842860cc5341fac1f229d74d129b0cfcccbcda396bba1e6939668172d95
 SHA512:
-  metadata.gz: dc22ea8b562e6c9eec9f824a237c1b8b484053cc8fbf5e9c7a1ae87b27d19d8d445ef8a7e306b2560379e3ba96ba8e5df058ac187cf0cce2d307018cab7c60be
-  data.tar.gz: 952e0196d24fe608826f65bb2c30f14898b7987ce70b667a0e275de01488817b49f84e7ae7c46a86281b9bf6480697b8ef13e891489f3ee807445e0c7abfa4d6
+  metadata.gz: 7e27a7162ef41977486a8f2b2ac7d8bf94711e71a44ca57add29b417ce5aadd4b5a971c265e4d151e5638e04564f8402ed30c99dc130540f4bad024646a6d557
+  data.tar.gz: 37b2612f199d9fdfcf6da88de329e4b9ebbad72c50ff11db1ded1b5c714a7157e9b2e9e951712fdd6726dfebf01aadbf2f8c64421aeb04faba52e71e8680ba7d

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # CHANGELOG
 
+### Version 15.1.0.beta4
+
+2020-01-29
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v15.1.0.beta3...v15.1.0.beta4)
+
+Forgot to build assets before doing previous release.
+
 ### Version 15.1.0.beta3
 
 2020-01-29

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

@@ -186,48 +186,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     findKeyWithTranslation: findKeyWithTranslation,
     translationKeysWithSuffix: translationKeysWithSuffix
   });
-
-  function _arrayWithHoles(arr) {
-    if (Array.isArray(arr)) return arr;
-  }
-
-  function _iterableToArrayLimit(arr, i) {
-    if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) {
-      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 _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance");
-  }
-
-  function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
-  }
   /**
    * Create object that can be passed to Marionette ui property from CSS
    * module object.
@@ -258,7 +216,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
    *         <div class=${styles.container}></div>
    *       `,
    *
-   *       ui: cssModulesUtils.ui(styles, 'container'),
+   *       ui: cssModulesUtils.ui(styles, 'container');
    *
    *       onRender() {
    *         this.ui.container // => JQuery wrapper for container element
@@ -268,98 +226,22 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
    * @memberof cssModulesUtils
    */
 
-
   function ui(styles) {
     for (var _len = arguments.length, classNames = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       classNames[_key - 1] = arguments[_key];
     }
 
     return classNames.reduce(function (result, className) {
-      result[className] = selector(styles, className);
-      return result;
-    }, {});
-  }
-  /**
-   * Create object that can be passed to Marionette events property from CSS
-   * module object.
-   *
-   * @param {Object} styles
-   *   Class name mapping imported from `.module.css` file.
-   *
-   * @param {Object} mapping
-   *   Events mapping using keys from the `styles` instead of CSS class names.
-   *
-   * @return {Object}
-   *
-   * @example
-   *
-   *     // MyView.module.css
-   *
-   *     .addButton {}
-   *
-   *     // MyView.js
-   *
-   *     import Marionette from 'marionette';
-   *     import {cssModulesUtils} from 'pageflow/ui';
-   *
-   *     import styles from './MyView.module.css';
-   *
-   *     export const MyView = Marionette.ItemView({
-   *       template: () => `
-   *         <button class=${styles.addButton}></button>
-   *       `,
-   *
-   *       events: cssModulesUtils.ui(styles, {
-   *         'click addButton': () => console.log('clicked add button');
-   *       })
-   *     });
-   *
-   * @memberof cssModulesUtils
-   */
-
-
-  function events(styles, mapping) {
-    return Object.keys(mapping).reduce(function (result, key) {
-      var _key$split = key.split(' '),
-          _key$split2 = _slicedToArray(_key$split, 2),
-          event = _key$split2[0],
-          className = _key$split2[1];
-
-      result["".concat(event, " ").concat(selector(styles, className))] = mapping[key];
+      result[className] = ".".concat(styles[className]);
       return result;
     }, {});
   }
-  /**
-   * Generates a CSS selector from a CSS module rule.
-   *
-   * @param {Object} styles
-   *   Class name mapping imported from `.module.css` file.
-   *
-   * @param {String} className
-   *   Key from the `styles` object.
-   *
-   * @return {String} CSS Selector
-   * @memberof cssModulesUtils
-   */
-
-
-  function selector(styles, className) {
-    var classNames = styles[className];
-
-    if (!classNames) {
-      throw new Error("Unknown class name ".concat(className, " in mapping. Knwon names: ").concat(Object.keys(styles).join(', '), "."));
-    }
-
-    return ".".concat(classNames.replace(/ /g, '.'));
-  }
 
   var cssModulesUtils =
   /*#__PURE__*/
   Object.freeze({
     __proto__: null,
-    ui: ui,
-    events: events,
-    selector: selector
+    ui: ui
   }); // https://github.com/jashkenas/backbone/issues/2601
 
   function BaseObject(options) {
@@ -3506,62 +3388,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     };
   });
 
-  // different model types.  Backbone.Collection tries to merge records
-  // if they have the same id.
-
-  var MultiCollection = function MultiCollection() {
-    this.records = {};
-    this.length = 0;
-  };
-
-  _$1.extend(MultiCollection.prototype, {
-    add: function add(record) {
-      if (!this.records[record.cid]) {
-        this.records[record.cid] = record;
-        this.length = _$1.keys(this.records).length;
-        this.trigger('add', record);
-      }
-    },
-    remove: function remove(record) {
-      if (this.records[record.cid]) {
-        delete this.records[record.cid];
-        this.length = _$1.keys(this.records).length;
-        this.trigger('remove', record);
-      }
-    },
-    isEmpty: function isEmpty() {
-      return this.length === 0;
-    }
-  });
-
-  _$1.extend(MultiCollection.prototype, Backbone.Events);
-
-  MultiCollection.extend = Backbone.Collection.extend;
-
-  /**
-   * Watch Backbone collections to track which models are currently
-   * being saved. Used to update the notifications view displaying
-   * saving status/failutes.
-   */
-
-  var SavingRecordsCollection = MultiCollection.extend({
-    /**
-     * Listen to events of models in collection to track when they are
-     * being saved.
-     *
-     * @param {Backbone.Collection} collection - Collection to watch.
-     */
-    watch: function watch(collection) {
-      var that = this;
-      this.listenTo(collection, 'request', function (model, xhr) {
-        that.add(model);
-        xhr.always(function () {
-          that.remove(model);
-        });
-      });
-    }
-  });
-
   var WidgetType = BaseObject.extend({
     initialize: function initialize(serverSideConfig, clientSideConfig) {
       this.name = serverSideConfig.name;
@@ -3651,15 +3477,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
        */
 
       this.failures = new FailuresAPI();
-      /**
-       * Tracking records that are currently being saved.
-       *
-       * @returns {SavingRecordsCollection}
-       * @memberof editor
-       * @since 15.1
-       */
-
-      this.savingRecords = new SavingRecordsCollection();
       /**
        * Set up editor integration for page types.
        * @memberof editor
@@ -3706,9 +3523,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
      *   Backbone view that will be rendered in the side bar.
      */
     registerEntryType: function registerEntryType(name, options) {
-      this.entryType = _objectSpread({
-        name: name
-      }, options);
+      this.entryType = options;
     },
     createEntryModel: function createEntryModel(seed, options) {
       var entry = new this.entryType.entryModel(seed.entry, options);
@@ -3900,9 +3715,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }
 
       var payloadJson = JSON.parse(decodeURIComponent(encodedPayload));
-      return new this.fileSelectionHandlers[handlerName](_objectSpread({}, payloadJson, {
-        entry: state.entry
-      }));
+      return new this.fileSelectionHandlers[handlerName](payloadJson);
     },
     createPageConfigurationEditorView: function createPageConfigurationEditorView(page, options) {
       var view = this.pageTypes.findByPage(page).createConfigurationEditorView(_$1.extend(options, {
@@ -3924,79 +3737,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     });
   };
 
-  /**
-   * Mixins for Backbone models and collections that use entry type
-   * specific editor controllers registered via the `editor_app` entry
-   * type option.
-   */
-
-  var entryTypeEditorControllerUrls = {
-    /**
-     * Mixins for Backbone collections that defines `url` method.
-     *
-     * @param {Object} options
-     * @param {String} options.resources - Path suffix of the controller route
-     *
-     * @example
-     *
-     * import {editor, entryTypeEditorControllerUrls} from 'pageflow/editor';
-     *
-     * editor.registerEntryType('test', {
-         // ...
-       });
-     *
-     * export const ItemsCollection = Backbone.Collection.extend({
-     *   mixins: [entryTypeEditorControllerUrls.forCollection({resources: 'items'})
-     * });
-     *
-     * new ItemsCollection().url() // => '/editor/entries/10/test/items'
-     */
-    forCollection: function forCollection(_ref) {
-      var resources = _ref.resources;
-      return {
-        url: function url() {
-          return entryTypeEditorControllerUrl(resources);
-        },
-        urlSuffix: function urlSuffix() {
-          return "/".concat(resources);
-        }
-      };
-    },
-
-    /**
-     * Mixins for Backbone models that defines `urlRoot` method.
-     *
-     * @param {Object} options
-     * @param {String} options.resources - Path suffix of the controller route
-     *
-     * @example
-     *
-     * import {editor, entryTypeEditorControllerUrls} from 'pageflow/editor';
-     *
-     * editor.registerEntryType('test', {
-       // ...
-       });
-     *
-     * export const Item = Backbone.Model.extend({
-     *   mixins: [entryTypeEditorControllerUrls.forModel({resources: 'items'})
-     * });
-     *
-     * new Item({id: 20}).url() // => '/editor/entries/10/test/items/20'
-     */
-    forModel: function forModel(_ref2) {
-      var resources = _ref2.resources;
-      return {
-        urlRoot: function urlRoot() {
-          return this.isNew() ? this.collection.url() : entryTypeEditorControllerUrl(resources);
-        }
-      };
-    }
-  };
-
-  function entryTypeEditorControllerUrl(resources) {
-    return [state.entry.url(), editor.entryType.name, resources].join('/');
-  }
-
   var formDataUtils = {
     fromModel: function fromModel(model) {
       var object = {};
@@ -4104,7 +3844,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.reset();
     },
     url: function url() {
-      return this.parentModel.url() + (_$1.result(this.parent, 'urlSuffix') || _$1.result(this.parent, 'url'));
+      return this.parentModel.url() + _$1.result(this.parent, 'url');
     },
     dispose: function dispose() {
       this.stopListening();
@@ -4413,22 +4153,10 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     Cocktail.mixin(Configuration, mixin);
   });
 
-  /**
-   * Remove model from collection only after the `DELETE` request has
-   * succeeded. Still allow tracking that the model is being destroyed
-   * by triggering a `destroying` event and adding a `isDestroying`
-   * method.
-   */
-
   var delayedDestroying = {
     initialize: function initialize() {
       this._destroying = false;
     },
-
-    /**
-     * Trigger `destroying` event and send `DELETE` request. Only remove
-     * model from collection once the request is done.
-     */
     destroyWithDelay: function destroyWithDelay() {
       var model = this;
       this._destroying = true;
@@ -4443,19 +4171,11 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         }
       });
     },
-
-    /**
-     * Get whether the model is currently being destroyed.
-     */
     isDestroying: function isDestroying() {
       return this._destroying;
     }
   };
 
-  /**
-   * Mixin for Backbone models that shall be watched by {@link
-   * modelLifecycleTrackingView} mixin.
-   */
   var failureTracking = {
     initialize: function initialize() {
       this._saveFailed = false;
@@ -5052,23 +4772,9 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  var EntryMetadataConfiguration = Configuration.extend({
-    modelName: 'entry_metadata_configuration',
-    i18nKey: 'pageflow/entry_metadata_configuration',
-    defaults: {}
-  });
-
-  var EntryMetadata = Configuration.extend({
+  var EntryConfiguration = Configuration.extend({
     modelName: 'entry',
-    i18nKey: 'pageflow/entry',
-    defaults: {},
-    initialize: function initialize(attributes, options) {
-      this.configuration = new EntryMetadataConfiguration(_$1.clone(attributes.configuration) || {});
-      this.listenTo(this.configuration, 'change', function () {
-        this.trigger('change');
-        this.parent.save();
-      });
-    }
+    i18nKey: 'pageflow/entry'
   });
 
   var StorylineConfiguration = Configuration.extend({
@@ -5247,16 +4953,16 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  var EntryMetadataFileSelectionHandler = function EntryMetadataFileSelectionHandler(options) {
+  var EntryConfigurationFileSelectionHandler = function EntryConfigurationFileSelectionHandler(options) {
     this.call = function (file) {
-      state.entry.metadata.setReference(options.attributeName, file);
+      state.entry.configuration.setReference(options.attributeName, file);
     };
 
     this.getReferer = function () {
       return '/meta_data/' + (options.returnToTab || 'general');
     };
   };
-  editor.registerFileSelectionHandler('entryMetadata', EntryMetadataFileSelectionHandler);
+  editor.registerFileSelectionHandler('entryConfiguration', EntryConfigurationFileSelectionHandler);
 
   var EntryPublication = Backbone.Model.extend({
     paramRoot: 'entry_publication',
@@ -5913,76 +5619,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   };
   editor.registerFileSelectionHandler('pageLink', PageLinkFileSelectionHandler);
 
-  /**
-   * Mixins for models with a nested configuration model.
-   *
-   * Triggers events on the parent model of the form
-   * `change:configuration` and `change:configuration:<attribute>`, when
-   * the configuration changes.
-   *
-   * @param {Object} [options]
-   * @param {Function} [options.configurationModel] -
-   *   Backbone model to use for nested configuration model.
-   * @param {Boolean} [options.autoSave] -
-   *   Save model when configuration changes.
-   * @param {Boolean|Array<String>} [options.includeAttributesInJSON] -
-   *   Include all or specific attributes of the parent model in the
-   *   data returned by `toJSON` besides the `configuration` property.
-   * @returns {Object} - Mixin to be included in model.
-   *
-   * @example
-   *
-   * import {configurationContainer} from 'pageflow/editor';
-   *
-   * const Section = Backbone.Model.extend({
-   *   mixins: [configurationContainer({autoSave: true})]
-   * });
-   *
-   * const section = new Section({configuration: {some: 'value'}});
-   * section.configuration.get('some') // => 'value';
-   */
-
-  function configurationContainer() {
-    var _ref = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},
-        configurationModel = _ref.configurationModel,
-        autoSave = _ref.autoSave,
-        includeAttributesInJSON = _ref.includeAttributesInJSON;
-
-    configurationModel = configurationModel || Configuration.extend({
-      defaults: {}
-    });
-    return {
-      initialize: function initialize() {
-        this.configuration = new configurationModel(this.get('configuration'));
-        this.configuration.parent = this;
-        this.listenTo(this.configuration, 'change', function () {
-          if (!this.isNew() && autoSave) {
-            this.save();
-          }
-
-          this.trigger('change:configuration', this);
-
-          _$1.chain(this.configuration.changed).keys().each(function (name) {
-            this.trigger('change:configuration:' + name, this, this.configuration.get(name));
-          }, this);
-        });
-      },
-      toJSON: function toJSON() {
-        var attributes = {};
-
-        if (includeAttributesInJSON === true) {
-          attributes = _$1.clone(this.attributes);
-        } else if (includeAttributesInJSON) {
-          attributes = _$1.pick(this.attributes, includeAttributesInJSON);
-        }
-
-        return _$1.extend(attributes, {
-          configuration: this.configuration.toJSON()
-        });
-      }
-    };
-  }
-
   var persistedPromise = {
     persisted: function persisted() {
       var model = this;
@@ -6066,8 +5702,8 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     mixins: [filesCountWatcher, polling, failureTracking],
     initialize: function initialize(attributes, options) {
       options = options || {};
-      this.metadata = new EntryMetadata(this.get('metadata') || {});
-      this.metadata.parent = this;
+      this.configuration = new EntryConfiguration(this.get('configuration') || {});
+      this.configuration.parent = this;
       this.themes = options.themes || state.themes;
       this.files = options.files || state.files;
       this.fileTypes = options.fileTypes || editor.fileTypes;
@@ -6089,11 +5725,11 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.listenTo(this.chapters, 'sort', function () {
         this.pages.sort();
       });
-      this.listenTo(this.metadata, 'change', function () {
-        this.trigger('change:metadata');
+      this.listenTo(this.configuration, 'change', function () {
+        this.trigger('change:configuration');
         this.save();
       });
-      this.listenTo(this.metadata, 'change:locale', function () {
+      this.listenTo(this.configuration, 'change:locale', function () {
         this.once('sync', function () {
           // No other way of updating page templates used in
           // EntryPreviewView at the moment.
@@ -6102,10 +5738,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       });
     },
     getTheme: function getTheme() {
-      return this.themes.findByName(this.metadata.get('theme_name'));
-    },
-    supportsPhoneEmulation: function supportsPhoneEmulation() {
-      return pageflow.features.isEnabled('editor_emulation_mode');
+      return this.themes.findByName(this.configuration.get('theme_name'));
     },
     addStoryline: function addStoryline(attributes) {
       var storyline = this.buildStoryline(attributes);
@@ -6188,10 +5821,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }, this);
     },
     toJSON: function toJSON() {
-      var metadataJSON = this.metadata.toJSON();
-      var configJSON = this.metadata.configuration.toJSON();
-      metadataJSON.configuration = configJSON;
-      return metadataJSON;
+      return this.configuration.toJSON();
     }
   });
 
@@ -6349,61 +5979,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  /**
-   * A Backbone collection that is automatically updated to only
-   * contain models with a foreign key matching the id of a parent
-   * model.
-   *
-   * @param {Object} options
-   * @param {Backbone.Model} options.parentModel -
-   *   Model whose id is compared to foreign keys.
-   * @param {Backbone.Collection} options.parent -
-   *   Collection to filter items with matching foreign key from.
-   * @param {String} options.foreignKeyAttribute -
-   *   Attribute to compare to id of parent model.
-   * @param {String} options.parentReferenceAttribute -
-   *   Set reference to parent model on models in collection.
-   *
-   * @since 15.1
-   */
-
-  var ForeignKeySubsetCollection = SubsetCollection.extend({
-    mixins: [orderedCollection],
-    constructor: function constructor(options) {
-      var parent = options.parent;
-      var parentModel = options.parentModel;
-      SubsetCollection.prototype.constructor.call(this, {
-        parent: parent,
-        parentModel: parentModel,
-        filter: function filter(item) {
-          return !parentModel.isNew() && item.get(options.foreignKeyAttribute) === parentModel.id;
-        },
-        comparator: function comparator(item) {
-          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', function () {
-        this.clear();
-      });
-
-      if (options.parentReferenceAttribute) {
-        this.each(function (model) {
-          return model[options.parentReferenceAttribute] = parentModel;
-        });
-        this.listenTo(this, 'remove', function (model) {
-          model[options.parentReferenceAttribute] = null;
-        });
-      }
-    }
-  });
-
   var PageLinksCollection = Backbone.Collection.extend({
     model: PageLink,
     initialize: function initialize(models, options) {
@@ -6623,6 +6198,50 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   };
   Cocktail.mixin(Backbone.Collection, addAndReturnModel);
 
+  // different model types.  Backbone.Collection tries to merge records
+  // if they have the same id.
+
+  var MultiCollection = function MultiCollection() {
+    this.records = {};
+    this.length = 0;
+  };
+
+  _$1.extend(MultiCollection.prototype, {
+    add: function add(record) {
+      if (!this.records[record.cid]) {
+        this.records[record.cid] = record;
+        this.length = _$1.keys(this.records).length;
+        this.trigger('add', record);
+      }
+    },
+    remove: function remove(record) {
+      if (this.records[record.cid]) {
+        delete this.records[record.cid];
+        this.length = _$1.keys(this.records).length;
+        this.trigger('remove', record);
+      }
+    },
+    isEmpty: function isEmpty() {
+      return this.length === 0;
+    }
+  });
+
+  _$1.extend(MultiCollection.prototype, Backbone.Events);
+
+  MultiCollection.extend = Backbone.Collection.extend;
+
+  var SavingRecordsCollection = MultiCollection.extend({
+    watch: function watch(collection) {
+      var that = this;
+      this.listenTo(collection, 'request', function (model, xhr) {
+        that.add(model);
+        xhr.always(function () {
+          that.remove(model);
+        });
+      });
+    }
+  });
+
   var SidebarRouter = Marionette.AppRouter.extend({
     appRoutes: {
       'page_links/:id': 'pageLink',
@@ -6666,7 +6285,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.outlet.show(this.options.view);
     },
     goBack: function goBack() {
-      this.options.view.onGoBack && this.options.view.onGoBack();
       editor.navigate('/', {
         trigger: true
       });
@@ -6804,87 +6422,24 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     });
   };
 
-  /**
-   * Mixin for Marionette Views that sets css class names according to
-   * life cycle events of its model.
-   *
-   * @param {Object} options
-   * @param {Object} options.classNames
-   * @param {String} options.classNames.creating -
-   *   Class name to add to root element while model is still being created.
-   * @param {String} options.classNames.destroying -
-   *   Class name to add to root element while model is being destroyed.
-   * @param {String} options.classNames.failed -
-   *   Class name to add to root element while model is in failed state.
-   *   Model needs to include {@link failureTracking} mixin.
-   * @param {String} options.classNames.failureMessage -
-   *   Class name of the element that shall be updated with the failure
-   *   message. Model needs to include {@link failureTracking} mixin.
-   * @param {String} options.classNames.retryButton -
-   *   Class name of the element that shall act as a retry button.
-   */
-
-  function modelLifecycleTrackingView(_ref) {
-    var classNames = _ref.classNames;
-    return {
-      events: _defineProperty({}, "click .".concat(classNames.retryButton), function click() {
+  var failureIndicatingView = {
+    modelEvents: {
+      'change:failed': 'updateFailIndicator'
+    },
+    events: {
+      'click .retry': function clickRetry() {
         editor.failures.retry();
         return false;
-      }),
-      initialize: function initialize() {
-        var _this = this;
-
-        if (classNames.creating) {
-          this.listenTo(this.model, 'change:id', function () {
-            this.$el.removeClass(classNames.creating);
-          });
-        }
-
-        if (classNames.destroying) {
-          this.listenTo(this.model, 'destroying', function () {
-            this.$el.addClass(classNames.destroying);
-          });
-          this.listenTo(this.model, 'error', function () {
-            this.$el.removeClass(classNames.destroying);
-          });
-        }
-
-        if (classNames.failed || classNames.failureMessage) {
-          this.listenTo(this.model, 'change:failed', function () {
-            return _this.updateFailIndicator();
-          });
-        }
-      },
-      render: function render() {
-        if (this.model.isNew()) {
-          this.$el.addClass(classNames.creating);
-        }
-
-        if (this.model.isDestroying && this.model.isDestroying()) {
-          this.$el.addClass(classNames.destroying);
-        }
-
-        this.updateFailIndicator();
-      },
-      updateFailIndicator: function updateFailIndicator() {
-        if (classNames.failed) {
-          this.$el.toggleClass(classNames.failed, this.model.isFailed());
-        }
-
-        if (classNames.failureMessage) {
-          this.$el.find(".".concat(classNames.failureMessage)).text(this.model.getFailureMessage());
-        }
       }
-    };
-  }
-
-  var failureIndicatingView = modelLifecycleTrackingView({
-    classNames: {
-      failed: 'failed',
-      failureMessage: 'failure .message',
-      retryButton: 'retry'
+    },
+    onRender: function onRender() {
+      this.updateFailIndicator();
+    },
+    updateFailIndicator: function updateFailIndicator() {
+      this.$el.toggleClass('failed', this.model.isFailed());
+      this.$el.find('.failure .message').text(this.model.getFailureMessage());
     }
-  });
+  };
 
   function template$k(data) {
   var __t, __p = '';
@@ -8073,13 +7628,12 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     onRender: function onRender() {
       var entry = this.model;
       var configurationEditor = new ConfigurationEditorView({
-        model: entry.metadata.configuration,
+        model: entry.configuration,
         tab: this.options.tab
       });
       configurationEditor.tab('general', function () {
         this.input('title', TextInputView, {
-          placeholder: entry.get('entry_title'),
-          model: entry.metadata
+          placeholder: entry.get('entry_title')
         });
         this.input('locale', SelectInputView, {
           values: state.config.availablePublicLocales,
@@ -8087,23 +7641,17 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
             return I18n$1.t('pageflow.public._language', {
               locale: locale
             });
-          }),
-          model: entry.metadata
-        });
-        this.input('credits', TextAreaInputView, {
-          model: entry.metadata
+          })
         });
+        this.input('credits', TextAreaInputView);
         this.input('author', TextInputView, {
-          placeholder: state.config.defaultAuthorMetaTag,
-          model: entry.metadata
+          placeholder: state.config.defaultAuthorMetaTag
         });
         this.input('publisher', TextInputView, {
-          placeholder: state.config.defaultPublisherMetaTag,
-          model: entry.metadata
+          placeholder: state.config.defaultPublisherMetaTag
         });
         this.input('keywords', TextInputView, {
-          placeholder: state.config.defaultKeywordsMetaTag,
-          model: entry.metadata
+          placeholder: state.config.defaultKeywordsMetaTag
         });
       });
       configurationEditor.tab('widgets', function () {
@@ -8123,25 +7671,21 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       configurationEditor.tab('social', function () {
         this.input('share_image_id', FileInputView, {
           collection: state.imageFiles,
-          fileSelectionHandler: 'entryMetadata',
-          model: entry.metadata
+          fileSelectionHandler: 'entryConfiguration'
         });
         this.input('summary', TextAreaInputView, {
           disableRichtext: true,
-          disableLinks: true,
-          model: entry.metadata
+          disableLinks: true
         });
         this.input('share_url', TextInputView, {
-          placeholder: state.entry.get('pretty_url'),
-          model: entry.metadata
+          placeholder: state.entry.get('pretty_url')
         });
         this.input('share_providers', CheckBoxGroupInputView, {
           values: state.config.availableShareProviders,
-          translationKeyPrefix: 'activerecord.values.pageflow/entry.share_providers',
-          model: entry.metadata
+          translationKeyPrefix: 'activerecord.values.pageflow/entry.share_providers'
         });
       });
-      this.listenTo(entry.metadata, 'change:theme_name', function () {
+      this.listenTo(entry.configuration, 'change:theme_name', function () {
         configurationEditor.refresh();
       });
       this.formContainer.show(configurationEditor);
@@ -8415,12 +7959,28 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  var loadable = modelLifecycleTrackingView({
-    classNames: {
-      creating: 'creating',
-      destroying: 'destroying'
+  var loadable = {
+    modelEvents: {
+      'change:id': function changeId() {
+        this.$el.removeClass('creating');
+      },
+      destroying: function destroying() {
+        this.$el.addClass('destroying');
+      },
+      error: function error() {
+        this.$el.removeClass('destroying');
+      }
+    },
+    render: function render() {
+      if (this.model.isNew()) {
+        this.$el.addClass('creating');
+      }
+
+      if (this.model.isDestroying && this.model.isDestroying()) {
+        this.$el.addClass('destroying');
+      }
     }
-  });
+  };
 
   function template$F(data) {
   var __p = '';
@@ -10134,7 +9694,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         this.model.unset('emulation_mode');
       },
       'click .emulation_mode_button-phone a': function clickEmulation_mode_buttonPhoneA() {
-        if (this.model.get('emulation_mode_disabled')) {
+        if (!this.model.get('current_page_supports_emulation_mode')) {
           return;
         }
 
@@ -10142,13 +9702,13 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }
     },
     modelEvents: {
-      'change:emulation_mode change:emulation_mode_disabled': 'update'
+      'change:emulation_mode change:current_page_supports_emulation_mode': 'update'
     },
     onRender: function onRender() {
       this.update();
     },
     update: function update() {
-      this.ui.phoneItem.toggleClass('disabled', !!this.model.get('emulation_mode_disabled'));
+      this.ui.phoneItem.toggleClass('disabled', !this.model.get('current_page_supports_emulation_mode'));
       this.ui.phoneItem.toggleClass('active', this.model.has('emulation_mode'));
       this.ui.desktopItem.toggleClass('active', !this.model.has('emulation_mode'));
       this.ui.phoneDisplay.toggleClass('active', this.model.has('emulation_mode'));
@@ -10176,7 +9736,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   var SidebarFooterView = Marionette.View.extend({
     className: 'sidebar_footer',
     render: function render() {
-      if (this.model.supportsPhoneEmulation()) {
+      if (pageflow.features.isEnabled('editor_emulation_mode')) {
         this.appendSubview(new EmulationModeButtonView({
           model: this.model
         }));
@@ -10534,8 +10094,8 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     onRender: function onRender() {
       this.listenTo(state.entry, 'change:uploading_files_count', this.notifyUploadCount);
       this.listenTo(state.entry, 'change:confirmable_files_count', this.notifyConfirmableFilesCount);
-      this.listenTo(editor.savingRecords, 'add', this.update);
-      this.listenTo(editor.savingRecords, 'remove', this.update);
+      this.listenTo(state.savingRecords, 'add', this.update);
+      this.listenTo(state.savingRecords, 'remove', this.update);
       this.listenTo(editor.failures, 'add', this.update);
       this.listenTo(editor.failures, 'remove', this.update);
       this.update();
@@ -10543,7 +10103,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     update: function update() {
       this.$el.toggleClass('failed', !editor.failures.isEmpty());
-      this.$el.toggleClass('saving', !editor.savingRecords.isEmpty());
+      this.$el.toggleClass('saving', !state.savingRecords.isEmpty());
       this.ui.failedCount.text(editor.failures.count());
     },
     notifyUploadCount: function notifyUploadCount(model, uploadCount) {
@@ -10922,100 +10482,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     app.dialogRegion.show(new ConfirmUploadView(options));
   };
 
-  /**
-   * Base view to edit configuration container models.  Extend and
-   * override the `configure` method which receives a {@link
-   * ConfigurationEditorView} to define the tabs and inputs that shall
-   * be displayed.
-   *
-   * Add a `translationKeyPrefix` property to the prototype and define
-   * the following translations:
-   *
-   * * `<translationKeyPrefix>.tabs`: used as `tabTranslationKeyPrefix`
-   *   of the `ConfigurationEditorView`.
-   *
-   * * `<translationKeyPrefix>.attributes`: used as one of the
-   *   `attributeTranslationKeyPrefixes` of the
-   *   `ConfigurationEditorView`.
-   *
-   * * `<translationKeyPrefix>.back` (optional): Back button label.
-   *
-   * * `<translationKeyPrefix>.destroy` (optional): Destroy button
-   *   label.
-   *
-   * * `<translationKeyPrefix>.confirm_destroy` (optional): Confirm
-   *   message displayed before destroying.
-   *
-   * * `<translationKeyPrefix>.save_error` (optional): Header of the
-   *   failure message that is displayed if the model cannot be saved.
-   *
-   * * `<translationKeyPrefix>.retry` (optional): Label of the retry
-   *   button of the failure message.
-   *
-   * @param {Object} options
-   * @param {Backbone.Model} options.model -
-   *   Model including the {@link configurationContainer},
-   *   {@link failureTracking} and {@link delayedDestroying} mixins.
-   *
-   * @since 15.1
-   */
-
-  var EditConfigurationView = Marionette.Layout.extend({
-    template: function template(_ref) {
-      var t = _ref.t;
-      return "\n    <a class=\"back\">".concat(t('back'), "</a>\n    <a class=\"destroy\">").concat(t('destroy'), "</a>\n\n    <div class=\"failure\">\n      <p>").concat(t('save_error'), "</p>\n      <p class=\"message\"></p>\n      <a class=\"retry\" href=\"\">").concat(t('retry'), "</a>\n    </div>\n\n    <div class=\"configuration_container\"></div>\n  ");
-    },
-    serializeData: function serializeData() {
-      var _this = this;
-
-      return {
-        t: function t(key) {
-          return _this.t(key);
-        }
-      };
-    },
-    mixins: [failureIndicatingView],
-    regions: {
-      configurationContainer: '.configuration_container'
-    },
-    events: {
-      'click a.back': 'goBack',
-      'click a.destroy': 'destroy'
-    },
-    onRender: function onRender() {
-      var translationKeyPrefix = _$1.result(this, 'translationKeyPrefix');
-
-      this.configurationEditor = new ConfigurationEditorView({
-        tabTranslationKeyPrefix: "".concat(translationKeyPrefix, ".tabs"),
-        attributeTranslationKeyPrefixes: ["".concat(translationKeyPrefix, ".attributes")],
-        model: this.model.configuration
-      });
-      this.configure(this.configurationEditor);
-      this.configurationContainer.show(this.configurationEditor);
-    },
-    onShow: function onShow() {
-      this.configurationEditor.refreshScroller();
-    },
-    destroy: function destroy() {
-      if (window.confirm(this.t('confirm_destroy'))) {
-        this.model.destroyWithDelay();
-        this.goBack();
-      }
-    },
-    goBack: function goBack() {
-      editor.navigate('/', {
-        trigger: true
-      });
-    },
-    t: function t(suffix) {
-      var translationKeyPrefix = _$1.result(this, 'translationKeyPrefix');
-
-      return I18n$1.t("".concat(translationKeyPrefix, ".").concat(suffix), {
-        defaultValue: I18n$1.t("pageflow.editor.views.edit_configuration.".concat(suffix))
-      });
-    }
-  });
-
   ConfigurationEditorView.register('audio', {
     configure: function configure() {
       this.tab('general', function () {
@@ -11319,7 +10785,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
             text: I18n$1.t('pageflow.editor.title_loading_spinner.widget_type_info_box_text')
           });
           this.input('title', TextInputView, {
-            placeholder: state.entry.metadata.get('title') || state.entry.get('entry_title')
+            placeholder: state.entry.configuration.get('title') || state.entry.get('entry_title')
           });
           this.input('subtitle', TextInputView);
           this.input('custom_background_image_id', FileInputView, {
@@ -11521,8 +10987,9 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     editor.failures.watch(state.entry);
     editor.failures.watch(state.pages);
     editor.failures.watch(state.chapters);
-    editor.savingRecords.watch(state.pages);
-    editor.savingRecords.watch(state.chapters);
+    state.savingRecords = new SavingRecordsCollection();
+    state.savingRecords.watch(state.pages);
+    state.savingRecords.watch(state.chapters);
     pageflow.events.trigger('seed:loaded');
   });
 
@@ -11579,7 +11046,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     state.entry.on('use:files', function () {
       pageflow.stylesheet.reload('entry');
     });
-    state.entry.metadata.on('change:theme_name', function () {
+    state.entry.configuration.on('change:theme_name', function () {
       var theme = state.entry.getTheme();
       pageflow.stylesheet.update('theme', theme.get('stylesheet_path'));
     });
@@ -11688,7 +11155,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.DropDownButtonItemView = DropDownButtonItemView;
   exports.DropDownButtonView = DropDownButtonView;
   exports.EditChapterView = EditChapterView;
-  exports.EditConfigurationView = EditConfigurationView;
   exports.EditEntryView = EditEntryView;
   exports.EditFileView = EditFileView;
   exports.EditLock = EditLock;
@@ -11705,14 +11171,13 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.EncodedFile = EncodedFile;
   exports.EncodingConfirmation = EncodingConfirmation;
   exports.Entry = Entry;
-  exports.EntryMetadata = EntryMetadata;
-  exports.EntryMetadataFileSelectionHandler = EntryMetadataFileSelectionHandler;
+  exports.EntryConfiguration = EntryConfiguration;
+  exports.EntryConfigurationFileSelectionHandler = EntryConfigurationFileSelectionHandler;
   exports.EntryPublication = EntryPublication;
   exports.EntryPublicationQuotaDecoratorView = EntryPublicationQuotaDecoratorView;
   exports.EnumTableCellView = EnumTableCellView;
   exports.ExplorerFileItemView = ExplorerFileItemView;
   exports.ExtendedSelectInputView = ExtendedSelectInputView;
-  exports.Failure = Failure;
   exports.FileConfiguration = FileConfiguration;
   exports.FileImport = FileImport;
   exports.FileInputView = FileInputView;
@@ -11733,7 +11198,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.FilesImporterView = FilesImporterView;
   exports.FilesView = FilesView;
   exports.FilteredFilesView = FilteredFilesView;
-  exports.ForeignKeySubsetCollection = ForeignKeySubsetCollection;
   exports.HelpButtonView = HelpButtonView;
   exports.HelpImageView = HelpImageView;
   exports.HelpView = HelpView;
@@ -11748,6 +11212,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.LoadingView = LoadingView;
   exports.LockedView = LockedView;
   exports.ModelThumbnailView = ModelThumbnailView;
+  exports.MultiCollection = MultiCollection;
   exports.NestedFilesCollection = NestedFilesCollection;
   exports.NestedFilesView = NestedFilesView;
   exports.NestedTypeError = NestedTypeError;
@@ -11775,6 +11240,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.PublishEntryView = PublishEntryView;
   exports.ReferenceInputView = ReferenceInputView;
   exports.ReusableFile = ReusableFile;
+  exports.SavingRecordsCollection = SavingRecordsCollection;
   exports.Scaffold = Scaffold;
   exports.ScrollingView = ScrollingView;
   exports.SelectButtonView = SelectButtonView;
@@ -11828,12 +11294,10 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.addAndReturnModel = addAndReturnModel;
   exports.app = app;
   exports.authenticationProvider = authenticationProvider;
-  exports.configurationContainer = configurationContainer;
   exports.cssModulesUtils = cssModulesUtils;
   exports.delayedDestroying = delayedDestroying;
   exports.dialogView = dialogView;
   exports.editor = editor;
-  exports.entryTypeEditorControllerUrls = entryTypeEditorControllerUrls;
   exports.failureIndicatingView = failureIndicatingView;
   exports.failureTracking = failureTracking;
   exports.fileWithType = fileWithType;
@@ -11843,7 +11307,6 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.inputView = inputView;
   exports.inputWithPlaceholderText = inputWithPlaceholderText;
   exports.loadable = loadable;
-  exports.modelLifecycleTrackingView = modelLifecycleTrackingView;
   exports.orderedCollection = orderedCollection;
   exports.persistedPromise = persistedPromise;
   exports.polling = polling;