pageflow 15.1.0.beta5 → 15.1.0.beta6

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '15.1.0.beta5'.freeze
+  VERSION = '15.1.0.beta6'.freeze
 end

data/packages/pageflow/editor.js

@@ -1063,7 +1063,7 @@ var EditorApi = Object$1.extend(
   }
 });
 
-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) {
@@ -1309,7 +1309,7 @@ var transientReferences = {
   },
   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);
     }
 
@@ -1613,7 +1613,7 @@ var Page = Backbone.Model.extend({
     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), {
@@ -1670,7 +1670,7 @@ var StorylineScaffold = Scaffold.extend({
       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) {
@@ -2004,7 +2004,7 @@ var WidgetConfigurationFileSelectionHandler = function WidgetConfigurationFileSe
     return '/widgets/' + widget.id;
   };
 };
-editor.registerFileSelectionHandler('widgetConfiguration', WidgetConfigurationFileSelectionHandler);
+editor$1.registerFileSelectionHandler('widgetConfiguration', WidgetConfigurationFileSelectionHandler);
 
 var EncodingConfirmation = Backbone.Model.extend({
   paramRoot: 'encoding_confirmation',
@@ -2109,9 +2109,24 @@ var AudioFile = EncodedFile.extend({
   }
 });
 
-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({
@@ -2268,7 +2283,7 @@ var PageConfigurationFileSelectionHandler = function PageConfigurationFileSelect
     return '/pages/' + page.id + '/' + (options.returnToTab || 'files');
   };
 };
-editor.registerFileSelectionHandler('pageConfiguration', PageConfigurationFileSelectionHandler);
+editor$1.registerFileSelectionHandler('pageConfiguration', PageConfigurationFileSelectionHandler);
 
 var ImageFile = ReusableFile.extend({
   stages: [{
@@ -2290,16 +2305,16 @@ var ImageFile = ReusableFile.extend({
   }
 });
 
-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',
@@ -2628,7 +2643,7 @@ var FileUploader = Object$1.extend({
   },
   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',
@@ -2638,12 +2653,12 @@ var FileUploader = Object$1.extend({
     }, {
       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
         });
       }
@@ -2723,7 +2738,7 @@ var orderedCollection = {
         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));
       }
     });
   }
@@ -2749,7 +2764,7 @@ var ChapterPagesCollection = SubsetCollection.extend({
     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;
@@ -2828,7 +2843,7 @@ var StorylineChaptersCollection = SubsetCollection.extend({
     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;
@@ -2954,7 +2969,7 @@ var PageLinkFileSelectionHandler = function PageLinkFileSelectionHandler(options
     return '/page_links/' + pageLink.id;
   };
 };
-editor.registerFileSelectionHandler('pageLink', PageLinkFileSelectionHandler);
+editor$1.registerFileSelectionHandler('pageLink', PageLinkFileSelectionHandler);
 
 var persistedPromise = {
   persisted: function persisted() {
@@ -3039,11 +3054,11 @@ var Entry = Backbone.Model.extend({
   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;
@@ -3062,11 +3077,11 @@ var Entry = Backbone.Model.extend({
     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.
@@ -3075,7 +3090,7 @@ var Entry = Backbone.Model.extend({
     });
   },
   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);
@@ -3158,7 +3173,10 @@ var Entry = Backbone.Model.extend({
     }, this);
   },
   toJSON: function toJSON() {
-    return this.configuration.toJSON();
+    var metadataJSON = this.metadata.toJSON();
+    var configJSON = this.metadata.configuration.toJSON();
+    metadataJSON.configuration = configJSON;
+    return metadataJSON;
   }
 });
 
@@ -3294,7 +3312,7 @@ var FileImport = Backbone.Model.extend({
 
             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
               });
@@ -3622,7 +3640,7 @@ var BackButtonDecoratorView = Marionette.Layout.extend({
     this.outlet.show(this.options.view);
   },
   goBack: function goBack() {
-    editor.navigate('/', {
+    editor$1.navigate('/', {
       trigger: true
     });
   }
@@ -3765,7 +3783,7 @@ var failureIndicatingView = {
   },
   events: {
     'click .retry': function clickRetry() {
-      editor.failures.retry();
+      editor$1.failures.retry();
       return false;
     }
   },
@@ -3829,7 +3847,7 @@ var EditChapterView = Marionette.Layout.extend({
     }
   },
   goBack: function goBack() {
-    editor.navigate('/', {
+    editor$1.navigate('/', {
       trigger: true
     });
   }
@@ -3870,7 +3888,7 @@ var EditEntryView = Marionette.Layout.extend({
     },
     'click a.publish': function clickAPublish() {
       if (!this.ui.publishButton.hasClass('disabled')) {
-        editor.navigate('/publish', {
+        editor$1.navigate('/publish', {
           trigger: true
         });
       }
@@ -3878,7 +3896,7 @@ var EditEntryView = Marionette.Layout.extend({
       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;
@@ -3889,7 +3907,7 @@ var EditEntryView = Marionette.Layout.extend({
 
     this._updatePublishButton();
 
-    this.outlineRegion.show(new editor.entryType.outlineView({
+    this.outlineRegion.show(new editor$1.entryType.outlineView({
       entry: state.entry,
       navigatable: true,
       editable: true,
@@ -3911,7 +3929,7 @@ var EditEntryView = Marionette.Layout.extend({
   _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');
 
@@ -3953,7 +3971,7 @@ var WidgetItemView = Marionette.Layout.extend({
   },
   events: {
     'click .settings': function clickSettings() {
-      editor.navigate('/widgets/' + this.model.role(), {
+      editor$1.navigate('/widgets/' + this.model.role(), {
         trigger: true
       });
       return false;
@@ -4435,7 +4453,7 @@ var FileInputView = Marionette.ItemView.extend({
   },
   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({
@@ -4457,7 +4475,7 @@ var FileInputView = Marionette.ItemView.extend({
     }, 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();
@@ -4964,13 +4982,17 @@ var EditMetaDataView = Marionette.Layout.extend({
   },
   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,
@@ -4978,17 +5000,23 @@ var EditMetaDataView = Marionette.Layout.extend({
           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 () {
@@ -4998,31 +5026,36 @@ var EditMetaDataView = Marionette.Layout.extend({
         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);
@@ -5078,7 +5111,7 @@ var EditPageLinkView = Marionette.Layout.extend({
     }
   },
   goBack: function goBack() {
-    editor.navigate('/pages/' + this.options.page.id + '/links', {
+    editor$1.navigate('/pages/' + this.options.page.id + '/links', {
       trigger: true
     });
   }
@@ -5147,7 +5180,7 @@ var EditPageView = Marionette.Layout.extend({
     }
   },
   goBack: function goBack() {
-    editor.navigate('/', {
+    editor$1.navigate('/', {
       trigger: true
     });
   }
@@ -5155,7 +5188,7 @@ var EditPageView = Marionette.Layout.extend({
 
 var PageLinkInputView = ReferenceInputView.extend({
   choose: function choose() {
-    return editor.selectPage({
+    return editor$1.selectPage({
       isAllowed: this.options.isAllowed
     });
   },
@@ -5256,7 +5289,7 @@ var EditStorylineView = Marionette.Layout.extend({
     }
   },
   goBack: function goBack() {
-    editor.navigate('/?storyline=' + this.model.id, {
+    editor$1.navigate('/?storyline=' + this.model.id, {
       trigger: true
     });
   }
@@ -5275,7 +5308,7 @@ var EditWidgetView = Marionette.ItemView.extend({
   className: 'edit_widget',
   events: {
     'click a.back': function clickABack() {
-      editor.navigate('/meta_data/widgets', {
+      editor$1.navigate('/meta_data/widgets', {
         trigger: true
       });
     }
@@ -5489,7 +5522,7 @@ var FilesExplorerView = Marionette.ItemView.extend({
       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);
       }
@@ -5664,7 +5697,7 @@ var FileItemView = Marionette.ItemView.extend({
       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
         });
       }
@@ -5749,7 +5782,7 @@ var FileItemView = Marionette.ItemView.extend({
     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
     });
   },
@@ -5785,7 +5818,7 @@ var FilteredFilesView = Marionette.ItemView.extend({
   },
   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;
@@ -5904,7 +5937,7 @@ var ChooseImporterView = Marionette.ItemView.extend({
   },
   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
@@ -6126,7 +6159,7 @@ var FilesImporterView = Marionette.ItemView.extend({
 
         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,
@@ -6141,7 +6174,7 @@ var FilesImporterView = Marionette.ItemView.extend({
         }
 
         ConfirmFileImportUploadView.open({
-          fileTypes: editor.fileTypes,
+          fileTypes: editor$1.fileTypes,
           fileImportModel: self.model,
           files: state.files
         });
@@ -6236,7 +6269,7 @@ var FilesView = Marionette.ItemView.extend({
       }
     }];
 
-    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() {
@@ -6263,7 +6296,7 @@ var FilesView = Marionette.ItemView.extend({
       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);
       }
@@ -6286,11 +6319,11 @@ var FilesView = Marionette.ItemView.extend({
   },
   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
       });
     }
@@ -6661,11 +6694,11 @@ var SidebarController = Marionette.Controller.extend({
   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({
@@ -6678,7 +6711,10 @@ var SidebarController = Marionette.Controller.extend({
   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() {
@@ -6686,7 +6722,7 @@ var SidebarController = Marionette.Controller.extend({
       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({
@@ -6702,10 +6738,10 @@ var SidebarController = Marionette.Controller.extend({
     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];
@@ -6713,7 +6749,7 @@ var SidebarController = Marionette.Controller.extend({
     this.region.show(new EditPageLinkView({
       model: page.pageLinks().get(linkId),
       page: page,
-      api: editor
+      api: editor$1
     }));
   },
   widget: function widget(id) {
@@ -6851,7 +6887,7 @@ var HelpView = Marionette.ItemView.extend({
   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
       });
     });
@@ -6914,7 +6950,7 @@ var PageLinkItemView = Marionette.ItemView.extend({
   },
   events: {
     'click .edit': function clickEdit() {
-      editor.navigate(this.model.editPath(), {
+      editor$1.navigate(this.model.editPath(), {
         trigger: true
       });
       return false;
@@ -6972,7 +7008,7 @@ var PageLinksView = Marionette.ItemView.extend({
   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;
@@ -7425,7 +7461,7 @@ var NotificationsView = Marionette.ItemView.extend({
   },
   events: {
     'click .retry': function clickRetry() {
-      editor.failures.retry();
+      editor$1.failures.retry();
     }
   },
   onRender: function onRender() {
@@ -7433,15 +7469,15 @@ var NotificationsView = Marionette.ItemView.extend({
     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);
@@ -7459,7 +7495,7 @@ var FileProcessingStateDisplayView = Marionette.View.extend({
   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);
@@ -7618,17 +7654,17 @@ var TextTracksView = Marionette.Layout.extend({
   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');
@@ -8053,7 +8089,7 @@ ConfigurationEditorTabView.groups.define('options', function (options) {
   }
 });
 
-editor.widgetTypes.register('classic_loading_spinner', {
+editor$1.widgetTypes.register('classic_loading_spinner', {
   configurationEditorView: ConfigurationEditorView.extend({
     configure: function configure() {
       this.tab('loading_spinner', function () {
@@ -8065,10 +8101,10 @@ editor.widgetTypes.register('classic_loading_spinner', {
   })
 });
 
-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 () {
@@ -8080,7 +8116,7 @@ editor.widgetTypes.register('cookie_notice_bar', {
   })
 });
 
-editor.widgetTypes.register('media_loading_spinner', {
+editor$1.widgetTypes.register('media_loading_spinner', {
   configurationEditorView: ConfigurationEditorView.extend({
     configure: function configure() {
       this.tab('loading_spinner', function () {
@@ -8099,7 +8135,7 @@ editor.widgetTypes.register('media_loading_spinner', {
   })
 });
 
-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 () {
@@ -8114,7 +8150,7 @@ editor.widgetTypes.register('phone_horizontal_slideshow_mode', {
   })
 });
 
-editor.widgetTypes.register('title_loading_spinner', {
+editor$1.widgetTypes.register('title_loading_spinner', {
   configurationEditorView: ConfigurationEditorView.extend({
     configure: function configure() {
       this.tab('loading_spinner', function () {
@@ -8122,7 +8158,7 @@ editor.widgetTypes.register('title_loading_spinner', {
           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, {
@@ -8164,7 +8200,7 @@ app.addInitializer(function (options) {
 
 app.addInitializer(function () {
   Backbone.history.on('route', function () {
-    editor.applyDefaultHelpEntry();
+    editor$1.applyDefaultHelpEntry();
   });
 });
 
@@ -8193,7 +8229,7 @@ app.addInitializer(function (options) {
       settingsDialogTabLink: 'general'
     }
   };
-  editor.fileTypes.register('image_files', {
+  editor$1.fileTypes.register('image_files', {
     model: ImageFile,
     metaDataAttributes: ['dimensions', altMetaDataAttribute],
     matchUpload: /^image/,
@@ -8202,7 +8238,7 @@ app.addInitializer(function (options) {
       inputView: TextInputView
     }]
   });
-  editor.fileTypes.register('video_files', {
+  editor$1.fileTypes.register('video_files', {
     model: VideoFile,
     metaDataAttributes: ['format', 'dimensions', 'duration', textTracksMetaDataAttribute, altMetaDataAttribute],
     matchUpload: /^video/,
@@ -8212,7 +8248,7 @@ app.addInitializer(function (options) {
     }],
     settingsDialogTabs: [textTracksSettingsDialogTab]
   });
-  editor.fileTypes.register('audio_files', {
+  editor$1.fileTypes.register('audio_files', {
     model: AudioFile,
     metaDataAttributes: ['format', 'duration', textTracksMetaDataAttribute, altMetaDataAttribute],
     matchUpload: /^audio/,
@@ -8222,7 +8258,7 @@ app.addInitializer(function (options) {
     }],
     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$/);
@@ -8277,30 +8313,30 @@ app.addInitializer(function (options) {
       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);
@@ -8321,9 +8357,9 @@ app.addInitializer(function (options) {
   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);
@@ -8333,13 +8369,13 @@ app.addInitializer(function (options) {
 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) {
@@ -8353,7 +8389,7 @@ app.addInitializer(function (options) {
         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
       });
     }
@@ -8361,7 +8397,7 @@ app.addInitializer(function (options) {
 });
 
 app.addInitializer(function (options) {
-  editor.fileImporters.setup(options.config.fileImporters);
+  editor$1.fileImporters.setup(options.config.fileImporters);
 });
 
 app.addInitializer(function (options) {
@@ -8383,14 +8419,14 @@ app.addInitializer(function (options) {
   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,
@@ -8399,13 +8435,13 @@ app.addInitializer(function () {
     });
   });
 
-  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 () {
@@ -8427,7 +8463,7 @@ app.addInitializer(function ()
   var context = this;
   var args = arguments;
 
-  _$1.each(editor.initializers, function (fn) {
+  _$1.each(editor$1.initializers, function (fn) {
     fn.call(context, args);
   });
 });
@@ -8440,7 +8476,7 @@ app.addInitializer(function (options) {
     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());
@@ -8462,4 +8498,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, DisabledAtmoIndicatorView, DropDownButtonItemListView, DropDownButtonItemView, DropDownButtonView, EditChapterView, EditEntryView, EditFileView, EditLock, EditLockContainer, EditMetaDataView, EditPageLinkView, EditPageView, EditStorylineView, EditWidgetView, EditWidgetsView, EditorApi, EditorView, EmulationModeButtonView, EncodedFile, EncodingConfirmation, Entry, EntryConfiguration, EntryConfigurationFileSelectionHandler, EntryPublication, EntryPublicationQuotaDecoratorView, ExplorerFileItemView, FileConfiguration, FileImport, FileInputView, FileItemView, FileMetaDataItemValueView, FileMetaDataItemView, FileProcessingStateDisplayView, FileReuse, FileSettingsDialogView, FileStage, FileStageItemView, FileThumbnailView, FileTypes, FileTypesCollection, FileUploader, FilesCollection, FilesExplorerView, FilesImporterView, FilesView, FilteredFilesView, HelpButtonView, HelpImageView, HelpView, ImageFile, InfoBoxView, InvalidNestedTypeError, LazyVideoEmbeddedView, ListItemView, ListView, LoadingView, LockedView, ModelThumbnailView, MultiCollection, NestedFilesCollection, NestedFilesView, NestedTypeError, NotificationsView, OrderedPageLinksCollection, OtherEntriesCollection, OtherEntriesCollectionView, OtherEntry, OtherEntryItemView, Page, PageConfigurationFileSelectionHandler, PageLink, PageLinkConfigurationEditorView, PageLinkFileSelectionHandler, PageLinkInputView, PageLinkItemView, PageLinksCollection, PageLinksView, PageThumbnailView, PagesCollection, PreviewEntryData, PublishEntryView, ReferenceInputView, ReusableFile, SavingRecordsCollection, 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, delayedDestroying, dialogView, editor, failureIndicatingView, failureTracking, fileWithType, filesCountWatcher, formDataUtils, loadable, 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, DisabledAtmoIndicatorView, DropDownButtonItemListView, DropDownButtonItemView, DropDownButtonView, EditChapterView, EditEntryView, EditFileView, EditLock, EditLockContainer, EditMetaDataView, EditPageLinkView, EditPageView, EditStorylineView, EditWidgetView, EditWidgetsView, EditorApi, EditorView, EmulationModeButtonView, EncodedFile, EncodingConfirmation, Entry, EntryMetadata, EntryMetadataFileSelectionHandler, EntryPublication, EntryPublicationQuotaDecoratorView, ExplorerFileItemView, FileConfiguration, FileImport, FileInputView, FileItemView, FileMetaDataItemValueView, FileMetaDataItemView, FileProcessingStateDisplayView, FileReuse, FileSettingsDialogView, FileStage, FileStageItemView, FileThumbnailView, FileTypes, FileTypesCollection, FileUploader, FilesCollection, FilesExplorerView, FilesImporterView, FilesView, FilteredFilesView, HelpButtonView, HelpImageView, HelpView, ImageFile, InfoBoxView, InvalidNestedTypeError, LazyVideoEmbeddedView, ListItemView, ListView, LoadingView, LockedView, ModelThumbnailView, MultiCollection, NestedFilesCollection, NestedFilesView, NestedTypeError, NotificationsView, OrderedPageLinksCollection, OtherEntriesCollection, OtherEntriesCollectionView, OtherEntry, OtherEntryItemView, Page, PageConfigurationFileSelectionHandler, PageLink, PageLinkConfigurationEditorView, PageLinkFileSelectionHandler, PageLinkInputView, PageLinkItemView, PageLinksCollection, PageLinksView, PageThumbnailView, PagesCollection, PreviewEntryData, PublishEntryView, ReferenceInputView, ReusableFile, SavingRecordsCollection, 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, delayedDestroying, dialogView, editor$1 as editor, failureIndicatingView, failureTracking, fileWithType, filesCountWatcher, formDataUtils, loadable, orderedCollection, persistedPromise, polling, retryable, selectableView, stageProvider, startEditor, state, stylesheet, transientReferences, validFileTypeTranslationList };