pageflow 0.11.4 → 12.0.0.rc1

data/app/assets/javascripts/pageflow/editor/views/text_file_meta_data_item_value_view.js

@@ -0,0 +1,25 @@
+/**
+ * Renders the value of the attribute given in `options.name`.
+ *
+ * @see {@link module:pageflow/editor.pageflow.FileMetaDataItemValueView
+ * pageflow.FileMetaDataItemValueView} for further options.
+ *
+ * @since 12.0
+ *
+ * @class
+ * @memberof module:pageflow/editor
+ */
+pageflow.TextFileMetaDataItemValueView = pageflow.FileMetaDataItemValueView.extend({
+  getText: function() {
+    var model;
+
+    if (this.options.fromConfiguration) {
+      model = this.model.configuration;
+    }
+    else {
+      model = this.model;
+    }
+
+    return model.get(this.options.name);
+  }
+});

data/app/assets/javascripts/pageflow/editor/views/text_tracks_file_meta_data_item_value_view.js

@@ -0,0 +1,12 @@
+pageflow.TextTracksFileMetaDataItemValueView = pageflow.FileMetaDataItemValueView.extend({
+  initialize: function() {
+    this.textTrackFiles = this.model.nestedFiles(pageflow.textTrackFiles);
+    this.listenTo(this.textTrackFiles, 'add remove change:configuration', this.update);
+  },
+
+  getText: function() {
+    return this.textTrackFiles.map(function(textTrackFile) {
+      return textTrackFile.displayLabel();
+    }).join(', ');
+  }
+});

data/app/assets/javascripts/pageflow/editor/views/text_tracks_view.js

@@ -0,0 +1,65 @@
+pageflow.TextTracksView = Backbone.Marionette.Layout.extend({
+  template: 'templates/text_tracks',
+  className: 'text_tracks',
+
+  regions: {
+    selectedFileRegion: '.selected_file_region'
+  },
+
+  ui: {
+    filesPanel: '.files_panel',
+    selectedFileHeader: '.selected_file_header'
+  },
+
+  events: {
+    'click a.upload': 'upload'
+  },
+
+  initialize: function(options) {
+    this.options = options || {};
+    this.selection = new Backbone.Model();
+    this.listenTo(this.selection, 'change', this.update);
+  },
+
+  onRender: function() {
+    this.nestedFilesView = new pageflow.NestedFilesView({
+      collection: this.model.nestedFiles(this.options.supersetCollection),
+      fileType: pageflow.editor.fileTypes.findByCollectionName('text_track_files'),
+      selection: this.selection,
+      model: this.model,
+      tableBlankSlateText:
+      I18n.t('pageflow.editor.nested_files.text_track_files.no_files_blank_slate')
+    });
+
+    this.ui.filesPanel.append(this.subview(this.nestedFilesView).el);
+
+    this.update();
+
+    pageflow.editor.setUploadTargetFile(this.model);
+  },
+
+  onClose: function() {
+    pageflow.editor.setUploadTargetFile(undefined);
+  },
+
+  update: function() {
+    var selectedFile = this.selection.get('file');
+    if (selectedFile) {
+      this.selectedFileRegion.show(new pageflow.EditFileView({
+        model: selectedFile,
+        attributeTranslationKeyPrefixes: [
+          'pageflow.editor.nested_files.text_track_files'
+        ]
+      }));
+      this.ui.selectedFileHeader.toggle(true);
+    }
+    else {
+      this.selectedFileRegion.close();
+      this.ui.selectedFileHeader.toggle(false);
+    }
+  },
+
+  upload: function() {
+    pageflow.app.trigger('request-upload');
+  }
+});

data/app/assets/javascripts/pageflow/editor/views/uploadable_files_view.js

