pageflow 12.0.0.rc2 → 12.0.0.rc3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27c68e518121045d0fc5a741cec8a45949ab7be2
-  data.tar.gz: 89865570183eb26830f887fc729a668965944cdb
+  metadata.gz: bdda86a7651604acbc2fcd947408cfa39fec92b0
+  data.tar.gz: 4871846efc3baf5a247310ef19059d6584c3e75f
 SHA512:
-  metadata.gz: 516f8ba73529dfaad3d3f2f6c438f21e9772ea10ee88b484caa617a22bd0d6a0e282992d5ad4e44759a1ffc9795256ac131adf1040395ec8fbf5f48c761a51b9
-  data.tar.gz: 1bbbb921ed4edfae65f7d9bdc524057f41791a3801a95af89c17fcd5c8beea4cb7d109407ac02fb96350847979e2a560955cfc00cd59e10b6005c5feb4119f44
+  metadata.gz: f6f9f206ce5ef78cc200fd3b94ef57edbb9493de28cbffcf863ecbdcbda2e901de679aa838777d5cc2edbd05b2e4133f3436b2b2fb79bd5367984a26f995ec0e
+  data.tar.gz: 53945fb69b645f38ce6a82f8e9b9ec3dc02e1669704e560dd5b60bbe38cc42d26e0a1785786ab29e82accb1a7863d4968466dd89507c57b9bf8643c493ad54f6

data/CHANGELOG.md

@@ -1,5 +1,41 @@
 # CHANGELOG
 
