pageflow 0.9.2 → 0.10.0

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

@@ -13,6 +13,7 @@
 
 //= require polyfills/bind
 
+//= require i18n
 //= require jquery
 //= require jquery-ui/widget
 //= require jquery_ujs
@@ -52,6 +53,7 @@
 //= require ./chapter_filter
 //= require ./fullscreen
 //= require ./multimedia_alert
+//= require ./native_scrolling
 
 //= require ./settings
 

data/app/assets/javascripts/pageflow/browser/agent.js

@@ -0,0 +1,25 @@
+pageflow.browser.agent = {
+  matchesSilk: function() {
+    return navigator.userAgent.match(/\bSilk\b/);
+  },
+
+  matchesDesktopSafari9: function() {
+    return this.matchesSafari9() && !this.matchesMobilePlatform();
+  },
+
+  matchesSafari9: function() {
+    var matchers = [/Safari\//i, /Version\/9/i];
+
+    return _.all(matchers, function(matcher) {
+      return navigator.userAgent.match(matcher);
+    });
+  },
+
+  matchesMobilePlatform: function() {
+    var matchers = [/iPod/i, /iPad/i, /iPhone/i, /Android/i, /Silk/i, /IEMobile/i];
+
+    return _.any(matchers, function(matcher) {
+      return navigator.userAgent.match(matcher);
+    });
+  }
+};

data/app/assets/javascripts/pageflow/browser/css_animations.js

@@ -0,0 +1,18 @@
+// See https://developer.mozilla.org/de/docs/Web/CSS/CSS_Animations/Detecting_CSS_animation_support
+
+pageflow.browser.feature('css animations', function() {
+  var prefixes = ['Webkit', 'Moz', 'O', 'ms', 'Khtml'],
+      elm = document.createElement('div');
+
+  if (elm.style.animationName !== undefined) {
+    return true;
+  }
+
+  for (var i = 0; i < prefixes.length; i++) {
+    if (elm.style[prefixes[i] + 'AnimationName'] !== undefined) {
+      return true;
+    }
+  }
+
+  return false;
+});

data/app/assets/javascripts/pageflow/browser/mobile_platform.js

@@ -1,8 +1,5 @@
 pageflow.browser.feature('mobile platform', function() {
-  var matchers = [/iPod/i, /iPad/i, /iPhone/i, /Android/i, /Silk/i, /IEMobile/i];
-  return _.any(matchers, function(matcher) {
-    return navigator.userAgent.match(matcher);
-  });
+  return pageflow.browser.agent.matchesMobilePlatform();
 });
 
 if (navigator.userAgent.match(/iPad;.*CPU.*OS 7_\d/i) && !window.navigator.standalone) {

data/app/assets/javascripts/pageflow/browser/video.js

@@ -13,4 +13,11 @@ pageflow.browser.feature('buffer underrun waiting support', function(has) {
 
 pageflow.browser.feature('prebuffering support', function(has) {
   return has.not('mobile platform');
-});
+});
+
+pageflow.browser.feature('mp4 support only', function(has) {
+  // - Silk does not play videos with hls source
+  // - Desktop Safari 9.1 does not loop hls videos
+  return pageflow.browser.agent.matchesSilk() ||
+    pageflow.browser.agent.matchesDesktopSafari9();
+});

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

@@ -4,28 +4,17 @@ pageflow.ChapterFilter = pageflow.Object.extend({
   },
 
   strategies: {
-    all: function() {
-      return true;
-    },
-
     non: function() {
       return false;
     },
 
-    current_chapter: function(currentChapterId, otherChapterId) {
-      return otherChapterId === currentChapterId;
+    current_storyline: function(currentChapterId, otherChapterId) {
+      return this.entry.getStorylineIdByChapterId(currentChapterId) ===
+        this.entry.getStorylineIdByChapterId(otherChapterId);
     },
 
     inherit_from_parent: function(currentChapterId, otherChapterId) {
       return this.chapterVisibleFromChapter(this.entry.getParentChapterId(currentChapterId), otherChapterId);
-    },
-
-    same_parent_page: function(currentChapterId, otherChapterId) {
-      return this.entry.getParentPagePermaId(currentChapterId) === this.entry.getParentPagePermaId(otherChapterId);
-    },
-
-    same_parent_chapter: function(currentChapterId, otherChapterId) {
-      return this.entry.getParentChapterId(currentChapterId) === this.entry.getParentChapterId(otherChapterId);
     }
   },
 
@@ -41,11 +30,12 @@ pageflow.ChapterFilter = pageflow.Object.extend({
 
   getStrategy: function(chapterId) {
     return this.strategies[this.getNavigationBarMode(chapterId)] ||
-      this.strategies.all;
+      this.strategies.current_storyline;
   },
 
   getNavigationBarMode: function(chapterId) {
-    return this.entry.getChapterConfiguration(chapterId).navigation_bar_mode;
+    var storylineId = this.entry.getStorylineIdByChapterId(chapterId);
+    return this.entry.getStorylineConfiguration(storylineId).navigation_bar_mode;
   }
 });
 

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

@@ -140,9 +140,13 @@ pageflow.EditorApi = pageflow.Object.extend({
     /**
      * Returns a promise which resolves to a page selected by the
      * user.
+     *
+     * Supported options:
+     * - isAllowed: function which given a page returns true or false depending on
+     *   whether the page is a valid selection
      */
-    this.selectPage = function() {
-      return pageflow.PageSelectionView.selectPage();
+    this.selectPage = function(options) {
+      return pageflow.PageSelectionView.selectPage(options);
     };
 
     /**

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

@@ -38,5 +38,17 @@ pageflow.PageType = pageflow.Object.extend({
         'pageflow.common_page_attributes'
       ]
     }, options));
+  },
+
+  createPageLinkConfigurationEditorView: function(options) {
+    var constructor = this.options.pageLinkConfigurationEditorView ||
+      pageflow.PageLinkConfigurationEditorView;
+
+    return new constructor(_.extend({
+      attributeTranslationKeyPrefixes: [
+        this.seed.translation_key_prefix + '.page_link_attributes',
+        'pageflow.common_page_link_attributes'
+      ]
+    }, options));
   }
 });

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

@@ -15,11 +15,13 @@
 
 //= require_self
 
+//= require_tree ./utils
 //= require_tree ./models/mixins
 //= require ./models/uploaded_file
 //= require ./models/hosted_file
 //= require ./models/encoded_file
 //= require ./models/configuration
+//= require ./models/scaffold
 //= require_tree ./models
 //= require_tree ./collections/mixins
 //= require ./collections/multi_collection
@@ -39,6 +41,7 @@
 //= require_tree ./views
 
 //= require ./initializers/setup_config
+//= require ./initializers/setup_common_seed
 //= require ./initializers/setup_features
 //= require ./initializers/setup_audio
 //= require ./initializers/setup_help_entries
@@ -49,6 +52,7 @@
 //= require ./initializers/setup_hotkeys
 //= require ./initializers/edit_lock
 //= require ./initializers/files_polling
+//= require ./initializers/stylesheet_reloading
 //= require ./initializers/routing
 //= require ./initializers/error_listener
 //= require ./initializers/additional_initializers

data/app/assets/javascripts/pageflow/editor/collections/chapter_pages_collection.js

@@ -9,7 +9,7 @@ pageflow.ChapterPagesCollection = pageflow.SubsetCollection.extend({
       parentModel: chapter,
 
       filter: function(item) {
-        return item.get('chapter_id') === chapter.id;
+        return !chapter.isNew() && item.get('chapter_id') === chapter.id;
       },
 
       comparator: function(item) {
@@ -23,6 +23,9 @@ pageflow.ChapterPagesCollection = pageflow.SubsetCollection.extend({
 
     this.listenTo(this, 'add', function(model) {
       model.chapter = chapter;
+      model.set('chapter_id', chapter.id);
+
+      pageflow.editor.trigger('add:page', model);
     });
 
     this.listenTo(this, 'remove', function(model) {

data/app/assets/javascripts/pageflow/editor/collections/chapters_collection.js

@@ -1,11 +1,7 @@
 pageflow.ChaptersCollection = Backbone.Collection.extend({
   model: pageflow.Chapter,
 
-  mixins: [pageflow.orderedCollection],
-
-  url: function() {
-    return '/entries/' + pageflow.entry.get('id') + '/chapters';
-  },
+  url:  '/chapters',
 
   comparator: function(chapter) {
     return chapter.get('position');

data/app/assets/javascripts/pageflow/editor/collections/mixins/add_and_return_model.js

@@ -0,0 +1,11 @@
+pageflow.addAndReturnModel = {
+  // Backbone's add does not return the added model. push returns the
+  // model but does not trigger sort.
+  addAndReturnModel: function(model, options) {
+    model = this._prepareModel(model, options);
+    this.add(model, options);
+    return model;
+  }
+};
+
+Cocktail.mixin(Backbone.Collection, pageflow.addAndReturnModel);

data/app/assets/javascripts/pageflow/editor/collections/mixins/ordered_collection.js

@@ -1,9 +1,11 @@
 pageflow.orderedCollection = {
   initialize: function() {
-    this.listenTo(this, 'remove', function() {
-      this.consolidatePositions();
-      this.saveOrder();
-    });
+    if (this.autoConsolidatePositions !== false) {
+      this.listenTo(this, 'remove', function() {
+        this.consolidatePositions();
+        this.saveOrder();
+      });
+    }
   },
 
   consolidatePositions: function() {

data/app/assets/javascripts/pageflow/editor/collections/ordered_page_links_collection.js

@@ -0,0 +1,9 @@
+//= require ./page_links_collection
+
+pageflow.OrderedPageLinksCollection = pageflow.PageLinksCollection.extend({
+  comparator: 'position',
+
+  saveOrder: function() {
+    this.save();
+  }
+});

data/app/assets/javascripts/pageflow/editor/collections/page_links_collection.js

@@ -0,0 +1,78 @@
+pageflow.PageLinksCollection = Backbone.Collection.extend({
+  model: pageflow.PageLink,
+
+  initialize: function(models, options) {
+    this.configuration = options.configuration;
+    this.page = options.configuration.page;
+
+    this.load();
+
+    this.listenTo(this, 'add remove change', this.save);
+    this.listenTo(this.configuration, 'change:page_links', this.load);
+  },
+
+  addLink: function(targetPageId) {
+    this.addWithPosition(this.defaultPosition(), targetPageId);
+  },
+
+  canAddLink: function(targetPageId) {
+    return true;
+  },
+
+  updateLink: function(link, targetPageId) {
+    link.set('target_page_id', targetPageId);
+  },
+
+  removeLink: function(link) {
+    this.remove(link);
+  },
+
+  addWithPosition: function(position, targetPageId) {
+    this.add(this.pageLinkAttributes(position, targetPageId));
+  },
+
+  removeByPosition: function(position) {
+    this.remove(this.findByPosition(position));
+  },
+
+  findByPosition: function(position) {
+    return this.findWhere({position: position});
+  },
+
+  load: function() {
+    this.set(this.pageLinksAttributes());
+  },
+
+  save: function() {
+    this.configuration.set('page_links', this.map(function(pageLink) {
+      return pageLink.toSerializedJSON();
+    }));
+  },
+
+  defaultPosition: function() {
+    return Math.max(0, _.max(this.map(function(pageLink) {
+      return pageLink.get('position');
+    }))) + 1;
+  },
+
+  pageLinksAttributes: function() {
+    return this.configuration.get('page_links') || [];
+  },
+
+  pageLinkAttributes: function(position, targetPageId, id) {
+    return {
+      id: id || this.getUniqueId(),
+      target_page_id: targetPageId,
+      position: position
+    };
+  },
+
+  /** @private */
+  getUniqueId: function() {
+    var maxId = Math.max(0, _.max(this.map(function(pageLink) {
+      return parseInt(pageLink.id.split(':').pop(), 10);
+    })));
+
+    return this.configuration.page.get('perma_id') + ':' + (maxId + 1);
+  }
+});

data/app/assets/javascripts/pageflow/editor/collections/pages_collection.js

@@ -4,7 +4,13 @@ pageflow.PagesCollection = Backbone.Collection.extend({
   url: '/pages',
 
   comparator: function(pageA, pageB) {
-    if (pageA.chapterPosition() > pageB.chapterPosition()) {
+    if (pageA.storylinePosition() > pageB.storylinePosition()) {
+      return 1;
+    }
+    else if (pageA.storylinePosition() < pageB.storylinePosition()) {
+      return -1;
+    }
+    else if (pageA.chapterPosition() > pageB.chapterPosition()) {
       return 1;
     }
     else if (pageA.chapterPosition() < pageB.chapterPosition()) {
@@ -22,6 +28,6 @@ pageflow.PagesCollection = Backbone.Collection.extend({
   },
 
   getByPermaId: function(permaId) {
-    return this.findWhere({perma_id: permaId});
+    return this.findWhere({perma_id: parseInt(permaId, 10)});
   }
-});
+});

data/app/assets/javascripts/pageflow/editor/collections/storyline_chapters_collection.js

@@ -0,0 +1,35 @@
+pageflow.StorylineChaptersCollection = pageflow.SubsetCollection.extend({
+  mixins: [pageflow.orderedCollection],
+
+  constructor: function(options) {
+    var storyline = options.storyline;
+
+    pageflow.SubsetCollection.prototype.constructor.call(this, {
+      parent: options.chapters,
+      parentModel: storyline,
+
+      filter: function(item) {
+        return !storyline.isNew() && item.get('storyline_id') === storyline.id;
+      },
+
+      comparator: function(item) {
+        return item.get('position');
+      }
+    });
+
+    this.each(function(chapter) {
+      chapter.storyline = storyline;
+    });
+
+    this.listenTo(this, 'add', function(model) {
+      model.storyline = storyline;
+      model.set('storyline_id', storyline.id);
+
+      pageflow.editor.trigger('add:chapter', model);
+    });
+
+    this.listenTo(this, 'remove', function(model) {
+      model.storyline = null;
+    });
+  }
+});

data/app/assets/javascripts/pageflow/editor/collections/storylines_collection.js

@@ -0,0 +1,33 @@
+pageflow.StorylinesCollection = Backbone.Collection.extend({
+  autoConsolidatePositions: false,
+
+  mixins: [pageflow.orderedCollection],
+
+  model: pageflow.Storyline,
+
+  url: function() {
+    return '/entries/' + pageflow.entry.get('id') + '/storylines';
+  },
+
+  initialize: function() {
+    this.listenTo(this, 'change:main', function(model, value) {
+      if (value) {
+        this.each(function(storyline) {
+          if (storyline.isMain() && storyline !== model) {
+            storyline.configuration.unset('main');
+          }
+        });
+      }
+    });
+  },
+
+  main: function() {
+    return this.find(function(storyline) {
+      return storyline.configuration.get('main');
+    }) || this.first();
+  },
+
+  comparator: function(chapter) {
+    return chapter.get('position');
+  }
+});