@@ -0,0 +1,56 @@
+pageflow.UploadableFilesView = Backbone.Marionette.ItemView.extend({
+  template: 'templates/uploadable_files',
+
+  className: 'uploadable_files',
+
+  ui: {
+    header: 'h2'
+  },
+
+  initialize: function() {
+    this.uploadableFiles = this.collection.uploadable();
+
+    if (!this.options.selection.has('file')) {
+      this.options.selection.set('file', this.uploadableFiles.first());
+    }
+  },
+
+  onRender: function() {
+    this.ui.header.text(
+      I18n.t('pageflow.editor.files.tabs.' + this.options.fileType.collectionName)
+    );
+
+    this.appendSubview(new pageflow.TableView({
+      collection: this.uploadableFiles,
+      attributeTranslationKeyPrefixes: [
+        'pageflow.editor.files.attributes.' + this.options.fileType.collectionName,
+        'pageflow.editor.files.common_attributes'
+      ],
+      columns: this.commonColumns().concat(this.fileTypeColumns()),
+      selection: this.options.selection,
+      selectionAttribute: 'file'
+    }));
+
+    this.listenTo(this.uploadableFiles, 'add remove', this.update);
+    this.update();
+  },
+
+  update: function() {
+    this.$el.toggleClass('is_empty', this.uploadableFiles.length === 0);
+  },
+
+  commonColumns: function() {
+    return [
+      {name: 'file_name', cellView: pageflow.TextTableCellView},
+      {name: 'rights', cellView: pageflow.PresenceTableCellView}
+    ];
+  },
+
+  fileTypeColumns: function() {
+    return _(this.options.fileType.confirmUploadTableColumns).map(function(column) {
+      return _.extend({}, column, {
+        configurationAttribute: true
+      });
+    });
+  }
+});

data/app/assets/javascripts/pageflow/editor/views/uploader_view.js

