pageflow 12.4.1 → 12.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3f21cfb68b0a347a4480c513deafd0fd24a2f517bfd50f94796637a91701a83f
-  data.tar.gz: 4a4de23f3cc3dc42821ba97a8f415c4b80e7ede62807d9ed67984b402af2cc08
+  metadata.gz: 25b1b394c27e1b14c6c3eda8df1d5db7fea4253287cf579a9984f474c097583a
+  data.tar.gz: 810b47167f169680c8b2e35b7c210cad870d81dc0f0dcc03eebfdd4fc57210de
 SHA512:
-  metadata.gz: f690814e8dde59d4d2ac32d653654d09a2d0498fc4d6633441aea05288b884ac065cdc2f4663e177d4790dede2dd390c017a3ceb215396ece523a59717d459cd
-  data.tar.gz: 42679784d2688f735d097748e3cb7f2da15d1ad86d1f67d916665dda2bbf61c541ae02a80307d656d4ffb3495610436ac414da59195d21f1c97a7ce6b1772d76
+  metadata.gz: fb8b88ad2ec2ecc9f516b20ae79638857fee65c91478c63a1f393597967dabd7c5c125cccfd943d6c8a4d1bdee207dade3cd0e72a0028a5f90b1c33bdaf49528
+  data.tar.gz: f9c0dd5c0031a2c300a5012492982c526fcd3ef99ca469eefc1c4035f12221b8b31a60100c774ca6a26fa5ef442e3519c41e09f0d4981d86ab87d2b86454d088

data/CHANGELOG.md

@@ -1,39 +1,27 @@
 # CHANGELOG
 
-### Version 12.4.1
+### Version 12.5.0
 
-2018-12-11
+2019-01-21
 
