pageflow 12.6.0 → 13.0.0.beta1

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

@@ -7,10 +7,10 @@ pageflow.AdjacentPages = pageflow.Object.extend({
   of: function(page) {
     var result = [];
     var pages = this.pages();
-    var nextPage = this.nextPage(page);
+    var nextPage = this.scrollNavigator.getNextPage(page.element, pages);
 
-    if (nextPage) {
-      result.push(nextPage);
+    if (nextPage.length) {
+      result.push(nextPage.page('instance'));
     }
 
     _(page.linkedPages()).each(function(permaId) {
@@ -22,10 +22,5 @@ pageflow.AdjacentPages = pageflow.Object.extend({
     }, this);
 
     return result;
-  },
-
-  nextPage: function(page) {
-    var nextPage = this.scrollNavigator.getNextPage(page.element, this.pages());
-    return nextPage.length && nextPage.page('instance');
   }
-});
+});

data/app/assets/javascripts/pageflow/slideshow/{successor_preparer.js → adjacent_preparer.js}

@@ -1,6 +1,6 @@
 //= require ./adjacent_pages
 
-pageflow.SuccessorPreparer = pageflow.Object.extend({
+pageflow.AdjacentPreparer = pageflow.Object.extend({
   initialize: function(adjacentPages) {
     this.adjacentPages = adjacentPages;
   },
@@ -12,18 +12,14 @@ pageflow.SuccessorPreparer = pageflow.Object.extend({
   schedule: function(page) {
     clearTimeout(this.scheduleTimeout);
 
-    var prepare = _.bind(this.prepareSuccessor, this, page);
+    var prepare = _.bind(this.prepareAdjacent, this, page.element.page('instance'));
     this.scheduleTimeout = setTimeout(prepare, page.prepareNextPageTimeout());
   },
 
-  prepareSuccessor: function(page) {
-    var preparedPages = _.compact([
-      page,
-      this.adjacentPages.nextPage(page)
-    ]);
-
-    var noLongerPreparedPages = _.difference(this.lastPreparedPages, preparedPages);
-    var newAdjacentPages = _.difference(preparedPages, this.lastPreparedPages);
+  prepareAdjacent: function(page) {
+    var adjacentPages = this.adjacentPages.of(page);
+    var noLongerPreparedPages = _.difference(this.lastPreparedPages, adjacentPages, [page]);
+    var newAdjacentPages = _.difference(adjacentPages, this.lastPreparedPages);
 
     _(noLongerPreparedPages).each(function(page) {
       if (!page.isDestroyed) {
@@ -33,17 +29,18 @@ pageflow.SuccessorPreparer = pageflow.Object.extend({
 
     _(newAdjacentPages).each(function(adjacentPage) {
       adjacentPage.prepare();
+      adjacentPage.preload();
     });
 
-    this.lastPreparedPages = preparedPages;
+    this.lastPreparedPages = adjacentPages.concat([page]);
   }
 });
 
-pageflow.SuccessorPreparer.create = function(pages, scrollNavigator) {
-  return new pageflow.SuccessorPreparer(
+pageflow.AdjacentPreparer.create = function(pages, scrollNavigator) {
+  return new pageflow.AdjacentPreparer(
     new pageflow.AdjacentPages(
       pages,
       scrollNavigator
     )
   );
-};
+};

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

@@ -2,19 +2,14 @@
   var attributeName = 'atmo_audio_file_id';
 
   pageflow.Atmo = pageflow.Object.extend({
-    initialize: function(options) {
-      this.slideshow = options.slideshow;
-      this.multiPlayer = options.multiPlayer;
-      this.backgroundMedia = options.backgroundMedia;
+    initialize: function(slideshow, events, multiPlayer) {
+      this.slideshow = slideshow;
+      this.multiPlayer = multiPlayer;
       this.disabled = pageflow.browser.has('mobile platform');
 
-      this.listenTo(options.events, 'page:change page:update background_media:unmute', function() {
+      this.listenTo(events, 'page:change page:update', function() {
         this.update();
       });
-
-      this.listenTo(options.multiPlayer, 'playfailed', function() {
-        options.backgroundMedia.mute();
-      });
     },
 
     disable: function() {
@@ -51,7 +46,7 @@
 
     resume: function() {
       if (this.multiPlayer.paused()) {
-        if (this.disabled || this.backgroundMedia.muted) {
+        if (this.disabled) {
           return new $.Deferred().resolve().promise();
         }
         else {
@@ -67,12 +62,7 @@
       var configuration = this.slideshow.currentPageConfiguration();
 
       if (!this.disabled) {
-        if (this.backgroundMedia.muted) {
-          this.multiPlayer.fadeOutAndPause();
-        }
-        else {
-          this.multiPlayer.fadeTo(configuration[attributeName]);
-        }
+        this.multiPlayer.fadeTo(configuration[attributeName]);
       }
     },
 
@@ -96,12 +86,11 @@
     }
   });
 
-  pageflow.Atmo.create = function(slideshow, events, audio, backgroundMedia) {
-    return new pageflow.Atmo({
-      slideshow: slideshow,
-      events: events,
-      backgroundMedia: backgroundMedia,
-      multiPlayer: audio.createMultiPlayer({
+  pageflow.Atmo.create = function(slideshow, events, audio) {
+    return new pageflow.Atmo(
+      slideshow,
+      events,
+      audio.createMultiPlayer({
         loop: true,
         fadeDuration: 500,
         crossFade: true,
@@ -109,7 +98,7 @@
         rewindOnChange: true,
         pauseInBackground: true
       })
-    });
+    );
   };
 
   pageflow.Atmo.duringPlaybackModes = ['play', 'mute', 'turn_down'];

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

@@ -1,6 +1,6 @@
 (function($) {
-  var creatingMethods = ['reinit', 'reactivate', 'activate', 'activateAsLandingPage', 'prepare', 'preload', 'linkedPages'];
-  var ignoredMethods = ['cleanup', 'refreshScroller', 'resize',  'deactivate', 'unprepare'];
+  var creatingMethods = ['reinit', 'reactivate', 'activate', 'activateAsLandingPage', 'prepare', 'linkedPages'];
+  var ignoredMethods = ['cleanup', 'refreshScroller', 'resize', 'preload', 'deactivate', 'unprepare'];
 
   var prototype = {
     _create: function() {

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

@@ -0,0 +1,42 @@
+pageflow.ProgressivePreload = function() {
+  var run = null;
+
+  function Run(page, maxPreloadedPages) {
+    var cancelled = false;
+
+    this.cancel = function() {
+      cancelled = true;
+    };
+
+    this.start = function() {
+      preload(page, 0);
+    };
+
+    function preload(page, counter) {
+      $.when(page.page('preload'), tick()).then(function() {
+        var nextPage = page.next('.page');
+        if (!cancelled && nextPage.length && counter < maxPreloadedPages) {
+          preload(nextPage, counter + 1);
+        }
+      });
+    }
+
+    // prevent stack level from becoming to deep
+    function tick() {
+      return new $.Deferred(function(deferred) {
+        setTimeout(function() {
+          deferred.resolve();
+        }, 1);
+      }).promise();
+    }
+  }
+
+  this.start = function(page) {
+    if (run) {
+      run.cancel();
+    }
+
+    run = new Run(page, 10);
+    run.start();
+  };
+};

data/app/assets/javascripts/pageflow/ui/views/configuration_editor_view.js

@@ -3,7 +3,7 @@ pageflow.ConfigurationEditorView = Backbone.Marionette.View.extend({
 
   initialize: function() {
     this.tabsView = new pageflow.TabsView({
-      i18n: this.options.tabTranslationKeyPrefix || 'pageflow.ui.configuration_editor.tabs',
+      i18n: 'pageflow.ui.configuration_editor.tabs',
       defaultTab: this.options.tab
     });
     this.configure();
@@ -40,4 +40,4 @@ _.extend(pageflow.ConfigurationEditorView, {
   register: function(pageTypeName, prototype) {
     this.repository[pageTypeName] = pageflow.ConfigurationEditorView.extend(prototype);
   }
-});
+});

data/app/assets/javascripts/pageflow/video_player/filter_sources.js

@@ -1,22 +1,8 @@
 pageflow.VideoPlayer.filterSources = function(playerElement) {
-  if (!$(playerElement).is('video')) {
-    return playerElement;
-  }
-
-  var changed = false;
-
-  if (pageflow.browser.has('mp4 support only')) {
+  if ($(playerElement).is('video') && pageflow.browser.has('mp4 support only')) {
     // keep only mp4 source
     $(playerElement).find('source').not('source[type="video/mp4"]').remove();
-    changed = true;
-  }
-  else if (pageflow.browser.has('mse and native hls support')) {
-    // remove dash source to ensure hls is used
-    $(playerElement).find('source[type="application/dash+xml"]').remove();
-    changed = true;
-  }
 
-  if (changed) {
     // the video tags initially in the dom are broken since they "saw"
     // the other sources. replace with clones
     var clone = $(playerElement).clone(true);
@@ -27,4 +13,4 @@ pageflow.VideoPlayer.filterSources = function(playerElement) {
   else {
     return playerElement;
   }
-};
+};

data/app/assets/javascripts/pageflow/video_player/lazy.js

@@ -80,7 +80,7 @@ pageflow.VideoPlayer.Lazy = function(template, options) {
     return videoPlayer && videoPlayer.posterImage.unlockShowing();
   };
 
-  _.each(['play', 'playAndFadeIn', 'pause', 'fadeOutAndPause', 'prebuffer', 'src', 'on', 'load', 'currentTime', 'muted'], function(method) {
+  _.each(['play', 'playAndFadeIn', 'pause', 'fadeOutAndPause', 'prebuffer', 'src', 'on', 'load', 'currentTime'], function(method) {
     that[method] = function(/* args */) {
       var args = arguments;
 

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

@@ -4,8 +4,6 @@ pageflow.Visited = function(entryId, pages, events, cookies) {
   var unvisitedPages = [];
 
   function init() {
-    pageflow.cookieNotice.request();
-
     if (!cookies.hasItem(cookieName)) {
       storeVisitedPageIds(getAllIds());
     }

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

@@ -35,7 +35,6 @@ pageflow.widgets = (function() {
       .addClass(replacement);
 
     pageflow.events.trigger('widgets:update');
-    pageflow.slides.triggerResizeHooks();
   }
 
   function className(name, state) {

data/app/assets/javascripts/pageflow/widgets/multimedia_alert.js

@@ -23,7 +23,6 @@
 
         widget.element.find('.close').one('click', function() {
           hide();
-          pageflow.backgroundMedia.unmute();
 
           pageflow.events.trigger('button:close_multimedia_alert');
           start();
@@ -43,4 +42,4 @@
       pageflow.nativeScrolling.preventScrollBouncing(this.element);
     }
   });
-}(jQuery));
+}(jQuery));

data/app/assets/javascripts/pageflow/widgets/navigation.js

@@ -87,7 +87,6 @@
         var handlerIn = function() {
           if (!('ontouchstart' in document.documentElement)) {
             $(overlays[index]).css("top", $(this).offset().top).addClass('visible').removeClass('hidden');
-            overlays.loadLazyImages();
           }
         };
 

data/app/assets/javascripts/pageflow/widgets/navigation_mobile.js

@@ -19,7 +19,6 @@
       $('.menu.index', element).click(function() {
         if(!$(element).hasClass('sharing') && !$(element).hasClass('imprint')) {
           $(element).toggleClass('active');
-          element.loadLazyImages();
         }
         $(element).removeClass('imprint sharing');
       });

data/app/assets/javascripts/pageflow/widgets/overview.js

@@ -18,8 +18,6 @@ jQuery(function($) {
         var scrollIndicator = $('.slideshow .scroll_indicator');
 
         overview.toggleClass('active', state);
-        overview.loadLazyImages();
-
         indexButton
           .toggleClass('active', state)
           .updateTitle();
@@ -128,4 +126,4 @@ jQuery(function($) {
       }
     }
   });
-});
+});

data/app/assets/stylesheets/pageflow/admin.scss

@@ -1,5 +1,6 @@
 @import "active_admin/searchable_select";
 
+@import "bourbon";
 @import "pageflow/mixins";
 
 @import "pageflow/admin/badge_list";
@@ -15,6 +16,7 @@
 @import "pageflow/admin/icon_link";
 @import "pageflow/admin/publication_state_indicator";
 @import "pageflow/admin/quotas";
+@import "pageflow/admin/status_tags";
 @import "pageflow/admin/tabs_view";
 @import "pageflow/admin/tooltip_bubble";
 

data/app/assets/stylesheets/pageflow/admin/status_tags.scss

@@ -0,0 +1,13 @@
+$status-tag-ok-background-color: #8daa92 !default;
+
+$status-tag-warning-background-color: #e29b20 !default;
+
+.status_tag {
+  &.ok {
+    background: $status-tag-ok-background-color;
+  }
+
+  &.warning {
+    background: $status-tag-warning-background-color;
+  }
+}

data/app/assets/stylesheets/pageflow/editor/background_positioning.scss

@@ -47,7 +47,7 @@
 
   .wrapper {
     text-align: center;
-    margin: 35px;
+    margin: 20px;
   }
 
   .previews {
@@ -96,7 +96,6 @@
   .slider {
     position: absolute;
     border: none;
-    background: #ddd;
 
     a {
       @include background-icon-center($font-size: 20px);
@@ -114,10 +113,10 @@
     }
 
     &.horizontal {
-      bottom: -10px;
-      left: 9px;
-      right: 11px;
-      height: 2px;
+      bottom: 0;
+      left: 40px;
+      right: 40px;
+      height: 0;
 
       a {
         @include transform(rotate(90deg));
@@ -127,10 +126,10 @@
     }
 
     &.vertical {
-      right: -10px;
-      top: 12px;
-      bottom: 11px;
-      width: 2px;
+      right: 0;
+      top: 40px;
+      bottom: 40px;
+      width: 0;
       height: auto;
 
       a {
@@ -140,29 +139,6 @@
     }
   }
 
-  .percent {
-    position: absolute;
-    font-size: 12px;
-    white-space: nowrap;
-
-    input {
-      width: 45px;
-      height: 25px;
-      box-sizing: border-box;
-      text-align: right;
-    }
-
-    &.horizontal {
-      left: -65px;
-      bottom: -26px;
-    }
-
-    &.vertical {
-      left: 100%;
-      top: -30px;
-    }
-  }
-
   a.save {
     @include check-icon;
     @include icon-button;
@@ -171,4 +147,4 @@
   a.close {
     @include icon-button(#888);
   }
-}
+}

data/app/assets/stylesheets/pageflow/navigation_bar.scss

@@ -158,6 +158,10 @@
 
   .navigation_site_detail {
     @include box(-40px);
+
+    img {
+      margin-top: 12px;
+    }
   }
 
   .navigation_bg, .navigation_bullet .button {