@@ -2,7 +2,6 @@ pageflow.UploaderView = Backbone.Marionette.View.extend({
   el: 'form#upload',
 
   ui: {
-    input: 'input#image_file_attachment',
     authToken: 'input[name="authenticity_token"]'
   },
 
@@ -16,20 +15,24 @@ pageflow.UploaderView = Backbone.Marionette.View.extend({
     this.bindUIElements();
 
     this.$el.fileupload({
-      acceptFileTypes: /(\.|\/)(bmp|gif|jpe?g|png|ti?f|wmv|mp4|mpg|mov|asf|asx|avi|m?v|mpeg|qt|3g2|3gp|3ivx|divx|3vx|vob|flv|dvx|xvid|mkv)$/i,
+      acceptFileTypes: new RegExp ('(\\.|\\/)(bmp|gif|jpe?g|png|ti?f|wmv|mp4|mpg|mov|asf|asx|avi|' +
+                                   'm?v|mpeg|qt|3g2|3gp|3ivx|divx|3vx|vob|flv|dvx|xvid|mkv|vtt)$',
+                                   'i'),
       dataType: 'json',
 
       add: function(event, data) {
         try {
-          data.record = pageflow.entry.addFileUpload(data.files[0]);
-          var xhr = data.submit();
+          pageflow.fileUploader.add(data.files[0]).then(function(record) {
+            data.record = record;
+            var xhr = data.submit();
 
-          that.listenTo(data.record, 'uploadCancelled', function() {
-            xhr.abort();
+            that.listenTo(data.record, 'uploadCancelled', function() {
+              xhr.abort();
+            });
           });
         }
         catch(e) {
-          if (e instanceof pageflow.FileTypes.UnmatchedUploadError) {
+          if (e instanceof pageflow.UploadError) {
             pageflow.app.trigger('error', e);
           }
           else {
@@ -48,9 +51,9 @@ pageflow.UploaderView = Backbone.Marionette.View.extend({
         this.action = record.url();
 
         data.paramName = record.modelName + '[attachment]';
-        data.formData = {
+        data.formData = _.extend({
           authenticity_token: that.ui.authToken.attr('value')
-        };
+        }, pageflow.formDataUtils.fromModel(record));
       },
 
       done: function(event, data) {
@@ -75,4 +78,4 @@ pageflow.UploaderView = Backbone.Marionette.View.extend({
   openFileDialog: function() {
     this.$('input:file').click();
   }
-});
+});

data/app/assets/javascripts/pageflow/features.js

@@ -1,10 +1,14 @@
 /**
- * Registry of functions which extend pageflow when a named feature is
+ * Let plugins register functions which extend the editor or
+ * slideshow with certain functionality when a named feature is
  * enabled.
  *
+ * @alias pageflow.features
  * @since 0.9
  */
-pageflow.Features = pageflow.Object.extend({
+pageflow.Features = pageflow.Object.extend(
+  /** @lends pageflow.features */{
+
   /** @api private */
   initialize: function() {
     this.registry = {};
@@ -22,7 +26,7 @@ pageflow.Features = pageflow.Object.extend({
   /**
    * Register a function to configure a feature when it is active.
    *
-   * @param scope [String] Name of the scope the passed function
+   * @param {String} scope - Name of the scope the passed function
    *   shall be called in.
    * @param name [String] Name of the feature
    * @param fn [Function] Function to call when the given feature
@@ -57,12 +61,4 @@ pageflow.Features = pageflow.Object.extend({
   }
 });
 
-/**
- * Let plugins register functions which extend the editor or
- * slideshow with certain functionality when a named feature is
- * enabled.
- *
- * @return [pageflow.Features]
- * @since 0.9
- */
-pageflow.features = new pageflow.Features();
+pageflow.features = new pageflow.Features();

data/app/assets/javascripts/pageflow/focus_outline.js

@@ -26,6 +26,7 @@
       if (!this.disabled) {
         this.disabled = true;
         this.element.addClass('disable_focus_outline');
+        this.element.removeClass('enable_focus_outline');
       }
     },
 
@@ -33,6 +34,7 @@
       if (this.disabled) {
         this.disabled = false;
         this.element.removeClass('disable_focus_outline');
+        this.element.addClass('enable_focus_outline');
       }
     }
   });

data/app/assets/javascripts/pageflow/media_player/volume_binding.js

@@ -59,10 +59,12 @@ pageflow.mediaPlayer.volumeBinding = function(player, settings, options) {
   };
 
   function listenToVolumeSetting() {
+    player.on('dispose', stopListeningToVolumeSetting);
     settings.on('change:volume', onVolumeChange);
   }
 
   function stopListeningToVolumeSetting() {
+    player.off('dispose', stopListeningToVolumeSetting);
     settings.off('change:volume', onVolumeChange);
   }
 

data/app/assets/javascripts/pageflow/media_player/volume_fading.js

@@ -12,6 +12,10 @@ pageflow.mediaPlayer.volumeFading = function(player) {
   };
 
   player.fadeVolume = function(value, duration) {
+    if (!pageflow.browser.has('volume control support')) {
+      return new jQuery.Deferred().resolve().promise();
+    }
+
     cancelFadeVolume();
 
     return new $.Deferred(function(deferred) {
@@ -42,6 +46,8 @@ pageflow.mediaPlayer.volumeFading = function(player) {
     }
   };
 
+  player.one('dispose', cancelFadeVolume);
+
   function resolveFadeVolume() {
     clearInterval(fadeVolumeInterval);
     fadeVolumeDeferred.resolve();

data/app/assets/javascripts/pageflow/page_type.js

@@ -1,6 +1,5 @@
 //= require_self
 //= require_tree ./page_types/mixins
-//= require_tree ./page_types
 
 pageflow.pageType = (function() {
   var base = {

data/app/assets/javascripts/pageflow/phone_landscape_fullscreen.js

@@ -0,0 +1,34 @@
+pageflow.phoneLandscapeFullscreen = function() {
+  if (window.screen.orientation) {
+    pageflow.ready.then(function() {
+      if (pageflow.browser.has('phone platform') &&
+          !pageflow.browser.has('iphone platform')) {
+
+        window.screen.orientation.onchange = function() {
+          if (isLandscape()) {
+            requestFullscreen(document.body);
+          }
+        };
+      }
+    });
+  }
+
+  function isLandscape() {
+    return window.orientation == 90 || window.orientation == -90;
+  }
+
+  function requestFullscreen(el) {
+    if (el.requestFullscreen) {
+      el.requestFullscreen();
+    }
+    else if (el.mozRequestFullScreen) {
+      el.mozRequestFullScreen();
+    }
+    else if (el.webkitRequestFullscreen) {
+      el.webkitRequestFullscreen();
+    }
+    else if (el.webkitEnterFullscreen) {
+      el.webkitEnterFullscreen();
+    }
+  }
+};

data/app/assets/javascripts/pageflow/react.js

@@ -0,0 +1,4 @@
+// Files in the dist folder are generated by Webpack in the
+// node_package directory.
+
+//= require ./dist/react

data/app/assets/javascripts/pageflow/ready.js

@@ -9,6 +9,8 @@ pageflow.ready = new $.Deferred(function(readyDeferred) {
       });
 
       slideshow.each(function() {
+        pageflow.events.trigger('seed:loaded');
+
         pageflow.entryData = new pageflow.SeedEntryData(
           pageflow.seed
         );
@@ -28,6 +30,7 @@ pageflow.ready = new $.Deferred(function(readyDeferred) {
             $('.multimedia_alert').multimediaAlert();
 
             pageflow.widgetTypes.enhance(body);
+            pageflow.phoneLandscapeFullscreen();
           }
         });
       });

data/app/assets/javascripts/pageflow/seed_entry_data.js

@@ -2,7 +2,10 @@ pageflow.SeedEntryData = pageflow.EntryData.extend({
   initialize: function(options) {
     this.theming = options.theming;
 
-    this.storylineConfigurations = options.storyline_configurations;
+    this.storylineConfigurations = _(options.storylines).reduce(function(memo, storyline) {
+      memo[storyline.id] = storyline.configuration;
+      return memo;
+    }, {});
 
     this.storylineIdsByChapterIds = _(options.chapters).reduce(function(memo, chapter) {
       memo[chapter.id] = chapter.storyline_id;

data/app/assets/javascripts/pageflow/slideshow.js

@@ -179,6 +179,7 @@ pageflow.Slideshow = function($el, configurations) {
 
   this.triggerResizeHooks = function() {
     currentPage.page('resize');
+    pageflow.events.trigger('resize');
   };
 
   $el.on('scrollerbumpup', _.bind(function(event) {

data/app/assets/javascripts/pageflow/slideshow/adjacent_preparer.js

@@ -18,11 +18,13 @@ pageflow.AdjacentPreparer = pageflow.Object.extend({
 
   prepareAdjacent: function(page) {
     var adjacentPages = this.adjacentPages.of(page);
-    var noLongerAdjacentPages = _.difference(this.lastAdjacentPages, adjacentPages, [page]);
-    var newAdjacentPages = _.difference(adjacentPages, this.lastAdjacentPages);
+    var noLongerPreparedPages = _.difference(this.lastPreparedPages, adjacentPages, [page]);
+    var newAdjacentPages = _.difference(adjacentPages, this.lastPreparedPages);
 
-    _(noLongerAdjacentPages).each(function(page) {
-      page.unprepare();
+    _(noLongerPreparedPages).each(function(page) {
+      if (!page.isDestroyed) {
+        page.unprepare();
+      }
     });
 
     _(newAdjacentPages).each(function(adjacentPage) {
@@ -30,7 +32,7 @@ pageflow.AdjacentPreparer = pageflow.Object.extend({
       adjacentPage.preload();
     });
 
-    this.lastAdjacentPages = adjacentPages;
+    this.lastPreparedPages = adjacentPages.concat([page]);
   }
 });
 

data/app/assets/javascripts/pageflow/slideshow/atmo.js

@@ -5,7 +5,7 @@
     initialize: function(slideshow, events, multiPlayer) {
       this.slideshow = slideshow;
       this.multiPlayer = multiPlayer;
-      this.disabled = false;
+      this.disabled = pageflow.browser.has('mobile platform');
 
       this.listenTo(events, 'page:change page:update', function() {
         this.update();
@@ -61,7 +61,7 @@
     update: function() {
       var configuration = this.slideshow.currentPageConfiguration();
 
-      if (!this.disabled && !pageflow.browser.has('mobile platform')) {
+      if (!this.disabled) {
         this.multiPlayer.fadeTo(configuration[attributeName]);
       }
     },
@@ -102,4 +102,4 @@
   };
 
   pageflow.Atmo.duringPlaybackModes = ['play', 'mute', 'turn_down'];
-}());
+}());