pageflow-linkmap-page 2.6.1 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c43af6b804159bf2faa198090f1e1f538d1c9f3d53c44047a9e220e072b874
-  data.tar.gz: 3ec34a027a778e1a8dfccdd8f81d9a332e4e4eaf663eea9c6c97f8f440188fd9
+  metadata.gz: ff9d97c1c2bc7397353d18b2d6847c92686e3ea194360f9e1967445cbfc3af3a
+  data.tar.gz: 5b54773f19f77814878c5e5d71e889d63c323937a0b916a827d716a5dd7c86b8
 SHA512:
-  metadata.gz: b38107bbe3d0ed938eac8082aa06e800c887cb0d4ef07f6e8b495100fe167fd41dcb8e362473fb285d13bff5519d3f98aa39a881aa494a417f37104f76c9f775
-  data.tar.gz: 4fa0f7f3985f396dea8b9d46fb197b07d0532932f695337d1dc73f1f2c7a1eaf5142132eb0227be30f1f5211b494c46ae55b3d846ef1487e8f96eace2d528cd1
+  metadata.gz: 532fe3853b0f551305f60bb52bf9fdb6916fbf134387d5964f98b9d37678fb76797232cfb2fdf2e056ac94a26b7eda464e49c88eb598a8a8827b4561e2b6441c
+  data.tar.gz: a27739cff366df42b8604352be352c33224757beeefeeae8e81a50b6d8ab8b3d88a622b5c9308e2cd768e22b06be584a9ddd25a3fc8765e92fef849099034ff2

data/CHANGELOG.md

@@ -1,29 +1,20 @@
 # CHANGELOG
 
-### Version 2.6.1
+### Version 2.8.0
 
-2019-11-21
+2022-07-18
 
-[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/v2.6.0...v2.6.1)
+[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/2-7-stable...v2.8.0)
 
-- Delete cleanup migration
-  ([#69](https://github.com/codevise/pageflow-linkmap-page/pull/69))
-
-### Version 2.6.0
-
-2019-11-04
-
-[Compare changes](https://github.com/codevise/pageflow-linkmap-page/compare/2-5-stable...v2.6.0)
-
-- Specify mysql service for Travis build
-  ([#66](https://github.com/codevise/pageflow-linkmap-page/pull/66))
-- Use perma id for color map file and components
-  ([#65](https://github.com/codevise/pageflow-linkmap-page/pull/65))
-- Wait for color map file to be persisted
-  ([#64](https://github.com/codevise/pageflow-linkmap-page/pull/64))
-- Add import and export
-  ([#63](https://github.com/codevise/pageflow-linkmap-page/pull/63))
+- Use rebrushed button styles for editor
+  ([#75](https://github.com/codevise/pageflow-linkmap-page/pull/75))
+- Trigger media events for audio hotspots
+  ([#74](https://github.com/codevise/pageflow-linkmap-page/pull/74))
+- Prevent slideshow container from scrolling out of view
+  ([#73](https://github.com/codevise/pageflow-linkmap-page/pull/73))
+- Use perma id for audio hotspot files
+  ([#71](https://github.com/codevise/pageflow-linkmap-page/pull/71))
 
 See
-[2-5-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-5-stable/CHANGELOG.md)
+[2-7-stable branch](https://github.com/codevise/pageflow-linkmap-page/blob/2-7-stable/CHANGELOG.md)
 for previous changes.

data/Gemfile

@@ -6,4 +6,4 @@ gemspec
 gem 'spring-commands-rspec', group: :development
 gem 'spring-commands-teaspoon', group: :development
 
-gem 'pageflow-external-links', git: 'https://github.com/codevise/pageflow-external-links', branch: 'master'
+gem 'rails', '5.2.6'

data/app/assets/javascript/pageflow/linkmap_page/editor/models/area.js

@@ -11,7 +11,7 @@ pageflow.linkmapPage.Area = Backbone.Model.extend({
     //     pageflow.xxx.getPolymorphic(this.get('target_type'), this.get('target_id'));
     //
     if (this.get('target_type') === 'audio_file') {
-      return pageflow.audioFiles.get(this.get('target_id'));
+      return pageflow.audioFiles.getByPermaId(this.get('target_id'));
     }
     else if (this.get('target_type') === 'page') {
       return pageflow.pages.getByPermaId(this.get('target_id'));

data/app/assets/javascript/pageflow/linkmap_page/editor/models/new_area_file_selection_handler.js

@@ -2,7 +2,7 @@ pageflow.linkmapPage.NewAreaFileSelectionHandler = function(options) {
   var page = pageflow.pages.get(options.id);
 
   this.call = function(file) {
-    page.configuration.linkmapAreas().addAudioFile(file.id);
+    page.configuration.linkmapAreas().addAudioFile(file.get('perma_id'));
     return false;
   };
 

data/app/assets/javascript/pageflow/linkmap_page/page_type.js

@@ -188,13 +188,19 @@ pageflow.pageType.register('linkmap_page', _.extend({
       .attr('data-width', template.data('videoWidth'))
       .attr('data-height', template.data('videoHeight'));
 
-    var videoPlayer = this.videoPlayer = new pageflow.VideoPlayer.Lazy(template, {
+    var options = {
       volumeFading: true,
       fallbackToMutedAutoplay: true,
-
       width: '100%',
       height: '100%'
-    });
+    }
+    if (pageflow.browser.has('mobile platform')) {
+      // to enable autoplay videos on mobile, 'muted' and 'playsinline' needs to be set
+      // video can be unmuted on user interaction
+      options.muted = true;
+      options.playsinline = true;
+    }
+    var videoPlayer = this.videoPlayer = new pageflow.VideoPlayer.Lazy(template, options);
 
     videoPlayer.ready(function() {
       videoPlayer.on('playmuted', function() {
@@ -238,7 +244,11 @@ pageflow.pageType.register('linkmap_page', _.extend({
     this.multiPlayer = pageflow.audio.createMultiPlayer({
       playFromBeginning: true,
       fadeDuration: 1000,
-      hooks: pageflow.atmo.createMediaPlayerHooks(configuration)
+      hooks: pageflow.atmo.createMediaPlayerHooks(configuration),
+      mediaEvents: true,
+      context: {
+        page: pageElement.page('instance')
+      }
     });
 
     this.multiPlayer.on('play', function(options) {
@@ -431,18 +441,25 @@ pageflow.pageType.register('linkmap_page', _.extend({
   },
 
   isVideoEnabled: function(configuration) {
-    return !pageflow.browser.has('mobile platform') &&
-      (configuration.background_type === 'video' || configuration.background_type === 'hover_video');
+    return this.isBackgroundVideoEnabled(configuration) || this.isHoverVideoEnabled(configuration)
   },
 
   isBackgroundVideoEnabled: function(configuration) {
-    return !pageflow.browser.has('mobile platform') &&
-      configuration.background_type === 'video';
+    if (pageflow.browser.has('mobile platform')) {
+      return configuration.background_type === 'video' && configuration.panorama_image_id == undefined
+    }
+    else{
+      return configuration.background_type === 'video'
+    }
   },
 
   isHoverVideoEnabled: function(configuration) {
-    return !pageflow.browser.has('mobile platform') &&
-      configuration.background_type === 'hover_video';
+    if (pageflow.browser.has('mobile platform')) {
+      return configuration.background_type === 'hover_video' && configuration.hover_image_id == undefined
+    }
+    else{
+      return configuration.background_type === 'hover_video'
+    }
   },
 
   updateNavigationMode: function(configuration) {

data/app/assets/javascript/pageflow/linkmap_page/widgets/hover_video.js

@@ -75,6 +75,11 @@
       }, 300);
 
       this.element.removeClass('playing');
+    },
+
+    unmute: function () {
+      var videoPlayer = this.options.video.data('videoPlayer');
+      videoPlayer.muted(false);
     }
   });
 }(jQuery));

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap.js

@@ -33,6 +33,10 @@
         'click': function(event) {
           var area = this.areaAt(this.positionFromEvent(event));
 
+          if (area.length && area.hasClass('hover_area')){
+            this.options.hoverVideo.unmute();
+          }
+
           if (area.length && area.hasClass('enabled')) {
             area.first().trigger($.Event('linkmapareaclick', {originalEvent: event}));
           }

data/app/assets/javascript/pageflow/linkmap_page/widgets/linkmap_pan_zoom.js

@@ -81,7 +81,7 @@
       this._ensureScrollerCanNotScroll();
       this._resizePanorama();
       this._transformPanoramaWrapper();
-      this._markAllButCurrentAreaAsDisabled();
+      this._disableAreas();
     },
 
     goToAreaByIndex: function(index) {
@@ -161,13 +161,10 @@
       this.panorama.height(this.panoramaSize.height);
     },
 
-    _markAllButCurrentAreaAsDisabled: function() {
-      var currentArea = this.currentArea;
-
-      this.options.areas().each(function() {
-        var area = $(this);
-        area.toggleClass('enabled', area.is(currentArea));
-      });
+    _disableAreas: function() {
+      // linkmapareaclick event for current area is dispatched above
+      // when user clicks anywhere in the page.
+      this.options.areas().removeClass('enabled');
     },
 
     _transformPanoramaWrapper: function() {

data/app/assets/stylesheets/pageflow/linkmap_page/editor/select_area_position_hint.scss

@@ -1,9 +1,8 @@
 .select_area_position_hint {
-  background-color: #fff;
   padding: 10px;
 
   button {
     margin-top: 10px;
-    @include button;
+    @include simple-button;
   }
 }

data/config/locales/de.yml

@@ -101,9 +101,7 @@ de:
             so viele Hotspots angelegt werden wie gewünscht.
 
             Der Panorama Typ entscheidet darüber, ob die Seite ein
-            Hintergrund-Bild oder Hintergrund-Video zeigt. (Beachte, dass
-            Hintergrund-Videos auf mobilen Geräten nicht abgespielt werden,
-            deshalb wähle ein zusätzliches Panorama-Bild für die mobile Version)
+            Hintergrund-Bild oder Hintergrund-Video zeigt. (Ein zusätzliches Fallback-Image für die mobile Version kann bereitgestellt werden, wenn das Video nicht passt)
 
             Die Hotspot-Seite ermöglicht auch die Nutzung von Panorama-Bildern,
             die größer sind, als der sichtbare Bildschirmbereich. So können Nutzer

data/config/locales/en.yml

@@ -98,7 +98,7 @@ en:
 
             Hotspots can play audio files, link to other pages in a Pageflow or to external websites. You can define as many hotspots as you want.
 
-            Decide if you want to show a background image or a background video. (Keep in mind, that background videos will not be played on mobile devices, therefore use an additional fallback image for the mobile version)
+            Decide if you want to show a background image or a background video. (An additional fallback image for the mobile version can be provided if video does not fit)
 
             The hotspot page type allows to use panoramic images that are wider and taller than the screen-size. It enables users to explore these images by horizontal or vertical scrolling.
 

data/lib/pageflow/linkmap_page/version.rb

@@ -1,5 +1,5 @@
 module Pageflow
   module LinkmapPage
-    VERSION = '2.6.1'.freeze
+    VERSION = '2.8.0'.freeze
   end
 end

data/pageflow-linkmap-page.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '~> 2.1'
 
-  spec.add_runtime_dependency 'pageflow', '~> 15.x'
+  spec.add_runtime_dependency 'pageflow', '~> 15.7.x'
   spec.add_runtime_dependency 'pageflow-external-links', '~> 2.x'
 
   spec.add_development_dependency 'bundler', ['>= 1.0', '< 3']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow-linkmap-page
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 2.8.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-21 00:00:00.000000000 Z
+date: 2022-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pageflow
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 15.x
+        version: 15.7.x
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 15.x
+        version: 15.7.x
 - !ruby/object:Gem::Dependency
   name: pageflow-external-links
   requirement: !ruby/object:Gem::Requirement
@@ -288,7 +288,6 @@ files:
 - app/assets/stylesheets/pageflow/linkmap_page/editor/action_buttons.scss
 - app/assets/stylesheets/pageflow/linkmap_page/editor/area_outlines.scss
 - app/assets/stylesheets/pageflow/linkmap_page/editor/areas_list.scss
-- app/assets/stylesheets/pageflow/linkmap_page/editor/file_areas.scss
 - app/assets/stylesheets/pageflow/linkmap_page/editor/inputs/area_mask.scss
 - app/assets/stylesheets/pageflow/linkmap_page/editor/masks_preview.scss
 - app/assets/stylesheets/pageflow/linkmap_page/editor/resizable.scss
@@ -371,8 +370,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.10
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Pageflow page type for a page that contains customizable link areas

data/app/assets/stylesheets/pageflow/linkmap_page/editor/file_areas.scss

@@ -1,70 +0,0 @@
-div.linkmap_page_file_areas {
-  .add_area {
-    @include plus-circled-icon;
-    @include icon-button;
-  }
-
-  ul.areas {
-    margin-bottom: 10px;
-  }
-
-  a.edit {
-    @include icon-only-button(#aaa);
-    @include pencil-icon;
-    position: absolute;
-    right: 4px;
-    top: 4px;
-  }
-
-  li {
-    margin-bottom: 2px;
-
-    > div:first-child {
-      padding-left: 45px;
-    }
-
-    .title {
-      cursor: default;
-      padding-right: 30px;
-    }
-
-    .label {
-      margin-top: 10px;
-      color: #666;
-    }
-
-    .file_thumbnail,
-    .missing_file_thumbnail {
-      position: absolute;
-      top: 0;
-      left: 0;
-      height: 100%;
-      width: 35px;
-      background-size: cover;
-      background-color: #444;
-    }
-
-    .file_thumbnail {
-      .pictogram:before {
-        font-size: 20px;
-      }
-    }
-
-    .missing_file_thumbnail {
-      @include background-icon-center($color: #fff);
-      @include attention-icon;
-      display: none;
-      position: absolute;
-    }
-
-    &.dangling {
-      .file_thumbnail {
-        display: none;
-      }
-
-      .missing_file_thumbnail {
-        display: block;
-      }
-    }
-  }
-}