pageflow 15.1.0.beta5 → 15.1.0.beta6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdd026a04cce5cafe6995a71e8b6787e47ce7f6bc3e8e3442707b7eeb8bc4f2b
-  data.tar.gz: 2eb3e985022e4a89e07cea935844d140c8bfde32d24847ca8e6d083d73587947
+  metadata.gz: 589502715806a47772d831c8446f1fdc319d72b411e1c13fc00b0e5e4d5aec48
+  data.tar.gz: f656cafc219dc4507206bec637e03d876d98045627779fe0de904c8d270e6ae4
 SHA512:
-  metadata.gz: cfc0cca465ec6f3d6e97db760d9cd32868e99576e6cc6e1750ed9b9ebb0820b3dab7b40151e393b75dbc259f1e9a1821dd79e64599b672e4355aea16a2b1012f
-  data.tar.gz: f08aaef98881ada85734829e70c25b004afb4c7cd8d3cb197d1066d5c38bca7d5f7caab0e0716cd9d8da32cd2fb93c497eca3c18efeb373801a1048e4d739a49
+  metadata.gz: eb958ba5f3e90b14dc67b23c8a7913da07d911a0397fb801171be92567af8ffec46b271ff917ce252ac3909def665884a5f060f33da7b663499501d24d1f3baf
+  data.tar.gz: 714ff5f118de41a7820a2b8dbd355cedbba6dd33c13222ba8cd0684c6438bac0ae10807183302c1e45d556ac74dff4a8bfe6c1369b611a547f9c14c4a2c805e8

data/CHANGELOG.md

@@ -1,5 +1,18 @@
 # CHANGELOG
 
+### Version 15.1.0.beta6
+
+2020-01-29
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v15.1.0.beta5...v15.1.0.beta6)
+
+#### Core
+
+##### Internal
+
+- Add configuration to revisions
+  ([#1306](https://github.com/codevise/pageflow/pull/1306))
+
 ### Version 15.1.0.beta5
 
 2020-01-29
@@ -39,7 +52,7 @@ Forgot to build assets before doing previous release.
 
   ```diff
   - ActiveAdmin.application.unshift(Pageflow.active_admin_load_path)
-  + ActiveAdmin.application.load_paths +=[Pageflow.active_admin_load_path]
+  + ActiveAdmin.application.load_paths += [Pageflow.active_admin_load_path]
   ```
 
 - Improve support for Webpack setup in host appplication
@@ -129,7 +142,8 @@ Forgot to build assets before doing previous release.
   ([#1248](https://github.com/codevise/pageflow/pull/1248),
    [#1270](https://github.com/codevise/pageflow/pull/1270),
    [#1278](https://github.com/codevise/pageflow/pull/1278),
-   [#1286](https://github.com/codevise/pageflow/pull/1286))
+   [#1286](https://github.com/codevise/pageflow/pull/1286),
+   [#1314](https://github.com/codevise/pageflow/pull/1314))
 - Fix section index and references to adjacent chapters
   ([#1316](https://github.com/codevise/pageflow/pull/1316))
 - Render uploaded images in scrolled entries
@@ -137,6 +151,7 @@ Forgot to build assets before doing previous release.
    [#1303](https://github.com/codevise/pageflow/pull/1303))
 - Use chapters from db in navigaition bar
   ([#1298](https://github.com/codevise/pageflow/pull/1298),
+   [#1300](https://github.com/codevise/pageflow/pull/1300),
    [#1308](https://github.com/codevise/pageflow/pull/1308))
 
 ##### Editor
@@ -144,8 +159,11 @@ Forgot to build assets before doing previous release.
 - Render demo in editor
   ([#1268](https://github.com/codevise/pageflow/pull/1268))
 - Use data from Backbone collections in scrolled editor preview
-  ([#1293](https://github.com/codevise/pageflow/pull/1293),
-   [#1294](https://github.com/codevise/pageflow/pull/1294))
+  ([#1288](https://github.com/codevise/pageflow/pull/1288),
+   [#1293](https://github.com/codevise/pageflow/pull/1293),
+   [#1292](https://github.com/codevise/pageflow/pull/1292),
+   [#1294](https://github.com/codevise/pageflow/pull/1294),
+   [#1305](https://github.com/codevise/pageflow/pull/1305))
 
 ##### Internal
 

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

@@ -3726,7 +3726,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  var editor = new EditorApi();
+  var editor$1 = new EditorApi();
   var startEditor = function startEditor(options) {
     $(function () {
       $.when($.getJSON('/editor/entries/' + options.entryId + '/seed'), pageflow.browser.detectFeatures()).done(function (result) {
@@ -3972,7 +3972,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     getReference: function getReference(attribute, collection) {
       if (typeof collection === 'string') {
-        var fileType = editor.fileTypes.findByCollectionName(collection);
+        var fileType = editor$1.fileTypes.findByCollectionName(collection);
         collection = state.entry.getFileCollection(fileType);
       }
 
@@ -4276,7 +4276,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       return this.pageType().pageLinks(this.configuration);
     },
     pageType: function pageType() {
-      return editor.pageTypes.findByName(this.get('template'));
+      return editor$1.pageTypes.findByName(this.get('template'));
     },
     toJSON: function toJSON() {
       return _$1.extend(_$1.clone(this.attributes), {
@@ -4333,7 +4333,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         this.page = this.chapter.buildPage();
       }
 
-      editor.trigger('scaffold:storyline', this.storyline);
+      editor$1.trigger('scaffold:storyline', this.storyline);
       return this.storyline;
     },
     load: function load(response) {
@@ -4667,7 +4667,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       return '/widgets/' + widget.id;
     };
   };
-  editor.registerFileSelectionHandler('widgetConfiguration', WidgetConfigurationFileSelectionHandler);
+  editor$1.registerFileSelectionHandler('widgetConfiguration', WidgetConfigurationFileSelectionHandler);
 
   var EncodingConfirmation = Backbone.Model.extend({
     paramRoot: 'encoding_confirmation',
@@ -4772,9 +4772,24 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  var EntryConfiguration = Configuration.extend({
+  var EntryMetadataConfiguration = Configuration.extend({
+    modelName: 'entry_metadata_configuration',
+    i18nKey: 'pageflow/entry_metadata_configuration',
+    defaults: {}
+  });
+
+  var EntryMetadata = Configuration.extend({
     modelName: 'entry',
-    i18nKey: 'pageflow/entry'
+    i18nKey: 'pageflow/entry',
+    defaults: {},
+    initialize: function initialize(attributes, options) {
+      Configuration.prototype.initialize.apply(this, attributes, options);
+      this.configuration = new EntryMetadataConfiguration(_$1.clone(attributes.configuration) || {});
+      this.listenTo(this.configuration, 'change', function () {
+        this.trigger('change');
+        this.parent.save();
+      });
+    }
   });
 
   var StorylineConfiguration = Configuration.extend({
@@ -4931,7 +4946,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       return '/pages/' + page.id + '/' + (options.returnToTab || 'files');
     };
   };
-  editor.registerFileSelectionHandler('pageConfiguration', PageConfigurationFileSelectionHandler);
+  editor$1.registerFileSelectionHandler('pageConfiguration', PageConfigurationFileSelectionHandler);
 
   var ImageFile = ReusableFile.extend({
     stages: [{
@@ -4953,16 +4968,16 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  var EntryConfigurationFileSelectionHandler = function EntryConfigurationFileSelectionHandler(options) {
+  var EntryMetadataFileSelectionHandler = function EntryMetadataFileSelectionHandler(options) {
     this.call = function (file) {
-      state.entry.configuration.setReference(options.attributeName, file);
+      state.entry.metadata.setReference(options.attributeName, file);
     };
 
     this.getReferer = function () {
       return '/meta_data/' + (options.returnToTab || 'general');
     };
   };
-  editor.registerFileSelectionHandler('entryConfiguration', EntryConfigurationFileSelectionHandler);
+  editor$1.registerFileSelectionHandler('entryMetadata', EntryMetadataFileSelectionHandler);
 
   var EntryPublication = Backbone.Model.extend({
     paramRoot: 'entry_publication',
@@ -5291,7 +5306,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     add: function add(upload, options) {
       options = options || {};
-      var editor$1 = options.editor || editor;
+      var editor = options.editor || editor$1;
       var fileType = this.fileTypes.findByUpload(upload);
       var file = new fileType.model({
         state: 'uploadable',
@@ -5301,12 +5316,12 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }, {
         fileType: fileType
       });
-      var setTargetFile = editor$1.nextUploadTargetFile;
+      var setTargetFile = editor.nextUploadTargetFile;
 
       if (setTargetFile) {
         if (fileType.topLevelType || !setTargetFile.fileType().nestedFileTypes.contains(fileType)) {
           throw new InvalidNestedTypeError(upload, {
-            editor: editor$1,
+            editor: editor,
             fileType: fileType
           });
         }
@@ -5386,7 +5401,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
           parentModel.trigger('sync:order', parentModel, response, {});
         },
         error: function error(jqXHR, textStatus, errorThrown) {
-          editor.failures.add(new OrderingFailure(parentModel, collection));
+          editor$1.failures.add(new OrderingFailure(parentModel, collection));
         }
       });
     }
@@ -5412,7 +5427,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.listenTo(this, 'add', function (model) {
         model.chapter = chapter;
         model.set('chapter_id', chapter.id);
-        editor.trigger('add:page', model);
+        editor$1.trigger('add:page', model);
       });
       this.listenTo(this, 'remove', function (model) {
         model.chapter = null;
@@ -5491,7 +5506,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.listenTo(this, 'add', function (model) {
         model.storyline = storyline;
         model.set('storyline_id', storyline.id);
-        editor.trigger('add:chapter', model);
+        editor$1.trigger('add:chapter', model);
       });
       this.listenTo(this, 'remove', function (model) {
         model.storyline = null;
@@ -5617,7 +5632,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       return '/page_links/' + pageLink.id;
     };
   };
-  editor.registerFileSelectionHandler('pageLink', PageLinkFileSelectionHandler);
+  editor$1.registerFileSelectionHandler('pageLink', PageLinkFileSelectionHandler);
 
   var persistedPromise = {
     persisted: function persisted() {
@@ -5702,11 +5717,11 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     mixins: [filesCountWatcher, polling, failureTracking],
     initialize: function initialize(attributes, options) {
       options = options || {};
-      this.configuration = new EntryConfiguration(this.get('configuration') || {});
-      this.configuration.parent = this;
+      this.metadata = new EntryMetadata(this.get('metadata') || {});
+      this.metadata.parent = this;
       this.themes = options.themes || state.themes;
       this.files = options.files || state.files;
-      this.fileTypes = options.fileTypes || editor.fileTypes;
+      this.fileTypes = options.fileTypes || editor$1.fileTypes;
       this.storylines = options.storylines || state.storylines;
       this.storylines.parentModel = this;
       this.chapters = options.chapters || state.chapters;
@@ -5725,11 +5740,11 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.listenTo(this.chapters, 'sort', function () {
         this.pages.sort();
       });
-      this.listenTo(this.configuration, 'change', function () {
-        this.trigger('change:configuration');
+      this.listenTo(this.metadata, 'change', function () {
+        this.trigger('change:metadata');
         this.save();
       });
-      this.listenTo(this.configuration, 'change:locale', function () {
+      this.listenTo(this.metadata, 'change:locale', function () {
         this.once('sync', function () {
           // No other way of updating page templates used in
           // EntryPreviewView at the moment.
@@ -5738,7 +5753,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       });
     },
     getTheme: function getTheme() {
-      return this.themes.findByName(this.configuration.get('theme_name'));
+      return this.themes.findByName(this.metadata.get('theme_name'));
     },
     addStoryline: function addStoryline(attributes) {
       var storyline = this.buildStoryline(attributes);
@@ -5821,7 +5836,10 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }, this);
     },
     toJSON: function toJSON() {
-      return this.configuration.toJSON();
+      var metadataJSON = this.metadata.toJSON();
+      var configJSON = this.metadata.configuration.toJSON();
+      metadataJSON.configuration = configJSON;
+      return metadataJSON;
     }
   });
 
@@ -5957,7 +5975,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
 
               if (localFile) {
                 state.files[collectionName].remove(localFile);
-                var fileType = editor.fileTypes.findByUpload(file);
+                var fileType = editor$1.fileTypes.findByUpload(file);
                 var file = new fileType.model(file, {
                   fileType: fileType
                 });
@@ -6285,7 +6303,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.outlet.show(this.options.view);
     },
     goBack: function goBack() {
-      editor.navigate('/', {
+      editor$1.navigate('/', {
         trigger: true
       });
     }
@@ -6428,7 +6446,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     events: {
       'click .retry': function clickRetry() {
-        editor.failures.retry();
+        editor$1.failures.retry();
         return false;
       }
     },
@@ -6492,7 +6510,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }
     },
     goBack: function goBack() {
-      editor.navigate('/', {
+      editor$1.navigate('/', {
         trigger: true
       });
     }
@@ -6533,7 +6551,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       },
       'click a.publish': function clickAPublish() {
         if (!this.ui.publishButton.hasClass('disabled')) {
-          editor.navigate('/publish', {
+          editor$1.navigate('/publish', {
             trigger: true
           });
         }
@@ -6541,7 +6559,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         return false;
       },
       'click .menu a': function clickMenuA(event) {
-        editor.navigate($(event.target).data('path'), {
+        editor$1.navigate($(event.target).data('path'), {
           trigger: true
         });
         return false;
@@ -6552,7 +6570,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
 
       this._updatePublishButton();
 
-      this.outlineRegion.show(new editor.entryType.outlineView({
+      this.outlineRegion.show(new editor$1.entryType.outlineView({
         entry: state.entry,
         navigatable: true,
         editable: true,
@@ -6574,7 +6592,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     _addMenuItems: function _addMenuItems() {
       var view = this;
 
-      _$1.each(editor.mainMenuItems, function (options) {
+      _$1.each(editor$1.mainMenuItems, function (options) {
         var item = $('<li><a href="#"></a></li>');
         var link = item.find('a');
 
@@ -6616,7 +6634,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     events: {
       'click .settings': function clickSettings() {
-        editor.navigate('/widgets/' + this.model.role(), {
+        editor$1.navigate('/widgets/' + this.model.role(), {
           trigger: true
         });
         return false;
@@ -7098,7 +7116,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     events: {
       'click .choose': function clickChoose() {
-        editor.selectFile({
+        editor$1.selectFile({
           name: this.options.collection.name,
           filter: this.options.filter
         }, this.options.fileSelectionHandler || 'pageConfiguration', _$1.extend({
@@ -7120,7 +7138,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }, this.options);
 
       if (typeof this.options.collection === 'string') {
-        this.options.collection = state.entry.getFileCollection(editor.fileTypes.findByCollectionName(this.options.collection));
+        this.options.collection = state.entry.getFileCollection(editor$1.fileTypes.findByCollectionName(this.options.collection));
       }
 
       this.textTrackMenuItems = new Backbone.Collection();
@@ -7627,13 +7645,17 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     onRender: function onRender() {
       var entry = this.model;
+      var state = this.options.state || {};
+      var features = this.options.features || {};
+      var editor = this.options.editor || {};
       var configurationEditor = new ConfigurationEditorView({
-        model: entry.configuration,
+        model: entry.metadata.configuration,
         tab: this.options.tab
       });
       configurationEditor.tab('general', function () {
         this.input('title', TextInputView, {
-          placeholder: entry.get('entry_title')
+          placeholder: entry.get('entry_title'),
+          model: entry.metadata
         });
         this.input('locale', SelectInputView, {
           values: state.config.availablePublicLocales,
@@ -7641,17 +7663,23 @@ 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
+          placeholder: state.config.defaultAuthorMetaTag,
+          model: entry.metadata
         });
         this.input('publisher', TextInputView, {
-          placeholder: state.config.defaultPublisherMetaTag
+          placeholder: state.config.defaultPublisherMetaTag,
+          model: entry.metadata
         });
         this.input('keywords', TextInputView, {
-          placeholder: state.config.defaultKeywordsMetaTag
+          placeholder: state.config.defaultKeywordsMetaTag,
+          model: entry.metadata
         });
       });
       configurationEditor.tab('widgets', function () {
@@ -7661,31 +7689,36 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
           widgetTypes: editor.widgetTypes
         });
 
-        if (pageflow.features && pageflow.features.isEnabled('selectable_themes') && state.themes.length > 1) {
+        if (features.isEnabled && features.isEnabled('selectable_themes') && state.themes.length > 1) {
           this.view(ThemeInputView, {
             themes: state.themes,
-            propertyName: 'theme_name'
+            propertyName: 'theme_name',
+            model: entry.metadata
           });
         }
       });
       configurationEditor.tab('social', function () {
         this.input('share_image_id', FileInputView, {
           collection: state.imageFiles,
-          fileSelectionHandler: 'entryConfiguration'
+          fileSelectionHandler: 'entryMetadata',
+          model: entry.metadata
         });
         this.input('summary', TextAreaInputView, {
           disableRichtext: true,
-          disableLinks: true
+          disableLinks: true,
+          model: entry.metadata
         });
         this.input('share_url', TextInputView, {
-          placeholder: state.entry.get('pretty_url')
+          placeholder: state.entry.get('pretty_url'),
+          model: entry.metadata
         });
         this.input('share_providers', CheckBoxGroupInputView, {
           values: state.config.availableShareProviders,
-          translationKeyPrefix: 'activerecord.values.pageflow/entry.share_providers'
+          translationKeyPrefix: 'activerecord.values.pageflow/entry.share_providers',
+          model: entry.metadata
         });
       });
-      this.listenTo(entry.configuration, 'change:theme_name', function () {
+      this.listenTo(entry.metadata, 'change:theme_name', function () {
         configurationEditor.refresh();
       });
       this.formContainer.show(configurationEditor);
@@ -7741,7 +7774,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }
     },
     goBack: function goBack() {
-      editor.navigate('/pages/' + this.options.page.id + '/links', {
+      editor$1.navigate('/pages/' + this.options.page.id + '/links', {
         trigger: true
       });
     }
@@ -7810,7 +7843,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }
     },
     goBack: function goBack() {
-      editor.navigate('/', {
+      editor$1.navigate('/', {
         trigger: true
       });
     }
@@ -7818,7 +7851,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
 
   var PageLinkInputView = ReferenceInputView.extend({
     choose: function choose() {
-      return editor.selectPage({
+      return editor$1.selectPage({
         isAllowed: this.options.isAllowed
       });
     },
@@ -7919,7 +7952,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }
     },
     goBack: function goBack() {
-      editor.navigate('/?storyline=' + this.model.id, {
+      editor$1.navigate('/?storyline=' + this.model.id, {
         trigger: true
       });
     }
@@ -7938,7 +7971,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     className: 'edit_widget',
     events: {
       'click a.back': function clickABack() {
-        editor.navigate('/meta_data/widgets', {
+        editor$1.navigate('/meta_data/widgets', {
           trigger: true
         });
       }
@@ -8152,7 +8185,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         i18n: 'pageflow.editor.files.tabs',
         defaultTab: this.options.tabName
       });
-      editor.fileTypes.each(function (fileType) {
+      editor$1.fileTypes.each(function (fileType) {
         if (fileType.topLevelType) {
           this.tab(fileType);
         }
@@ -8327,7 +8360,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         var result = this.options.selectionHandler.call(this.model);
 
         if (result !== false) {
-          editor.navigate(this.options.selectionHandler.getReferer(), {
+          editor$1.navigate(this.options.selectionHandler.getReferer(), {
             trigger: true
           });
         }
@@ -8412,7 +8445,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.model.cancelUpload();
     },
     confirm: function confirm() {
-      editor.navigate('/confirmable_files?type=' + this.model.modelName + '&id=' + this.model.id, {
+      editor$1.navigate('/confirmable_files?type=' + this.model.modelName + '&id=' + this.model.id, {
         trigger: true
       });
     },
@@ -8448,7 +8481,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     events: {
       'click .filtered_files-reset_filter': function clickFiltered_filesReset_filter() {
-        editor.navigate('/files/' + this.options.fileType.collectionName, {
+        editor$1.navigate('/files/' + this.options.fileType.collectionName, {
           trigger: true
         });
         return false;
@@ -8567,7 +8600,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     onRender: function onRender() {
       var self = this;
-      editor.fileImporters.values().forEach(function (fileImporter) {
+      editor$1.fileImporters.values().forEach(function (fileImporter) {
         var importerSelectView = new ImporterSelectView({
           importer: fileImporter,
           parentView: self
@@ -8789,7 +8822,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
 
           for (var i = 0; i < metaData.files.length; i++) {
             var file = metaData.files[i];
-            var fileType = editor.fileTypes.findByUpload(file);
+            var fileType = editor$1.fileTypes.findByUpload(file);
             var file = new fileType.model({
               state: 'uploadable',
               file_name: file.name,
@@ -8804,7 +8837,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
           }
 
           ConfirmFileImportUploadView.open({
-            fileTypes: editor.fileTypes,
+            fileTypes: editor$1.fileTypes,
             fileImportModel: self.model,
             files: state.files
           });
@@ -8899,7 +8932,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         }
       }];
 
-      if (editor.fileImporters.keys().length > 0) {
+      if (editor$1.fileImporters.keys().length > 0) {
         menuOptions.push({
           label: I18n$1.t('pageflow.editor.views.files_view.import'),
           handler: function handler() {
@@ -8926,7 +8959,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         i18n: 'pageflow.editor.files.tabs',
         defaultTab: this.options.tabName
       });
-      editor.fileTypes.each(function (fileType) {
+      editor$1.fileTypes.each(function (fileType) {
         if (fileType.topLevelType) {
           this.tab(fileType);
         }
@@ -8949,11 +8982,11 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     goBack: function goBack() {
       if (this.options.selectionHandler) {
-        editor.navigate(this.options.selectionHandler.getReferer(), {
+        editor$1.navigate(this.options.selectionHandler.getReferer(), {
           trigger: true
         });
       } else {
-        editor.navigate('/', {
+        editor$1.navigate('/', {
           trigger: true
         });
       }
@@ -9324,11 +9357,11 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     files: function files(collectionName, handler, payload, filterName) {
       this.region.show(new FilesView({
         model: this.entry,
-        selectionHandler: handler && editor.createFileSelectionHandler(handler, payload),
+        selectionHandler: handler && editor$1.createFileSelectionHandler(handler, payload),
         tabName: collectionName,
         filterName: filterName
       }));
-      editor.setDefaultHelpEntry('pageflow.help_entries.files');
+      editor$1.setDefaultHelpEntry('pageflow.help_entries.files');
     },
     confirmableFiles: function confirmableFiles(preselectedFileType, preselectedFileId) {
       this.region.show(ConfirmEncodingView.create({
@@ -9341,7 +9374,10 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     metaData: function metaData(tab) {
       this.region.show(new EditMetaDataView({
         model: this.entry,
-        tab: tab
+        tab: tab,
+        state: state,
+        features: pageflow.features,
+        editor: editor$1
       }));
     },
     publish: function publish() {
@@ -9349,7 +9385,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         model: this.entry,
         entryPublication: new EntryPublication()
       }));
-      editor.setDefaultHelpEntry('pageflow.help_entries.publish');
+      editor$1.setDefaultHelpEntry('pageflow.help_entries.publish');
     },
     storyline: function storyline(id) {
       this.region.show(new EditStorylineView({
@@ -9365,10 +9401,10 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       var page = this.entry.pages.get(id);
       this.region.show(new EditPageView({
         model: page,
-        api: editor,
+        api: editor$1,
         tab: tab
       }));
-      editor.setDefaultHelpEntry(page.pageType().help_entry_translation_key);
+      editor$1.setDefaultHelpEntry(page.pageType().help_entry_translation_key);
     },
     pageLink: function pageLink(linkId) {
       var pageId = linkId.split(':')[0];
@@ -9376,7 +9412,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.region.show(new EditPageLinkView({
         model: page.pageLinks().get(linkId),
         page: page,
-        api: editor
+        api: editor$1
       }));
     },
     widget: function widget(id) {
@@ -9514,7 +9550,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     initialize: function initialize() {
       this.listenTo(app, 'toggle-help', function (name) {
         this.toggle();
-        this.showSection(name || editor.defaultHelpEntry || this.defaultHelpEntry(), {
+        this.showSection(name || editor$1.defaultHelpEntry || this.defaultHelpEntry(), {
           scrollIntoView: true
         });
       });
@@ -9577,7 +9613,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     events: {
       'click .edit': function clickEdit() {
-        editor.navigate(this.model.editPath(), {
+        editor$1.navigate(this.model.editPath(), {
           trigger: true
         });
         return false;
@@ -9635,7 +9671,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     events: {
       'click .add_link': function clickAdd_link() {
         var view = this;
-        editor.selectPage().then(function (page) {
+        editor$1.selectPage().then(function (page) {
           view.model.pageLinks().addLink(page.get('perma_id'));
         });
         return false;
@@ -10088,7 +10124,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     },
     events: {
       'click .retry': function clickRetry() {
-        editor.failures.retry();
+        editor$1.failures.retry();
       }
     },
     onRender: function onRender() {
@@ -10096,15 +10132,15 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       this.listenTo(state.entry, 'change:confirmable_files_count', this.notifyConfirmableFilesCount);
       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.listenTo(editor$1.failures, 'add', this.update);
+      this.listenTo(editor$1.failures, 'remove', this.update);
       this.update();
       this.notifyConfirmableFilesCount();
     },
     update: function update() {
-      this.$el.toggleClass('failed', !editor.failures.isEmpty());
+      this.$el.toggleClass('failed', !editor$1.failures.isEmpty());
       this.$el.toggleClass('saving', !state.savingRecords.isEmpty());
-      this.ui.failedCount.text(editor.failures.count());
+      this.ui.failedCount.text(editor$1.failures.count());
     },
     notifyUploadCount: function notifyUploadCount(model, uploadCount) {
       this.$el.toggleClass('uploading', uploadCount > 0);
@@ -10122,7 +10158,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     mixins: [inputView],
     initialize: function initialize() {
       if (typeof this.options.collection === 'string') {
-        this.options.collection = state.entry.getFileCollection(editor.fileTypes.findByCollectionName(this.options.collection));
+        this.options.collection = state.entry.getFileCollection(editor$1.fileTypes.findByCollectionName(this.options.collection));
       }
 
       this.listenTo(this.model, 'change:' + this.options.propertyName, this._update);
@@ -10281,17 +10317,17 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     onRender: function onRender() {
       this.nestedFilesView = new NestedFilesView({
         collection: this.model.nestedFiles(this.options.supersetCollection),
-        fileType: editor.fileTypes.findByCollectionName('text_track_files'),
+        fileType: editor$1.fileTypes.findByCollectionName('text_track_files'),
         selection: this.selection,
         model: this.model,
         tableBlankSlateText: I18n$1.t('pageflow.editor.nested_files.text_track_files.no_files_blank_slate')
       });
       this.ui.filesPanel.append(this.subview(this.nestedFilesView).el);
       this.update();
-      editor.setUploadTargetFile(this.model);
+      editor$1.setUploadTargetFile(this.model);
     },
     onClose: function onClose() {
-      editor.setUploadTargetFile(undefined);
+      editor$1.setUploadTargetFile(undefined);
     },
     update: function update() {
       var selectedFile = this.selection.get('file');
@@ -10716,7 +10752,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     }
   });
 
-  editor.widgetTypes.register('classic_loading_spinner', {
+  editor$1.widgetTypes.register('classic_loading_spinner', {
     configurationEditorView: ConfigurationEditorView.extend({
       configure: function configure() {
         this.tab('loading_spinner', function () {
@@ -10728,10 +10764,10 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     })
   });
 
-  editor.widgetTypes.registerRole('cookie_notice', {
+  editor$1.widgetTypes.registerRole('cookie_notice', {
     isOptional: true
   });
-  editor.widgetTypes.register('cookie_notice_bar', {
+  editor$1.widgetTypes.register('cookie_notice_bar', {
     configurationEditorView: ConfigurationEditorView.extend({
       configure: function configure() {
         this.tab('cookie_notice_bar', function () {
@@ -10743,7 +10779,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     })
   });
 
-  editor.widgetTypes.register('media_loading_spinner', {
+  editor$1.widgetTypes.register('media_loading_spinner', {
     configurationEditorView: ConfigurationEditorView.extend({
       configure: function configure() {
         this.tab('loading_spinner', function () {
@@ -10762,7 +10798,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     })
   });
 
-  editor.widgetTypes.register('phone_horizontal_slideshow_mode', {
+  editor$1.widgetTypes.register('phone_horizontal_slideshow_mode', {
     configurationEditorView: ConfigurationEditorView.extend({
       configure: function configure() {
         this.tab('phone_horizontal_slideshow_mode', function () {
@@ -10777,7 +10813,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     })
   });
 
-  editor.widgetTypes.register('title_loading_spinner', {
+  editor$1.widgetTypes.register('title_loading_spinner', {
     configurationEditorView: ConfigurationEditorView.extend({
       configure: function configure() {
         this.tab('loading_spinner', function () {
@@ -10785,7 +10821,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.configuration.get('title') || state.entry.get('entry_title')
+            placeholder: state.entry.metadata.get('title') || state.entry.get('entry_title')
           });
           this.input('subtitle', TextInputView);
           this.input('custom_background_image_id', FileInputView, {
@@ -10827,7 +10863,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
 
   app.addInitializer(function () {
     Backbone.history.on('route', function () {
-      editor.applyDefaultHelpEntry();
+      editor$1.applyDefaultHelpEntry();
     });
   });
 
@@ -10856,7 +10892,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         settingsDialogTabLink: 'general'
       }
     };
-    editor.fileTypes.register('image_files', {
+    editor$1.fileTypes.register('image_files', {
       model: ImageFile,
       metaDataAttributes: ['dimensions', altMetaDataAttribute],
       matchUpload: /^image/,
@@ -10865,7 +10901,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         inputView: TextInputView
       }]
     });
-    editor.fileTypes.register('video_files', {
+    editor$1.fileTypes.register('video_files', {
       model: VideoFile,
       metaDataAttributes: ['format', 'dimensions', 'duration', textTracksMetaDataAttribute, altMetaDataAttribute],
       matchUpload: /^video/,
@@ -10875,7 +10911,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }],
       settingsDialogTabs: [textTracksSettingsDialogTab]
     });
-    editor.fileTypes.register('audio_files', {
+    editor$1.fileTypes.register('audio_files', {
       model: AudioFile,
       metaDataAttributes: ['format', 'duration', textTracksMetaDataAttribute, altMetaDataAttribute],
       matchUpload: /^audio/,
@@ -10885,7 +10921,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       }],
       settingsDialogTabs: [textTracksSettingsDialogTab]
     });
-    editor.fileTypes.register('text_track_files', {
+    editor$1.fileTypes.register('text_track_files', {
       model: TextTrackFile,
       matchUpload: function matchUpload(upload) {
         return upload.name.match(/\.vtt$/) || upload.name.match(/\.srt$/);
@@ -10940,30 +10976,30 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
         binding: 'label'
       }
     });
-    editor.fileTypes.setup(options.config.fileTypes);
+    editor$1.fileTypes.setup(options.config.fileTypes);
   });
 
   app.addInitializer(function (options) {
-    editor.widgetTypes.registerRole('navigation', {
+    editor$1.widgetTypes.registerRole('navigation', {
       isOptional: true
     });
-    editor.widgetTypes.setup(options.widget_types);
+    editor$1.widgetTypes.setup(options.widget_types);
   });
 
   app.addInitializer(function (options) {
-    state.files = FilesCollection.createForFileTypes(editor.fileTypes, options.files);
+    state.files = FilesCollection.createForFileTypes(editor$1.fileTypes, options.files);
     state.imageFiles = state.files.image_files;
     state.videoFiles = state.files.video_files;
     state.audioFiles = state.files.audio_files;
     state.textTrackFiles = state.files.text_track_files;
     var widgets = new WidgetsCollection(options.widgets, {
-      widgetTypes: editor.widgetTypes
+      widgetTypes: editor$1.widgetTypes
     });
     state.themes = new ThemesCollection(options.themes);
     state.pages = new PagesCollection(options.pages);
     state.chapters = new ChaptersCollection(options.chapters);
     state.storylines = new StorylinesCollection(options.storylines);
-    state.entry = editor.createEntryModel(options, {
+    state.entry = editor$1.createEntryModel(options, {
       widgets: widgets
     });
     state.theming = new Theming(options.theming);
@@ -10984,9 +11020,9 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     state.storylines.on('sort', _$1.debounce(function () {
       state.storylines.saveOrder();
     }, 100));
-    editor.failures.watch(state.entry);
-    editor.failures.watch(state.pages);
-    editor.failures.watch(state.chapters);
+    editor$1.failures.watch(state.entry);
+    editor$1.failures.watch(state.pages);
+    editor$1.failures.watch(state.chapters);
     state.savingRecords = new SavingRecordsCollection();
     state.savingRecords.watch(state.pages);
     state.savingRecords.watch(state.chapters);
@@ -10996,13 +11032,13 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   app.addInitializer(function (options) {
     state.fileUploader = new FileUploader({
       entry: state.entry,
-      fileTypes: editor.fileTypes
+      fileTypes: editor$1.fileTypes
     });
-    ConfirmUploadView.watch(state.fileUploader, editor.fileTypes, state.files);
+    ConfirmUploadView.watch(state.fileUploader, editor$1.fileTypes, state.files);
   });
 
   app.addInitializer(function (options) {
-    editor.pageTypes.setup(options.page_types);
+    editor$1.pageTypes.setup(options.page_types);
   });
 
   app.addInitializer(function (options) {
@@ -11016,7 +11052,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
           pageflow.atmo.disable();
         }
       } else if (event.altKey && event.which === KEY_X) {
-        editor.navigate('pages/' + pageflow.slides.currentPage().data('id'), {
+        editor$1.navigate('pages/' + pageflow.slides.currentPage().data('id'), {
           trigger: true
         });
       }
@@ -11024,7 +11060,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   });
 
   app.addInitializer(function (options) {
-    editor.fileImporters.setup(options.config.fileImporters);
+    editor$1.fileImporters.setup(options.config.fileImporters);
   });
 
   app.addInitializer(function (options) {
@@ -11046,14 +11082,14 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     state.entry.on('use:files', function () {
       pageflow.stylesheet.reload('entry');
     });
-    state.entry.configuration.on('change:theme_name', function () {
+    state.entry.metadata.on('change:theme_name', function () {
       var theme = state.entry.getTheme();
       pageflow.stylesheet.update('theme', theme.get('stylesheet_path'));
     });
   });
 
   app.addInitializer(function () {
-    _$1.each(editor.sideBarRoutings, function (options) {
+    _$1.each(editor$1.sideBarRoutings, function (options) {
       new options.router({
         controller: new options.controller({
           region: app.sidebarRegion,
@@ -11062,13 +11098,13 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       });
     });
 
-    editor.router = new SidebarRouter({
+    editor$1.router = new SidebarRouter({
       controller: new SidebarController({
         region: app.sidebarRegion,
         entry: state.entry
       })
     });
-    window.editor = editor.router;
+    window.editor = editor$1.router;
   });
 
   app.addInitializer(function () {
@@ -11090,7 +11126,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
     var context = this;
     var args = arguments;
 
-    _$1.each(editor.initializers, function (fn) {
+    _$1.each(editor$1.initializers, function (fn) {
       fn.call(context, args);
     });
   });
@@ -11103,7 +11139,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
       el: $('sidebar .scrolling'),
       region: app.sidebarRegion
     }).render();
-    app.previewRegion.show(new editor.entryType.previewView({
+    app.previewRegion.show(new editor$1.entryType.previewView({
       model: state.entry
     }));
     app.indicatorsRegion.show(new DisabledAtmoIndicatorView());
@@ -11171,8 +11207,8 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.EncodedFile = EncodedFile;
   exports.EncodingConfirmation = EncodingConfirmation;
   exports.Entry = Entry;
-  exports.EntryConfiguration = EntryConfiguration;
-  exports.EntryConfigurationFileSelectionHandler = EntryConfigurationFileSelectionHandler;
+  exports.EntryMetadata = EntryMetadata;
+  exports.EntryMetadataFileSelectionHandler = EntryMetadataFileSelectionHandler;
   exports.EntryPublication = EntryPublication;
   exports.EntryPublicationQuotaDecoratorView = EntryPublicationQuotaDecoratorView;
   exports.EnumTableCellView = EnumTableCellView;
@@ -11297,7 +11333,7 @@ this.pageflow._editorGlobalInterop = (function (exports, Backbone, _$1, Marionet
   exports.cssModulesUtils = cssModulesUtils;
   exports.delayedDestroying = delayedDestroying;
   exports.dialogView = dialogView;
-  exports.editor = editor;
+  exports.editor = editor$1;
   exports.failureIndicatingView = failureIndicatingView;
   exports.failureTracking = failureTracking;
   exports.fileWithType = fileWithType;