+### Version 12.0.0.rc3
+
+2017-05-12
+
+[Compare changes](https://github.com/codevise/pageflow/compare/v12.0.0.rc2...v12.0.0.rc3)
+
+##### Manual Update Step
+
+- Switch from `Expires` to `Cache-Control` header for media uploads.
+  ([#753](https://github.com/codevise/pageflow/pull/753))
+
+  It’s recommended you update the files currently stored on S3:
+
+        $ s3cmd --recursive modify --add-header="Cache-Control: public, max-age=31536000" s3://yourbucket/
+        $ s3cmd --recursive modify --remove-header=Expires s3://yourbucket/
+
+  Tread carefully when you do this! As noted in
+  [this StackExchange answer](http://stackoverflow.com/questions/22501465/how-to-add-cache-control-in-aws-s3),
+  we have experienced that some public read permissions were lost
+  after running this script. Test first using just a single object. In
+  the AWS Management Console, you might want to grant public read
+  access on the entire bucket again to be safe.
+
+##### Minor Changes
+
+- Ensure public translations fall back to default locale
+  ([#757](https://github.com/codevise/pageflow/pull/757))
+- Depend on pageflow-public-i18n 1.9
+  ([#752](https://github.com/codevise/pageflow/pull/752))
+- Remove jQuery widgets formerly used by player controls
+  ([#756](https://github.com/codevise/pageflow/pull/756))
+- Bug fix: Use entry locale in CloseButton translations
+  ([#760](https://github.com/codevise/pageflow/pull/760))
+- Bug fix: Fix ensureValueDefined option of SelectInputView
+  ([#755](https://github.com/codevise/pageflow/pull/755))
+
 ### Version 12.0.0.rc2
 
 2017-05-10

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

@@ -8205,7 +8205,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var components = _interopRequireWildcard(_components);
 
-	var _selectors = __webpack_require__(444);
+	var _selectors = __webpack_require__(445);
 
 	var selectors = _interopRequireWildcard(_selectors);
 
@@ -8587,7 +8587,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _Icon2 = _interopRequireDefault(_Icon);
 
-	var _editorOnly = __webpack_require__(443);
+	var _editorOnly = __webpack_require__(444);
 
 	var _editorOnly2 = _interopRequireDefault(_editorOnly);
 
@@ -21155,31 +21155,68 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 /***/ },
 /* 442 */
-/***/ function(module, exports) {
+/***/ function(module, exports, __webpack_require__) {
 
-	"use strict";
+	'use strict';
 
 	Object.defineProperty(exports, "__esModule", {
 	  value: true
 	});
 
-	exports.default = function (props) {
+	var _selectors = __webpack_require__(443);
+
+	var _utils = __webpack_require__(380);
+
+	var _reactRedux = __webpack_require__(359);
+
+	function CloseButton(props) {
 	  return React.createElement(
-	    "div",
-	    { className: "close_button text_hidden_only",
-	      tabIndex: "4",
-	      title: I18n.t('pageflow.public.close'),
+	    'div',
+	    { className: 'close_button text_hidden_only',
+	      tabIndex: '4',
+	      title: props.t('pageflow.public.close'),
 	      onClick: props.onClick },
 	    React.createElement(
-	      "div",
-	      { className: "label" },
-	      I18n.t('pageflow.public.close')
+	      'div',
+	      { className: 'label' },
+	      props.t('pageflow.public.close')
 	    )
 	  );
-	};
+	}
+
+	exports.default = (0, _reactRedux.connect)((0, _utils.combineSelectors)({
+	  t: _selectors.t
+	}))(CloseButton);
 
 /***/ },
 /* 443 */
+/***/ function(module, exports, __webpack_require__) {
+
+	'use strict';
+
+	Object.defineProperty(exports, "__esModule", {
+	  value: true
+	});
+	exports.t = undefined;
+
+	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.locale = locale;
+
+	var _utils = __webpack_require__(380);
+
+	var t = exports.t = (0, _utils.memoizedSelector)(locale, function (locale) {
+	  return function (key, options) {
+	    return I18n.t(key, _extends({ locale: locale }, options));
+	  };
+	});
+
+	function locale(state) {
+	  return state.i18n.locale;
+	}
+
+/***/ },
+/* 444 */
 /***/ function(module, exports) {
 
 	"use strict";
@@ -21199,7 +21236,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	};
 
 /***/ },
-/* 444 */
+/* 445 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21211,9 +21248,9 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors = __webpack_require__(337);
 
-	var _selectors2 = __webpack_require__(445);
+	var _selectors2 = __webpack_require__(446);
 
-	var _selectors3 = __webpack_require__(448);
+	var _selectors3 = __webpack_require__(443);
 
 	var _selectors4 = __webpack_require__(449);
 
@@ -21233,7 +21270,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	exports.prop = _selectors6.prop;
 
 /***/ },
-/* 445 */
+/* 446 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21246,9 +21283,9 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors = __webpack_require__(337);
 
-	var _selectors2 = __webpack_require__(446);
+	var _selectors2 = __webpack_require__(447);
 
-	var _selectors3 = __webpack_require__(447);
+	var _selectors3 = __webpack_require__(448);
 
 	function currentParentChapterAttributes() {
 	  return function (state, props) {
@@ -21283,7 +21320,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	}
 
 /***/ },
-/* 446 */
+/* 447 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21309,7 +21346,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	var chapterAttributes = exports.chapterAttributes = selector;
 
 /***/ },
-/* 447 */
+/* 448 */
 /***/ function(module, exports, __webpack_require__) {
 
 	'use strict';
@@ -21332,33 +21369,6 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 	  });
 	}
 
-/***/ },
-/* 448 */
-/***/ function(module, exports, __webpack_require__) {
-
-	'use strict';
-
-	Object.defineProperty(exports, "__esModule", {
-	  value: true
-	});
-	exports.t = undefined;
-
-	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.locale = locale;
-
-	var _utils = __webpack_require__(380);
-
-	var t = exports.t = (0, _utils.memoizedSelector)(locale, function (locale) {
-	  return function (key, options) {
-	    return I18n.t(key, _extends({ locale: locale }, options));
-	  };
-	});
-
-	function locale(state) {
-	  return state.i18n.locale;
-	}
-
 /***/ },
 /* 449 */
 /***/ function(module, exports) {
@@ -21627,7 +21637,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors = __webpack_require__(454);
 
-	var _selectors2 = __webpack_require__(448);
+	var _selectors2 = __webpack_require__(443);
 
 	var _actions = __webpack_require__(455);
 
@@ -21816,7 +21826,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors3 = __webpack_require__(449);
 
-	var _selectors4 = __webpack_require__(448);
+	var _selectors4 = __webpack_require__(443);
 
 	var _utils = __webpack_require__(380);
 
@@ -22142,7 +22152,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _utils = __webpack_require__(380);
 
-	var _selectors = __webpack_require__(448);
+	var _selectors = __webpack_require__(443);
 
 	var _selectors2 = __webpack_require__(457);
 
@@ -22223,7 +22233,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors = __webpack_require__(405);
 
-	var _selectors2 = __webpack_require__(444);
+	var _selectors2 = __webpack_require__(445);
 
 	var _utils = __webpack_require__(380);
 
@@ -22475,7 +22485,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors2 = __webpack_require__(449);
 
-	var _selectors3 = __webpack_require__(444);
+	var _selectors3 = __webpack_require__(445);
 
 	var _selectors4 = __webpack_require__(402);
 
@@ -23391,7 +23401,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors = __webpack_require__(337);
 
-	var _selectors2 = __webpack_require__(444);
+	var _selectors2 = __webpack_require__(445);
 
 	var _utils = __webpack_require__(380);
 
@@ -26046,7 +26056,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors2 = __webpack_require__(337);
 
-	var _selectors3 = __webpack_require__(448);
+	var _selectors3 = __webpack_require__(443);
 
 	var _selectors4 = __webpack_require__(405);
 
@@ -26215,7 +26225,7 @@ pageflow = typeof pageflow === "object" ? pageflow : {}; pageflow["react"] =
 
 	var _selectors2 = __webpack_require__(337);
 
-	var _selectors3 = __webpack_require__(448);
+	var _selectors3 = __webpack_require__(443);
 
 	var _selectors4 = __webpack_require__(405);
 

data/app/assets/javascripts/pageflow/ui/views/inputs/select_input_view.js

@@ -138,8 +138,7 @@ pageflow.SelectInputView = Backbone.Marionette.ItemView.extend({
     this.load();
     this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
 
-    if (this.options.ensureValueDefined && !this.ui.select.val()) {
-      this.ui.select.val(this.options.values[0]);
+    if (this.options.ensureValueDefined && !this.model.has(this.options.propertyName)) {
       this.save();
     }
   },

data/app/helpers/pageflow/public_i18n_helper.rb

@@ -3,11 +3,17 @@ module Pageflow
     def public_i18n_javascript_tag(entry)
       render('pageflow/public_i18n/javascript_tag',
              entry_locale: entry.locale,
-             translations: {
-               pageflow: {
-                 public: I18n.t('pageflow.public', locale: entry.locale)
-               }
-             })
+             translations: public_i18n_translations(entry))
+    end
+
+    def public_i18n_translations(entry)
+      {
+        pageflow: {
+          public: I18n.t('pageflow.public', locale: entry.locale)
+                      .dup
+                      .deep_merge(I18n.t('pageflow.public', locale: I18n.default_locale))
+        }
+      }
     end
   end
 end

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

@@ -35,6 +35,7 @@
 <script>
   I18n.defaultLocale = "<%= I18n.default_locale %>";
   I18n.locale = "<%= I18n.locale %>";
+  I18n.fallbacks = true;
 
   pageflow.startEditor({entryId: <%= @entry.id %>})
 </script>

data/config/initializers/paperclip.rb

@@ -6,31 +6,31 @@ Pageflow.configure do |config|
 
   if Rails.env.test?
     config.paperclip_s3_default_options.merge!({
-      :storage => :filesystem,
-      :path => ':rails_root/tmp/attachments/test/s3/:class/:attachment/:id_partition/:style/:filename'
+      storage: :filesystem,
+      path: ':rails_root/tmp/attachments/test/s3/:class/:attachment/:id_partition/:style/:filename'
     })
   else
     config.paperclip_s3_default_options.merge!({
-      :storage => :s3,
-      :s3_headers => {'Expires' => 1.year.from_now.httpdate},
-      :s3_options => {:max_retries => 10},
+      storage: :s3,
+      s3_headers: {'Cache-Control' => "public, max-age=31536000"},
+      s3_options: {max_retries: 10},
 
-      :url => ':s3_alias_url',
-      :path => ':host/:class_basename/:attachment/:id_partition/:pageflow_attachments_version:style/:filename',
+      url: ':s3_alias_url',
+      path: ':host/:class_basename/:attachment/:id_partition/:pageflow_attachments_version:style/:filename',
 
       # Paperclip deletes and reuploads the original on
       # reprocess. Sometimes S3 seems to change the order of commands
       # causing the image to be deleted. This is fixed on paperclip
       # master, but for us not deleting old files is good enough. They
       # might be in the CDN anyway.
-      :keep_old_files => true
+      keep_old_files: true
     })
   end
 
   config.paperclip_filesystem_default_options.merge!({
-    :storage => :filesystem,
-    :path => ':pageflow_filesystem_root/:class/:attachment/:id_partition/:style/:filename',
-    :url => 'not_uploaded_yet'
+    storage: :filesystem,
+    path: ':pageflow_filesystem_root/:class/:attachment/:id_partition/:style/:filename',
+    url: 'not_uploaded_yet'
   })
 
   config.thumbnail_styles = {

data/lib/pageflow/version.rb

@@ -1,3 +1,3 @@
 module Pageflow
-  VERSION = '12.0.0.rc2'.freeze
+  VERSION = '12.0.0.rc3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pageflow
 version: !ruby/object:Gem::Version
-  version: 12.0.0.rc2
+  version: 12.0.0.rc3
 platform: ruby
 authors:
 - Codevise Solutions Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-10 00:00:00.000000000 Z
+date: 2017-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -540,14 +540,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: '1.9'
 - !ruby/object:Gem::Dependency
   name: bcrypt
   requirement: !ruby/object:Gem::Requirement
@@ -1321,13 +1321,10 @@ files:
 - app/assets/javascripts/pageflow/visited.js
 - app/assets/javascripts/pageflow/widget_types.js
 - app/assets/javascripts/pageflow/widgets.js
-- app/assets/javascripts/pageflow/widgets/auto_hide_player_controls.js
 - app/assets/javascripts/pageflow/widgets/events.js
 - app/assets/javascripts/pageflow/widgets/fullscreen_button.js
 - app/assets/javascripts/pageflow/widgets/header.js
-- app/assets/javascripts/pageflow/widgets/hide_content_during_playback.js
 - app/assets/javascripts/pageflow/widgets/loading_spinner.js
-- app/assets/javascripts/pageflow/widgets/mark_with_played_states.js
 - app/assets/javascripts/pageflow/widgets/multimedia_alert.js
 - app/assets/javascripts/pageflow/widgets/mute_button.js
 - app/assets/javascripts/pageflow/widgets/navigation.js

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

@@ -1,59 +0,0 @@
-jQuery.widget('pageflow.autoHidePlayerControls', {
-  attach: function(player) {
-    var element = this.element;
-    var options = this.options;
-    var pageElement = this.options.pageElement;
-    var target = this.options.target;
-    var timeout;
-
-    pageElement.on('mousemove', autoHideControls);
-    $('body').on('keydown', autoHideControls);
-    pageElement.find('.content').on('touchstart', autoHideControls);
-
-    player.on('play', function() {
-      autoHideControls();
-    });
-
-    player.on('pause', showControls);
-
-    element.on('mouseenter', function() {
-      target.addClass('is_control_bar_hovered');
-    });
-
-    element.on('mouseleave', function() {
-      target.removeClass('is_control_bar_hovered');
-    });
-
-    function autoHideControls() {
-      showControls();
-      if (!pageflow.browser.has('phone platform')) {
-        clearTimeout(timeout);
-        timeout = setTimeout(hideControls, 2000);
-      }
-    }
-
-    function hideControls() {
-      if (!player.paused()) {
-        target.addClass('is_idle');
-        element.addClass('has_been_faded');
-
-        if (options.onHide) {
-          options.onHide();
-        }
-      }
-    }
-
-    function showControls() {
-      target.removeClass('is_idle');
-
-      if (options.onShow) {
-        options.onShow();
-      }
-    }
-  },
-
-  reset: function(options) {
-    this.element
-      .removeClass('has_been_faded');
-  }
-});

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

@@ -1,68 +0,0 @@
-jQuery.widget('pageflow.hideContentDuringPlayback', {
-  attach: function(player) {
-    var scrollIndicator = this.options.scrollIndicator;
-    var content = this.element.find('.scroller, .controls, .shadow');
-    var waitingOnUnderrun = false;
-    var widget = this;
-
-    this.scroller = this.element.find('.scroller');
-
-    player.on('bufferunderrun', function() {
-      waitingOnUnderrun = true;
-    });
-
-    player.on('bufferunderruncontinue', function() {
-      waitingOnUnderrun = false;
-    });
-
-    player.on('pause', function() {
-      content.addClass('lock-showing');
-
-      if (!waitingOnUnderrun) {
-        content.addClass('is_paused').removeClass('is_playing');
-        widget._removeDelayedIsPlayingClass();
-
-        scrollIndicator.enable();
-      }
-    });
-
-    player.on('play', function() {
-      content.removeClass('lock-showing is_paused').addClass('is_playing');
-      widget._addDelayedIsPlayingClass();
-
-      if (pageflow.widgets.isPresent('classic_player_controls')) {
-        scrollIndicator.scheduleDisable();
-      }
-      else {
-        scrollIndicator.disable();
-      }
-    });
-
-    player.on('ended', function() {
-      content.addClass('lock-showing');
-      content.addClass('is_paused').removeClass('is_playing');
-
-      widget._removeDelayedIsPlayingClass();
-
-      scrollIndicator.enable();
-    });
-
-    content.addClass('lock-showing is_paused');
-  },
-
-  _addDelayedIsPlayingClass: function() {
-    this.scroller.addClass('is_playing_delayed');
-    clearTimeout(this.delayedPlayingClassTimeout);
-    this.delayedPlayingClassTimeout = null;
-  },
-
-  _removeDelayedIsPlayingClass: function() {
-    var scroller = this.scroller;
-
-    if (!this.delayedPlayingClassTimeout) {
-      this.delayedPlayingClassTimeout = setTimeout(function() {
-        scroller.removeClass('is_playing_delayed');
-      }, 700);
-    }
-  },
-});

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

@@ -1,23 +0,0 @@
-jQuery.widget('pageflow.markWithPlayedStates', {
-  attach: function(player) {
-    var element = this.element;
-
-    player.on('play', function() {
-      element.removeClass('unplayed');
-    });
-
-    player.on('pause', function() {
-      element.addClass('has_played');
-    });
-  },
-
-  reset: function(options) {
-    this.element.toggleClass('unplayed', !this._willAutoplay(options));
-    this.element.removeClass('has_played');
-  },
-
-  _willAutoplay: function(options) {
-    options = options || {};
-    return options.autoplay && !pageflow.browser.has('mobile platform');
-  }
-});