pageflow 12.0.0.rc6 → 12.0.0.rc7

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

@@ -1,6 +1,31 @@
 pageflow.VideoPlayer.cueSettingsMethods = function(player) {
-  player.updateCueLineSettings = function(line, forceUpdate) {
-    var value = line.split('.')[0];
+  /**
+   * Specify the display position of text tracks. This method can also
+   * be used to make VideoJS reposition the text tracks after the
+   * margins of the text track display have been changed (e.g. to
+   * translate text tracks when player controls are displayed).
+   *
+   * To force such an update, the passed string has to differ from the
+   * previously passed string. You can append a dot and an arbitrary
+   * string (e.g. `"auto.translated"`), to keep the current setting but
+   * still force repositioning.
+   *
+   * On the other hand, it is possible to change the positioning but
+   * have VideoJS apply the change only when the next cue is
+   * displayed. This way we can prevent moving a cue that the user
+   * might just be reading. Simply append the string `".lazy"`
+   * (e.g. `"auto.lazy"`).
+   *
+   * @param {string} line
+   *   Either `"top"` to move text tracks to the first line or
+   *   `"auto"` to stick with automatic positioning, followed by a tag
+   *   to either force or prevent immediate update.
+   */
+  player.updateCueLineSettings = function(line) {
+    var components = line.split('.');
+    var value = components[0];
+    var command = components[1];
+
     value = value == 'top' ? 1 : value;
 
     var changed = false;
@@ -24,7 +49,7 @@ pageflow.VideoPlayer.cueSettingsMethods = function(player) {
     // track changed since the last call, i.e. `line` has been changed
     // for a cue even though the previous call had the same
     // parameters.
-    if (this.prevLine !== line || changed) {
+    if ((this.prevLine !== line || changed) && (command != 'lazy')) {
       player.tech({IWillNotUseThisInPlugins: true}).trigger('texttrackchange');
     }
 

data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/container.scss

@@ -42,8 +42,7 @@ $classic-player-controls-typography: $player-controls-typography !default;
     }
 
     &-paused,
-    &-unplayed,
-    &-has_been_faded {
+    &-unplayed {
       // Unused, but have to be defined for @extend to work
       display: block;
     }

data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/control_bar.scss

@@ -220,7 +220,7 @@ $classic-player-controls-timestamp-position: "left" !default;
     }
   }
 
-  &-page_with_progress_bar {
+  &-page-with_progress_bar {
     %player_controls-control_bar_text {
       display: none;
     }

data/app/assets/stylesheets/pageflow/themes/default/player_controls/classic/menu_bar.scss

@@ -2,4 +2,8 @@
   &-menu_bar {
     right: 10px;
   }
+
+  &-toggle_info_box_menu_button {
+    display: none;
+  }
 }

data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/info_box.scss

@@ -109,11 +109,10 @@ $slim-player-controls-info-box-header-typography: () !default;
   }
 
   @include desktop {
-    .js &-container-has_been_faded %player_controls-info_box {
+    .js &-info_box-hidden_during_playback {
       @include faded;
     }
 
-    .js &-container:hover %player_controls-info_box,
     .js &-container-paused %player_controls-info_box {
       @include transition-delay(0);
       @include visible;

data/app/assets/stylesheets/pageflow/themes/default/player_controls/slim/menu_bar.scss

@@ -11,3 +11,13 @@
     right: 20px;
   }
 }
+
+%player_controls-page-audio .player_controls-toggle_info_box_menu_button {
+  display: none;
+}
+
+@include phone {
+  .player_controls-toggle_info_box_menu_button {
+    display: none;
+  }
+}

data/app/assets/stylesheets/pageflow/themes/default/player_controls/vjs_mapping.scss

@@ -1,7 +1,8 @@
 // Map placeholder names to concrete vjs css class names.
 
 $vjs-selector-mapping: (
-  page_with_progress_bar: ".audioPage, .videoPage",
+  page-with_progress_bar: ".audioPage, .videoPage",
+  page-audio: ".audioPage",
 
   background: ".page_background-for_page_with_player_controls",
 
@@ -30,23 +31,13 @@ $vjs-selector-mapping: (
   container-hover: ".is_control_bar_hovered .controls",
   container-focused: ".is_control_bar_focused .controls",
 
-  // `has_been_faded` is set by the video page type after the user has
-  // become inactive for the first time during video playback.
-  //
-  // This is used in the slim player controls to keep displaying the
-  // info box a little longer on initial playback. Especially on auto
-  // play pages this lets the user finish reading the info box
-  // text. When the user re-displays the info box though by moving the
-  // cursor above the control bar, it fades immediately once the
-  // cursor leaves the control bar again.
-  container-has_been_faded: ".controls.has_been_faded",
-
   container-video: ".videoPage .controls",
   container-fading: ".videoPage .controls",
 
   container-unplayed: ".unplayed .controls",
 
   info_box: ".add_info_box",
+  info_box-hidden_during_playback: ".add_info_box-hidden_during_playback",
   control_bar: ".vjs-control-bar",
   control_bar_text: ".control_bar_text",
 

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.0.0.rc6'.freeze
+  VERSION = '12.0.0.rc7'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 12.0.0.rc6
+  version: 12.0.0.rc7
 platform: ruby
 authors:
 - Codevise Solutions Ltd
@@ -546,14 +546,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.9'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement