pageflow 12.3.0 → 12.4.0

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

@@ -7,6 +7,7 @@ pageflow.mediaPlayer.volumeBinding = function(player, settings, options) {
   var volumeFactor = 'volumeFactor' in options ? options.volumeFactor : 1;
 
   player.play = function() {
+    player.intendToPlay();
     player.volume(player.targetVolume());
     listenToVolumeSetting();
 
@@ -71,4 +72,4 @@ pageflow.mediaPlayer.volumeBinding = function(player, settings, options) {
   function onVolumeChange(model, value) {
     player.fadeVolume(player.targetVolume(), 40);
   }
-};
+};

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

@@ -12,62 +12,84 @@ pageflow.mediaPlayer.volumeFading.webAudio = function(player, audioContext) {
 
   var allowedMinValue = 0.000001;
 
-  var originalPlay = player.play;
-
   if (audioContext.state === 'suspended') {
     pageflow.events.on('background_media:unmute', function() {
-      audioContext.resume();
-    });
-
-    audioContext.addEventListener('statechange', function() {
       player.volume(currentValue);
     });
   }
 
-  player.play = function(/* arguments */) {
-    return originalPlay.apply(player, arguments);
-  };
-
-  player.volume = function(value) {
-    if (typeof value !== 'undefined') {
+  function tryResumeIfSuspended() {
+    return new $.Deferred(function(deferred) {
       if (audioContext.state === 'suspended') {
-        currentValue = ensureInAllowedRange(value);
-        return;
+        var maybePromise = audioContext.resume();
+
+        if (maybePromise && maybePromise.then) {
+          maybePromise.then(handleDeferred);
+        }
+        else {
+          setTimeout(handleDeferred, 0);
+        }
+      }
+      else {
+        deferred.resolve();
       }
 
-      ensureGainNode();
-
-      cancel();
-      currentValue = ensureInAllowedRange(value);
+      function handleDeferred() {
+        if (audioContext.state === 'suspended') {
+          deferred.reject();
+        }
+        else {
+          deferred.resolve();
+        }
+      }
+    }).promise();
+  }
 
-      return gainNode.gain.setValueAtTime(currentValue,
-                                          audioContext.currentTime);
+  player.volume = function(value) {
+    if (typeof value !== 'undefined') {
+      tryResumeIfSuspended().then(
+        function() {
+          ensureGainNode();
+
+          cancel();
+          currentValue = ensureInAllowedRange(value);
+
+          gainNode.gain.setValueAtTime(currentValue,
+                                       audioContext.currentTime);
+        },
+        function() {
+          currentValue = ensureInAllowedRange(value);
+        }
+      );
     }
 
     return Math.round(currentValue * 100) / 100;
   };
 
   player.fadeVolume = function(value, duration) {
-    if (audioContext.state === 'suspended') {
-      currentValue = ensureInAllowedRange(value);
-      return new $.Deferred().resolve().promise();
-    }
+    return tryResumeIfSuspended().then(
+      function() {
+        ensureGainNode();
 
-    ensureGainNode();
+        cancel();
+        recordFadeStart(duration);
 
-    cancel();
-    recordFadeStart(duration);
-
-    currentValue = ensureInAllowedRange(value);
+        currentValue = ensureInAllowedRange(value);
 
-    gainNode.gain.setValueAtTime(lastStartValue, audioContext.currentTime);
-    gainNode.gain.linearRampToValueAtTime(currentValue,
-                                          audioContext.currentTime + duration / 1000);
+        gainNode.gain.setValueAtTime(lastStartValue, audioContext.currentTime);
+        gainNode.gain.linearRampToValueAtTime(currentValue,
+                                              audioContext.currentTime + duration / 1000);
 
-    return new $.Deferred(function(deferred) {
-      currentTimeout = setTimeout(resolve, duration);
-      currentDeferred = deferred;
-    }).promise();
+        return new $.Deferred(function(deferred) {
+          currentTimeout = setTimeout(resolve, duration);
+          currentDeferred = deferred;
+        }).promise();
+      },
+      function() {
+        currentValue = ensureInAllowedRange(value);
+        return new $.Deferred().resolve().promise();
+      }
+    );
   };
 
   player.one('dispose', cancel);
@@ -119,9 +141,10 @@ pageflow.mediaPlayer.volumeFading.webAudio = function(player, audioContext) {
     if (gainNode.gain.value == 1) {
       var performedDuration = (audioContext.currentTime - lastStartTime) * 1000;
       var lastDelta = currentValue - lastStartValue;
+      var performedFraction = lastDelta > 0 ? performedDuration / lastDuration : 1;
 
       currentValue = ensureInAllowedRange(
-        lastStartValue + (performedDuration / lastDuration * lastDelta)
+        lastStartValue + performedFraction * lastDelta
       );
     }
     else {

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

@@ -9,8 +9,8 @@ pageflow.AdjacentPages = pageflow.Object.extend({
     var pages = this.pages();
     var nextPage = this.nextPage(page);
 
-    if (nextPage.length) {
-      result.push(nextPage.page('instance'));
+    if (nextPage) {
+      result.push(nextPage);
     }
 
     _(page.linkedPages()).each(function(permaId) {

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

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

data/app/assets/stylesheets/pageflow/themes/default/anchors.scss

@@ -1,3 +1,7 @@
+/// Color of the caret icon displayed in front of links. Same as text
+/// color by default.
+$anchor-icon-color: null !default;
+
 %anchor {
   @include fa-caret-right-icon;
 
@@ -25,5 +29,6 @@
     top: 7px;
     width: 10px;
     height: 12px;
+    color: $anchor-icon-color;
   }
 }

data/app/assets/stylesheets/pageflow/themes/default/background_media_unmute_button.scss

@@ -1,14 +1,16 @@
-$background-media-unmute-button-color: rgba(53, 53, 53, 0.9);
+$background-media-unmute-button-color: rgba(53, 53, 53, 0.9) !default;
 
-$background-media-unmute-button-shadow-color: #ccc;
+$background-media-unmute-button-shadow-color: #ccc !default;
 
-$background-media-unmute-button-icon-color: #ddd;
+$background-media-unmute-button-icon-color: #ddd !default;
 
-$background-media-unmute-button-icon-size: 24px;
+$background-media-unmute-button-icon-size: 24px !default;
 
-$background-media-unmute-button-size: 34px;
+$background-media-unmute-button-size: 34px !default;
 
-$background-media-unmute-button-margin: 10px;
+$background-media-unmute-button-margin: 10px !default;
+
+$background-media-unmute-button-custom-image: false !default;
 
 .background_media_unmute_button {
   position: absolute;
@@ -25,22 +27,20 @@ $background-media-unmute-button-margin: 10px;
     right: 11px;
   }
 
-  &:before {
-    z-index: 2;
-  }
-
-  &:after {
-    content: "";
-    display: block;
-    position: absolute;
-    top: 6px;
-    left: 6px;
-    width: $background-media-unmute-button-size;
-    height: $background-media-unmute-button-size;
-    border-radius: $background-media-unmute-button-size / 2;
-    background-color: $background-media-unmute-button-color;
-    @include box-shadow(0 0 7px $background-media-unmute-button-shadow-color);
-    z-index: 1;
+  @if not $background-media-unmute-button-custom-image {
+    &:after {
+      content: "";
+      display: block;
+      position: absolute;
+      top: 6px;
+      left: 6px;
+      width: $background-media-unmute-button-size;
+      height: $background-media-unmute-button-size;
+      border-radius: $background-media-unmute-button-size / 2;
+      background-color: $background-media-unmute-button-color;
+      @include box-shadow(0 0 7px $background-media-unmute-button-shadow-color);
+      z-index: 1;
+    }
   }
 
   a {
@@ -48,21 +48,30 @@ $background-media-unmute-button-margin: 10px;
     width: 100%;
     height: 100%;
     z-index: 2;
-    position: relative;
-    @include background-icon-center($color: $background-media-unmute-button-icon-color,
-                                    $font-size: $background-media-unmute-button-icon-size);
-    @include fa-volume-down-icon;
 
-    &:after {
-      content: "";
-      display: block;
-      position: absolute;
-      width: 25px;
-      left: 22px;
-      top: 22px;
-      border-top: solid 2px $background-media-unmute-button-icon-color;
-      border-bottom: solid 1px $background-media-unmute-button-color;
-      @include transform(translate(-50%, -50%) rotate(45deg));
+    @if $background-media-unmute-button-custom-image {
+      background-image: image-url("pageflow/themes/#{$theme-name}/background_media_unmute_button.svg");
+      background-size: $background-media-unmute-button-size
+                         $background-media-unmute-button-size;
+      background-repeat: no-repeat;
+      background-position: 50% 50%;
+    } @else {
+      position: relative;
+      @include background-icon-center($color: $background-media-unmute-button-icon-color,
+                                      $font-size: $background-media-unmute-button-icon-size);
+      @include fa-volume-down-icon;
+
+      &:after {
+        content: "";
+        display: block;
+        position: absolute;
+        width: 25px;
+        left: 22px;
+        top: 22px;
+        border-top: solid 2px $background-media-unmute-button-icon-color;
+        border-bottom: solid 1px $background-media-unmute-button-color;
+        @include transform(translate(-50%, -50%) rotate(45deg));
+      }
     }
   }
 }

data/app/assets/stylesheets/pageflow/themes/default/overview/icons/icon_font.scss

@@ -4,7 +4,10 @@
 
   $button-icon-color,
   $active-button-icon-color,
-  $deactivated-button-icon-color
+  $deactivated-button-icon-color,
+
+  $share-icon-color: null,
+  $active-share-icon-color: null
 ) {
 
   .button {

data/app/assets/stylesheets/pageflow/themes/default/page/anchors.scss

@@ -8,10 +8,14 @@ $page-anchor-color: #fff !default;
 /// Color of links inside the text on inverted pages
 $page-anchor-inverted-color: #000 !default;
 
+/// Typography settings of links in page content text
+$page-anchor-typography: () !default;
+
 .contentText a {
   @extend %anchor;
   color: $page-anchor-color;
   pointer-events: all;
+  @include typography($page-anchor-typography)
 }
 
 .invert .contentText a {

data/app/controllers/concerns/pageflow/public_https_mode.rb

@@ -2,12 +2,16 @@ module Pageflow
   module PublicHttpsMode
     protected
 
-    def check_public_https_mode
+    def redirect_according_to_public_https_mode
       if request.ssl? && Pageflow.config.public_https_mode == :prevent
         redirect_to("http://#{request.host}#{request.fullpath}", status: :moved_permanently)
+        true
       elsif !request.ssl? && Pageflow.config.public_https_mode == :enforce
         redirect_to("https://#{request.host}#{request.fullpath}", status: :moved_permanently)
+        true
       end
     end
+
+    alias_method :check_public_https_mode, :redirect_according_to_public_https_mode
   end
 end

data/app/controllers/pageflow/entries_controller.rb

@@ -5,10 +5,6 @@ module Pageflow
 
     before_filter :authenticate_user!, except: [:index, :show, :page]
 
-    before_filter :check_public_https_mode,
-                  only: [:index, :show],
-                  unless: lambda { |controller| controller.request.format.json? }
-
     after_action :allow_iframe_for_embed, only: :show
 
     helper_method :render_to_string
@@ -30,6 +26,12 @@ module Pageflow
           @entry = PublishedEntry.find(params[:id], entry_request_scope)
           I18n.locale = @entry.locale
 
+          if redirect_location = entry_redirect(@entry)
+            return redirect_to(redirect_location, status: :moved_permanently)
+          end
+
+          return if redirect_according_to_public_https_mode
+
           if !request.format.css?
             check_entry_password_protection(@entry)
           end
@@ -97,6 +99,10 @@ module Pageflow
       Pageflow.config.public_entry_request_scope.call(Entry, request)
     end
 
+    def entry_redirect(entry)
+      Pageflow.config.public_entry_redirect.call(entry, request)
+    end
+
     def allow_iframe_for_embed
       if params[:embed]
         response.headers.except! 'X-Frame-Options'

data/lib/pageflow/configuration.rb

@@ -155,6 +155,15 @@ module Pageflow
     #     end
     attr_accessor :public_entry_request_scope
 
+    # Either a lambda or an object with a `call` method taking an
+    # {Entry} record and an {ActionDispatch::Request} object and
+    # returning `nil` or a path to redirect to. Can be used in
+    # conjuction with {PrimaryDomainEntryRedirect} to make sure
+    # entries are accessed via their account's configured cname.
+    #
+    # @since 12.4
+    attr_accessor :public_entry_redirect
+
     # Either a lambda or an object with a `call` method taking a
     # {Theming} as paramater and returing a hash of options used to
     # construct the url of a published entry.
@@ -315,6 +324,7 @@ module Pageflow
 
       @theming_request_scope = CnameThemingRequestScope.new
       @public_entry_request_scope = lambda { |entries, request| entries }
+      @public_entry_redirect = ->(_entry, _request) { nil }
       @public_entry_url_options = Pageflow::ThemingsHelper::DEFAULT_PUBLIC_ENTRY_OPTIONS
       @entry_embed_url_options = {protocol: 'https'}
 

data/lib/pageflow/primary_domain_entry_redirect.rb

@@ -0,0 +1,25 @@
+module Pageflow
+  # Use as {Configuration#public_entry_redirect} to make sure entries
+  # are accessed via their account's configured cname.
+  #
+  # @since 12.4
+  class PrimaryDomainEntryRedirect
+    def call(entry, request)
+      theming = entry.theming
+
+      if theming.cname.present? &&
+         !known_domains(theming).include?(request.host)
+        [request.protocol, theming.cname, request.fullpath].join
+      end
+    end
+
+    private
+
+    def known_domains(theming)
+      [
+        theming.cname,
+        (theming.additional_cnames || '').split(',').map(&:strip)
+      ].flatten
+    end
+  end
+end

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.3.0'.freeze
+  VERSION = '12.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 12.3.0
+  version: 12.4.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-30 00:00:00.000000000 Z
+date: 2018-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -2039,6 +2039,7 @@ files:
 - lib/pageflow/page_types.rb
 - lib/pageflow/paperclip_processors/vtt.rb
 - lib/pageflow/plugin.rb
+- lib/pageflow/primary_domain_entry_redirect.rb
 - lib/pageflow/quota.rb
 - lib/pageflow/quotas.rb
 - lib/pageflow/react.rb