-[Compare changes](https://github.com/codevise/pageflow/compare/v12.4.0...v12.4.1)
+[Compare changes](https://github.com/codevise/pageflow/compare/12-4-stable...v12.5.0)
 
-- Bug fix: Sanitize page perma id from URL fragment
-  ([#1091](https://github.com/codevise/pageflow/pull/1091))
 
-### Version 12.4.0
+##### Manual Update Steps
+- Install new migrations in host application
 
-2018-11-29
-
-[Compare changes](https://github.com/codevise/pageflow/compare/12-3-stable...v12.4.0)
-
-- Add config option to always redirect to cname of entry
-  ([#1069](https://github.com/codevise/pageflow/pull/1069))
-- Add theme option to use image for unmute button
-  ([#1065](https://github.com/codevise/pageflow/pull/1065))
-- Add theme variables for anchors
-  ([#1064](https://github.com/codevise/pageflow/pull/1064))
-- Ensure share-icon-color key can be used in $widget-icon-font-options
-  ([#1073](https://github.com/codevise/pageflow/pull/1073))
-- Try to resume suspended audio context on volume change
-  ([#1084](https://github.com/codevise/pageflow/pull/1084),
-   [#1079](https://github.com/codevise/pageflow/pull/1079))
-- Play background video silently until page did activate
-  ([#1083](https://github.com/codevise/pageflow/pull/1083),
-   [#1078](https://github.com/codevise/pageflow/pull/1078))
-- Bug fix: Use polyfill to fix array#reverse in safari 12
-  ([#1068](https://github.com/codevise/pageflow/pull/1068))
-- Bug fix: Fix adjacent page lookup for page preloading
-  ([#1067](https://github.com/codevise/pageflow/pull/1067))
+##### Further Changes
+- Create new entries with default locale
+  ([#1103](https://github.com/codevise/pageflow/pull/1103))
+- Trigger resize hooks on cookie notice dismiss
+  ([#1102](https://github.com/codevise/pageflow/pull/1102))
+- Improve lazy loading thumbnails
+  ([#1098](https://github.com/codevise/pageflow/pull/1098))
+- Ensure hls videos are used in Safari
+  ([#1097](https://github.com/codevise/pageflow/pull/1097))
+- Prevent loading of invisible images before load event
+  ([#1095](https://github.com/codevise/pageflow/pull/1095))
 
 See
-[12-3-stable branch](https://github.com/codevise/pageflow/blob/12-3-stable/CHANGELOG.md)
+[12-4-stable branch](https://github.com/codevise/pageflow/blob/12-4-stable/CHANGELOG.md)
 for previous changes.

data/admins/pageflow/accounts.rb

@@ -72,14 +72,15 @@ module Pageflow
 
     controller do
       helper Pageflow::Admin::FeaturesHelper
-      helper Pageflow::Admin::WidgetsHelper
       helper Pageflow::Admin::FormHelper
+      helper Pageflow::Admin::LocalesHelper
       helper Pageflow::Admin::MembershipsHelper
+      helper Pageflow::Admin::WidgetsHelper
       helper ThemesHelper
 
       def new
         @account = Account.new
-        @account.build_default_theming
+        @account.build_default_theming(default_locale: current_user.locale)
       end
 
       def create
@@ -145,7 +146,8 @@ module Pageflow
           :home_button_enabled_by_default,
           :default_author,
           :default_publisher,
-          :default_keywords
+          :default_keywords,
+          :default_locale
         ] +
           permitted_attributes_for(:theming)
       end

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

@@ -25,6 +25,11 @@ pageflow.browser.feature('mp4 support only', function(has) {
     pageflow.browser.agent.matchesDesktopSafari10();
 });
 
+pageflow.browser.feature('mse and native hls support', function(has) {
+  return pageflow.browser.agent.matchesSafari() &&
+    !pageflow.browser.agent.matchesMobilePlatform();
+});
+
 pageflow.browser.feature('native video player', function(has) {
   return has('iphone platform');
-});
+});

data/app/assets/javascripts/pageflow/dist/react.js

@@ -24633,12 +24633,17 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  value: true
 	});
 	exports.entryAttribute = entryAttribute;
+	exports.isEntryReady = isEntryReady;
 	function entryAttribute(name) {
 	  return function (state) {
 	    return state.entry[name];
 	  };
 	}
 
+	function isEntryReady(state) {
+	  return !!state.entry.isReady;
+	}
+
 /***/ }),
 /* 504 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -25929,21 +25934,26 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
-	exports.default = PagePrintImage;
 
 	var _reactRedux = __webpack_require__(398);
 
 	var _pages = __webpack_require__(349);
 
-	var _selectors = __webpack_require__(376);
+	var _selectors = __webpack_require__(503);
 
-	var _selectors2 = __webpack_require__(489);
+	var _selectors2 = __webpack_require__(376);
+
+	var _selectors3 = __webpack_require__(489);
 
 	var _utils = __webpack_require__(340);
 
 	function PagePrintImage(_ref) {
-	  var page = _ref.page;
+	  var page = _ref.page,
+	      isEntryReady = _ref.isEntryReady;
 
+	  if (!isEntryReady) {
+	    return null;
+	  }
 	  if (page.backgroundType == 'video' || page.type == 'video') {
 	    return React.createElement(PrintVideoPoster, { videoId: page.videoFileId, posterImageId: page.posterImageId });
 	  } else {
@@ -25951,12 +25961,17 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  }
 	}
 
+	exports.default = (0, _reactRedux.connect)((0, _utils.combineSelectors)({
+	  isEntryReady: _selectors.isEntryReady
+	}))(PagePrintImage);
+
+
 	var PrintVideoPoster = (0, _reactRedux.connect)((0, _utils.combineSelectors)({
-	  videoFile: (0, _selectors2.file)('videoFiles', {
-	    id: (0, _selectors2.prop)('videoId')
+	  videoFile: (0, _selectors3.file)('videoFiles', {
+	    id: (0, _selectors3.prop)('videoId')
 	  }),
-	  posterImageFile: (0, _selectors2.file)('imageFiles', {
-	    id: (0, _selectors2.prop)('posterImageId')
+	  posterImageFile: (0, _selectors3.file)('imageFiles', {
+	    id: (0, _selectors3.prop)('posterImageId')
 	  })
 	}))(function (_ref2) {
 	  var videoFile = _ref2.videoFile,
@@ -25970,16 +25985,16 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	});
 
 	var PrintImage = (0, _pages.connectInPage)((0, _utils.combineSelectors)({
-	  file: (0, _selectors2.file)('imageFiles', {
-	    id: (0, _selectors2.prop)('imageId')
+	  file: (0, _selectors3.file)('imageFiles', {
+	    id: (0, _selectors3.prop)('imageId')
 	  }),
-	  pageIsPrepared: (0, _selectors.pageIsPrepared)()
+	  pageIsPrepared: (0, _selectors2.pageIsPrepared)()
 	}))(PrintImageTag);
 
 	function PrintImageTag(_ref3) {
 	  var file = _ref3.file;
 
-	  if (file && _selectors.pageIsPrepared) {
+	  if (file && _selectors2.pageIsPrepared) {
 	    return React.createElement('img', { src: file.urls.print,
 	      alt: file.alt,
 	      className: 'print_image' });
@@ -29274,7 +29289,15 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	exports.default = {
 	  init: function init(_ref) {
 	    var slug = _ref.slug,
-	        dispatch = _ref.dispatch;
+	        dispatch = _ref.dispatch,
+	        events = _ref.events,
+	        isServerSide = _ref.isServerSide;
+
+	    if (!isServerSide) {
+	      events.once('ready', function () {
+	        return dispatch((0, _actions.ready)());
+	      });
+	    }
 
 	    dispatch((0, _actions.init)({ slug: slug }));
 	  },
@@ -29293,7 +29316,9 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  value: true
 	});
 	exports.init = init;
+	exports.ready = ready;
 	var INIT = exports.INIT = 'ENTRY_INIT';
+	var READY = exports.READY = 'ENTRY_READY';
 
 	function init(_ref) {
 	  var slug = _ref.slug;
@@ -29306,6 +29331,12 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  };
 	}
 
+	function ready() {
+	  return {
+	    type: READY
+	  };
+	}
+
 /***/ }),
 /* 578 */
 /***/ (function(module, exports, __webpack_require__) {
@@ -29316,13 +29347,17 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  value: true
 	});
 
+	var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
+
 	exports.default = function () {
 	  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 	  var action = arguments[1];
 
 	  switch (action.type) {
 	    case _actions.INIT:
-	      return { slug: action.payload.slug };
+	      return _extends({}, state, { slug: action.payload.slug });
+	    case _actions.READY:
+	      return _extends({}, state, { isReady: true });
 	    default:
 	      return state;
 	  }

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

@@ -10,3 +10,13 @@ $.fn.updateTitle = function () {
     this.attr('title', this.data('title'));
   }
 };
+
+$.fn.loadLazyImages = function() {
+  this.find('img[data-src]').each(function() {
+    var img = $(this);
+
+    if (!img.attr('src')) {
+      img.attr('src', img.data('src'));
+    }
+  });
+};

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

@@ -6,6 +6,7 @@ pageflow.ready = new $.Deferred(function(readyDeferred) {
 
       body.one('pagepreloaded', function() {
         readyDeferred.resolve();
+        pageflow.events.trigger('ready');
       });
 
       pageflow.Visited.setup();
@@ -42,4 +43,4 @@ pageflow.ready = new $.Deferred(function(readyDeferred) {
       pageflow.nativeScrolling.preventScrollingOnEmbed(slideshow);
     });
   };
-}).promise();
+}).promise();

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

@@ -179,7 +179,7 @@ pageflow.Slideshow = function($el, configurations) {
   }
 
   function getPageByPermaId(permaId) {
-    return $el.find('#' + parseInt(permaId, 10));
+    return $el.find('#' + permaId);
   }
 
   this.on = function() {

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

@@ -1,8 +1,22 @@
 pageflow.VideoPlayer.filterSources = function(playerElement) {
-  if ($(playerElement).is('video') && pageflow.browser.has('mp4 support only')) {
+  if (!$(playerElement).is('video')) {
+    return playerElement;
+  }
+
+  var changed = false;
+
+  if (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);
@@ -13,4 +27,4 @@ pageflow.VideoPlayer.filterSources = function(playerElement) {
   else {
     return playerElement;
   }
-};
+};

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

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

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

@@ -87,6 +87,7 @@
         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,6 +19,7 @@
       $('.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,6 +18,8 @@ jQuery(function($) {
         var scrollIndicator = $('.slideshow .scroll_indicator');
 
         overview.toggleClass('active', state);
+        overview.loadLazyImages();
+
         indexButton
           .toggleClass('active', state)
           .updateTitle();
@@ -126,4 +128,4 @@ jQuery(function($) {
       }
     }
   });
-});
+});

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

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

data/app/models/pageflow/theming.rb

@@ -37,7 +37,8 @@ module Pageflow
         publisher: default_publisher.presence || Pageflow.config.default_publisher_meta_tag,
         keywords: default_keywords.presence || Pageflow.config.default_keywords_meta_tag,
         theme_name: theme_name,
-        home_button_enabled: home_button_enabled_by_default
+        home_button_enabled: home_button_enabled_by_default,
+        locale: default_locale
       )
     end
 

data/app/views/admin/accounts/_form.html.erb

@@ -18,6 +18,13 @@
     <% end %>
 
     <%= f.inputs do %>
+      <%= theming.input :default_locale,
+                        as: :select,
+                        include_blank: false,
+                        collection: Pageflow.config.available_public_locales.map{ |locale|
+                          [t('pageflow.public._language', locale: locale), locale.to_s]
+                        },
+                        hint: t('pageflow.admin.themings.default_locale_hint') %>
       <%= theming.input :default_author,
         hint: t('pageflow.admin.themings.default_author_hint'),
         placeholder: Pageflow.config.default_author_meta_tag %>

data/app/views/admin/accounts/_theming_details.html.arb

@@ -5,6 +5,9 @@ extensible_attributes_table_for(account.default_theming,
   row :theme, class: 'theme' do
     account.default_theming.theme.name
   end
+  row :default_locale, class: 'default_locale' do
+    t('pageflow.public._language', locale: account.default_theming.default_locale)
+  end
   row :default_author, class: 'default_author'
   row :default_publisher, class: 'default_publisher'
   row :default_keywords, class: 'default_keywords'

data/app/views/pageflow/entries/_mobile_navigation.html.erb

@@ -7,9 +7,8 @@
       <span class="heading-1"><%= t('pageflow.public.overview') %></span>
       <div class="wrapper">
         <ul class="pages">
-          <%= render :partial => 'pageflow/entries/navigation/page',
-                     :collection => entry_mobile_navigation_pages(entry),
-                     :locals => {:image_style => :thumbnail_overview_mobile, :image_width => nil} %>
+          <%= render :partial => 'pageflow/entries/mobile_navigation/page',
+                     :collection => entry_mobile_navigation_pages(entry) %>
         </ul>
       </div>
   </div>

data/app/views/pageflow/entries/mobile_navigation/_page.html.erb

@@ -0,0 +1,5 @@
+<li class="<%= page_navigation_css_class(page) %>">
+  <%= link_to "##{page.perma_id}", data: {link: page.id, chapter_id: page.chapter_id} do %>
+    <%= image_tag('', data: {src: asset_path(page.thumbnail_url(:thumbnail_overview_mobile))}) %>
+  <% end %>
+</li>

data/app/views/pageflow/entries/navigation/_page.html.erb

@@ -4,6 +4,8 @@
   <% end %>
   <div class="navigation_site_detail">
     <%= page.title %>
-    <div class="thumbnail is_<%= page.template %>" style="background-image: url('<%= asset_path(page.thumbnail_url(:navigation_thumbnail_large)) %>')"></div>
+    <div class="thumbnail is_<%= page.template %>">
+      <%= image_tag('', data: {src: asset_path(page.thumbnail_url(:navigation_thumbnail_large))}) %>
+    </div>
   </div>
 </li>

data/app/views/pageflow/entries/overview/_page.html.erb

@@ -4,6 +4,6 @@
         <%= overview_page_description(page) %>
       </p>
     </div>
-    <%= image_tag("#{page.thumbnail_url(:thumbnail_overview_desktop)}") %>
+    <%= image_tag('', data: {src: asset_path(page.thumbnail_url(:thumbnail_overview_desktop))}) %>
     <div class="pictogram"></div>
 <% end %>

data/config/locales/de.yml

@@ -263,6 +263,7 @@ de:
         copyright_link_url: Copyright-Link URL
         default_author: Standard Autor
         default_keywords: Standard Schlüsselwörter
+        default_locale: Standard Sprache
         default_publisher: Standard Herausgeber
         home_button_enabled_by_default: Home-Button in neuen Beiträgen anzeigen
         home_url: Redirect URL
@@ -836,6 +837,7 @@ de:
         cname_hint: Wird in Share Links verwendet.
         default_author_hint: Voreinstellung 'author' Meta-Feld für Eintrage
         default_keywords_hint: Voreinstellung 'keywords' Meta-Feld für Eintrage
+        default_locale_hint: Voreinstellung Sprache für Einträge
         default_publisher_hint: Voreinstellung 'publisher' Meta-Feld für Eintrage
         home_url_hint: Wird einer der obigen CNAMES ohne Pfad in der URL verwendet, wird zu dieser URL umgeleitet. Standard Link Ziel des Home Buttons.
         name: "%{account_name}"

data/config/locales/en.yml

@@ -263,6 +263,7 @@ en:
         copyright_link_url: Copyright link URL
         default_author: Default author
         default_keywords: Default keywords
+        default_locale: Default locale
         default_publisher: Default publisher
         home_button_enabled_by_default: "'Home'-Button enabled by default"
         home_url: Redirect URL
@@ -836,6 +837,7 @@ en:
         cname_hint: Used in public sharing URLs.
         default_author_hint: Default 'author' meta field for entries
         default_keywords_hint: Default 'keywords' meta field for entries
+        default_locale_hint: Default language for entries
         default_publisher_hint: Default 'publisher' meta field for entries
         home_url_hint: Used for requests to the root path with one of the above CNAMES. Default target location for the home button.
         name: "%{account_name}"

data/db/migrate/20190109085744_add_default_locale_to_themings.rb

@@ -0,0 +1,6 @@
+class AddDefaultLocaleToThemings < ActiveRecord::Migration
+  def change
+    add_column :pageflow_themings, :default_locale, :string,
+               after: 'default_publisher', default: 'de'
+  end
+end

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.4.1'.freeze
+  VERSION = '12.5.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 12.4.1
+  version: 12.5.0
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2019-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -1853,6 +1853,7 @@ files:
 - app/views/pageflow/entries/_skip_links.html.erb
 - app/views/pageflow/entries/_theming.css.erb
 - app/views/pageflow/entries/edit.html.erb
+- app/views/pageflow/entries/mobile_navigation/_page.html.erb
 - app/views/pageflow/entries/navigation/_bar_bottom.html.erb
 - app/views/pageflow/entries/navigation/_bar_top.html.erb
 - app/views/pageflow/entries/navigation/_credits_box_content.html.erb
@@ -1964,6 +1965,7 @@ files:
 - db/migrate/20170912165050_reset_copied_snapshot_type.rb
 - db/migrate/20170913105048_fix_hls_output_presences_for_legacy_video_files.rb
 - db/migrate/20180528144334_add_privacy_link_url_to_themings.rb
+- db/migrate/20190109085744_add_default_locale_to_themings.rb
 - lib/generators/pageflow/active_admin_initializer/active_admin_initializer_generator.rb
 - lib/generators/pageflow/assets/assets_generator.rb
 - lib/generators/pageflow/assets/templates/application.js
@@ -2124,7 +2126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Multimedia story telling for the web.