pageflow 15.8.0 → 16.1.0

data/package/ui.js

@@ -7,6 +7,7 @@ import ChildViewContainer from 'backbone.babysitter';
 import IScroll from 'iscroll';
 import 'jquery.minicolors';
 import wysihtml5 from 'wysihtml5';
+import 'jquery-ui';
 import Cocktail from 'cocktail';
 
 /*global JST*/
@@ -1064,6 +1065,107 @@ var TooltipView = Marionette.ItemView.extend({
   }
 });
 
+function _defineProperty(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value: value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+
+  return obj;
+}
+
+function ownKeys(object, enumerableOnly) {
+  var keys = Object.keys(object);
+
+  if (Object.getOwnPropertySymbols) {
+    var symbols = Object.getOwnPropertySymbols(object);
+    if (enumerableOnly) symbols = symbols.filter(function (sym) {
+      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
+    });
+    keys.push.apply(keys, symbols);
+  }
+
+  return keys;
+}
+
+function _objectSpread2(target) {
+  for (var i = 1; i < arguments.length; i++) {
+    var source = arguments[i] != null ? arguments[i] : {};
+
+    if (i % 2) {
+      ownKeys(Object(source), true).forEach(function (key) {
+        _defineProperty(target, key, source[key]);
+      });
+    } else if (Object.getOwnPropertyDescriptors) {
+      Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
+    } else {
+      ownKeys(Object(source)).forEach(function (key) {
+        Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+      });
+    }
+  }
+
+  return target;
+}
+
+var attributeBinding = {
+  setupBooleanAttributeBinding: function setupBooleanAttributeBinding(optionName, updateMethod) {
+    this.setupAttributeBinding(optionName, updateMethod, Boolean);
+  },
+  getBooleanAttributBoundOption: function getBooleanAttributBoundOption(optionName) {
+    return this.getAttributeBoundOption(optionName, Boolean);
+  },
+  setupAttributeBinding: function setupAttributeBinding(optionName, updateMethod) {
+    var _this = this;
+
+    var normalize = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : function (value) {
+      return value;
+    };
+    var binding = this.options["".concat(optionName, "Binding")];
+    var view = this;
+
+    if (binding) {
+      _.flatten([binding]).forEach(function (attribute) {
+        _this.listenTo(_this.model, 'change:' + attribute, update);
+      });
+    }
+
+    update();
+
+    function update() {
+      updateMethod.call(view, view.getAttributeBoundOption(optionName, normalize));
+    }
+  },
+  getAttributeBoundOption: function getAttributeBoundOption(optionName) {
+    var _this2 = this;
+
+    var normalize = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : function (value) {
+      return value;
+    };
+    var binding = this.options["".concat(optionName, "Binding")];
+    var bindingValueOptionName = "".concat(optionName, "BindingValue");
+    var value = Array.isArray(binding) ? binding.map(function (attribute) {
+      return _this2.model.get(attribute);
+    }) : this.model.get(binding);
+
+    if (bindingValueOptionName in this.options) {
+      return value === this.options[bindingValueOptionName];
+    } else if (typeof this.options[optionName] === 'function') {
+      return normalize(this.options[optionName](value));
+    } else if (optionName in this.options) {
+      return normalize(this.options[optionName]);
+    } else if (binding) {
+      return normalize(value);
+    }
+  }
+};
+
 /**
  * Mixin for input views handling common concerns like labels,
  * inline help, visiblity and disabling.
@@ -1193,7 +1295,7 @@ var TooltipView = Marionette.ItemView.extend({
  * @mixin
  */
 
-var inputView = {
+var inputView = _objectSpread2(_objectSpread2({}, attributeBinding), {}, {
   ui: {
     label: 'label',
     labelText: 'label .name',
@@ -1237,8 +1339,8 @@ var inputView = {
     this.ui.labelText.text(this.labelText());
     this.updateInlineHelp();
     this.setLabelFor();
-    this.setupAttributeBinding('disabled', this.updateDisabled);
-    this.setupAttributeBinding('visible', this.updateVisible);
+    this.setupBooleanAttributeBinding('disabled', this.updateDisabled);
+    this.setupBooleanAttributeBinding('visible', this.updateVisible);
   },
 
   /**
@@ -1287,7 +1389,7 @@ var inputView = {
     }
   },
   isDisabled: function isDisabled() {
-    return this.getAttributeBoundOption('disabled');
+    return this.getBooleanAttributBoundOption('disabled');
   },
   updateDisabled: function updateDisabled() {
     this.$el.toggleClass('input-disabled', !!this.isDisabled());
@@ -1305,46 +1407,9 @@ var inputView = {
     }
   },
   updateVisible: function updateVisible() {
-    this.$el.toggleClass('input-hidden_via_binding', this.getAttributeBoundOption('visible') === false);
-  },
-  setupAttributeBinding: function setupAttributeBinding(optionName, updateMethod) {
-    var _this = this;
-
-    var binding = this.options["".concat(optionName, "Binding")];
-    var view = this;
-
-    if (binding) {
-      _.flatten([binding]).forEach(function (attribute) {
-        _this.listenTo(_this.model, 'change:' + attribute, update);
-      });
-    }
-
-    update();
-
-    function update() {
-      updateMethod.call(view, view.getAttributeBoundOption(optionName));
-    }
-  },
-  getAttributeBoundOption: function getAttributeBoundOption(optionName) {
-    var _this2 = this;
-
-    var binding = this.options["".concat(optionName, "Binding")];
-    var bindingValueOptionName = "".concat(optionName, "BindingValue");
-    var value = Array.isArray(binding) ? binding.map(function (attribute) {
-      return _this2.model.get(attribute);
-    }) : this.model.get(binding);
-
-    if (bindingValueOptionName in this.options) {
-      return value === this.options[bindingValueOptionName];
-    } else if (typeof this.options[optionName] === 'function') {
-      return !!this.options[optionName](value);
-    } else if (optionName in this.options) {
-      return !!this.options[optionName];
-    } else if (binding) {
-      return !!value;
-    }
+    this.$el.toggleClass('hidden_via_binding', this.getBooleanAttributBoundOption('visible') === false);
   }
-};
+});
 
 function template$4(data) {
 var __p = '';
@@ -1463,6 +1528,125 @@ var UrlDisplayView = Marionette.ItemView.extend({
   }
 });
 
+function _classCallCheck(instance, Constructor) {
+  if (!(instance instanceof Constructor)) {
+    throw new TypeError("Cannot call a class as a function");
+  }
+}
+
+function _defineProperties(target, props) {
+  for (var i = 0; i < props.length; i++) {
+    var descriptor = props[i];
+    descriptor.enumerable = descriptor.enumerable || false;
+    descriptor.configurable = true;
+    if ("value" in descriptor) descriptor.writable = true;
+    Object.defineProperty(target, descriptor.key, descriptor);
+  }
+}
+
+function _createClass(Constructor, protoProps, staticProps) {
+  if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+  if (staticProps) _defineProperties(Constructor, staticProps);
+  return Constructor;
+}
+
+/**
+ * Input view for a number.
+ *
+ * See {@link inputView} for further options.
+ *
+ * @param {Object} [options]
+ *
+ * @param {string} [options.locale]
+ * Locale used to fomat and parse numbers.
+ *
+ * @class
+ */
+
+var NumberInputView = Marionette.ItemView.extend({
+  mixins: [inputView],
+  template: function template() {
+    return "\n    <label>\n      <span class=\"name\"></span>\n      <span class=\"inline_help\"></span>\n    </label>\n    <input type=\"text\" dir=\"auto\" />\n  ";
+  },
+  ui: {
+    input: 'input'
+  },
+  events: {
+    'change': 'onChange'
+  },
+  initialize: function initialize() {
+    this.parser = new NumberParser(this.options.locale);
+  },
+  onRender: function onRender() {
+    this.load();
+    this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
+  },
+  onChange: function onChange() {
+    this.save();
+    this.load();
+  },
+  onClose: function onClose() {
+    this.save();
+  },
+  save: function save() {
+    var inputValue = this.ui.input.val();
+    this.model.set(this.options.propertyName, this.parser.parse(inputValue) || 0);
+  },
+  load: function load() {
+    var input = this.ui.input;
+    var value = this.model.get(this.options.propertyName) || 0;
+    input.val(value.toLocaleString(this.options.locale, {
+      useGrouping: false
+    }));
+  },
+  displayValidationError: function displayValidationError(message) {
+    this.$el.addClass('invalid');
+    this.ui.input.attr('title', message);
+  },
+  resetValidationError: function resetValidationError(message) {
+    this.$el.removeClass('invalid');
+    this.ui.input.attr('title', '');
+  }
+});
+
+var NumberParser = /*#__PURE__*/function () {
+  function NumberParser(locale) {
+    _classCallCheck(this, NumberParser);
+
+    var format = new Intl.NumberFormat(locale);
+    var parts = format.formatToParts(12345.6);
+    var numerals = Array.from({
+      length: 10
+    }).map(function (_, i) {
+      return format.format(i);
+    });
+    var index = new Map(numerals.map(function (d, i) {
+      return [d, i];
+    }));
+    this._group = new RegExp("[".concat(parts.find(function (d) {
+      return d.type === "group";
+    }).value, "]"), "g");
+    this._decimal = new RegExp("[".concat(parts.find(function (d) {
+      return d.type === "decimal";
+    }).value, "]"));
+    this._numeral = new RegExp("[".concat(numerals.join(""), "]"), "g");
+
+    this._index = function (d) {
+      return index.get(d);
+    };
+  }
+
+  _createClass(NumberParser, [{
+    key: "parse",
+    value: function parse(string) {
+      string = string.trim().replace(this._group, "").replace(this._decimal, ".").replace(this._numeral, this._index);
+      return string ? +string : NaN;
+    }
+  }]);
+
+  return NumberParser;
+}();
+
 /**
  * Text based input view that can display a placeholder.
  *
@@ -1673,11 +1857,15 @@ var ColorInputView = Marionette.ItemView.extend({
     this.ui.input.minicolors({
       changeDelay: 200,
       change: _.bind(function (color) {
+        this._saving = true;
+
         if (color === this.defaultValue()) {
           this.model.unset(this.options.propertyName);
         } else {
           this.model.set(this.options.propertyName, color);
         }
+
+        this._saving = false;
       }, this)
     });
     this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
@@ -1706,7 +1894,10 @@ var ColorInputView = Marionette.ItemView.extend({
     }
   },
   load: function load() {
-    this.ui.input.minicolors('value', this.model.get(this.options.propertyName) || this.defaultValue());
+    if (!this._saving) {
+      this.ui.input.minicolors('value', this.model.get(this.options.propertyName) || this.defaultValue());
+    }
+
     this.$el.toggleClass('is_default', !this.model.has(this.options.propertyName));
   },
   refreshPicker: function refreshPicker() {
@@ -2289,21 +2480,6 @@ var TextAreaInputView = Marionette.ItemView.extend({
   }
 });
 
-function _defineProperty(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value: value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-
-  return obj;
-}
-
 function template$9(data) {
 var __p = '';
 __p += '<label>\n  <span class="name"></span>\n  <span class="inline_help"></span>\n</label>\n<input type="text" />\n<div class="validation"></div>\n';
@@ -2570,6 +2746,25 @@ return __p
  *
  * @param {Object} [options]
  *
+ * @param {number} [options.defaultValue]
+ *   Defaults value to display if property is not set.
+ *
+ * @param {number} [options.minValue=0]
+ *   Value when dragging slider to the very left.
+ *
+ * @param {number} [options.maxValue=100]
+ *   Value when dragging slider to the very right.
+ *
+ * @param {string} [options.unit="%"]
+ *   Unit to display after value.
+ *
+ * @param {function} [options.displayText]
+ *   Function that receives value and returns custom text to display as value.
+ *
+ * @param {boolean} [options.saveOnSlide]
+ *   Already update the model while dragging the handle - not only after
+ *   handle has been released.
+ *
  * @class
  */
 
@@ -2582,15 +2777,27 @@ var SliderInputView = Marionette.ItemView.extend({
     value: '.value'
   },
   events: {
-    'slidechange': 'save'
+    'slidechange': 'save',
+    'slide': 'handleSlide'
   },
   onRender: function onRender() {
+    var _this = this;
+
     this.ui.widget.slider({
-      animate: 'fast',
-      min: 'minValue' in this.options ? this.options.minValue : 0,
-      max: 'maxValue' in this.options ? this.options.maxValue : 100
+      animate: 'fast'
+    });
+    this.setupAttributeBinding('minValue', function (value) {
+      return _this.updateSliderOption('min', value || 0);
+    });
+    this.setupAttributeBinding('maxValue', function (value) {
+      return _this.updateSliderOption('max', value || 100);
     });
     this.load();
+    this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
+  },
+  updateSliderOption: function updateSliderOption(name, value) {
+    this.ui.widget.slider('option', name, value);
+    this.updateText(this.ui.widget.slider('value'));
   },
   updateDisabled: function updateDisabled(disabled) {
     this.$el.toggleClass('disabled', !!disabled);
@@ -2601,11 +2808,15 @@ var SliderInputView = Marionette.ItemView.extend({
       this.ui.widget.slider('enable');
     }
   },
-  save: function save() {
-    var value = this.ui.widget.slider('option', 'value');
-    var unit = 'unit' in this.options ? this.options.unit : '%';
-    this.ui.value.text(value + unit);
-    this.model.set(this.options.propertyName, value);
+  handleSlide: function handleSlide(event, ui) {
+    this.updateText(ui.value);
+
+    if (this.options.saveOnSlide) {
+      this.save(event, ui);
+    }
+  },
+  save: function save(event, ui) {
+    this.model.set(this.options.propertyName, ui.value);
   },
   load: function load() {
     var value;
@@ -2616,7 +2827,18 @@ var SliderInputView = Marionette.ItemView.extend({
       value = 'defaultValue' in this.options ? this.options.defaultValue : 0;
     }
 
-    this.ui.widget.slider('option', 'value', value);
+    this.ui.widget.slider('option', 'value', this.clampValue(value));
+    this.updateText(value);
+  },
+  clampValue: function clampValue(value) {
+    var min = this.ui.widget.slider('option', 'min');
+    var max = this.ui.widget.slider('option', 'max');
+    return Math.min(max, Math.max(min, value));
+  },
+  updateText: function updateText(value) {
+    var unit = 'unit' in this.options ? this.options.unit : '%';
+    var text = 'displayText' in this.options ? this.options.displayText(value) : value + unit;
+    this.ui.value.text(text);
   }
 });
 
@@ -3010,7 +3232,10 @@ var subviewContainer = {
     return view;
   },
   appendSubview: function appendSubview(view) {
-    return this.$el.append(this.subview(view).el);
+    var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
+        to = _ref.to;
+
+    return (to || this.$el).append(this.subview(view).el);
   },
   onClose: function onClose() {
     if (this.subviews) {
@@ -3067,4 +3292,4 @@ var tooltipContainer = {
   }
 };
 
-export { CheckBoxGroupInputView, CheckBoxInputView, CollectionView, ColorInputView, ConfigurationEditorTabView, ConfigurationEditorView, DeleteRowTableCellView, EnumTableCellView, ExtendedSelectInputView, IconTableCellView, JsonInputView, LabelOnlyView, BaseObject as Object, PresenceTableCellView, ProxyUrlInputView, SelectInputView, SeparatorView, SliderInputView, SortableCollectionView, TableCellView, TableHeaderCellView, TableRowView, TableView, TabsView, TextAreaInputView, TextInputView, TextTableCellView, TooltipView, UrlDisplayView, UrlInputView, cssModulesUtils, i18nUtils, inputView, inputWithPlaceholderText, serverSideValidation, subviewContainer, tooltipContainer, viewWithValidationErrorMessages };
+export { CheckBoxGroupInputView, CheckBoxInputView, CollectionView, ColorInputView, ConfigurationEditorTabView, ConfigurationEditorView, DeleteRowTableCellView, EnumTableCellView, ExtendedSelectInputView, IconTableCellView, JsonInputView, LabelOnlyView, NumberInputView, BaseObject as Object, PresenceTableCellView, ProxyUrlInputView, SelectInputView, SeparatorView, SliderInputView, SortableCollectionView, TableCellView, TableHeaderCellView, TableRowView, TableView, TabsView, TextAreaInputView, TextInputView, TextTableCellView, TooltipView, UrlDisplayView, UrlInputView, attributeBinding, cssModulesUtils, i18nUtils, inputView, inputWithPlaceholderText, serverSideValidation, subviewContainer, tooltipContainer, viewWithValidationErrorMessages };

data/spec/factories/accounts.rb

@@ -2,8 +2,9 @@ FactoryBot.define do
   factory :account, class: Pageflow::Account do
     name { 'Account Name' }
 
-    after(:build) do |account|
-      account.default_theming ||= build(:theming, account: account)
+    after(:build) do |account, evaluator|
+      account.default_site ||=
+        build(:site, account: account, **evaluator.default_site_attributes)
     end
 
     trait(:with_first_paged_entry_template) do
@@ -21,6 +22,8 @@ FactoryBot.define do
 
       with_feature { nil }
       without_feature { nil }
+
+      default_site_attributes { {} }
     end
 
     after(:create) do |account, evaluator|

data/spec/factories/draft_entries.rb

@@ -4,7 +4,7 @@ module Pageflow
       transient do
         title
         account
-        theming
+        site
         type_name { 'paged' }
         revision_attributes { {} }
 
@@ -16,7 +16,7 @@ module Pageflow
         DraftEntry.new(create(:entry,
                               title: title,
                               account: account,
-                              theming: theming,
+                              site: site,
                               type_name: type_name,
                               draft_attributes: revision_attributes,
                               with_feature: with_feature,

data/spec/factories/entries.rb

@@ -10,7 +10,7 @@ module Pageflow
       account
 
       after(:build) do |entry|
-        entry.theming ||= entry.account.default_theming
+        entry.site ||= entry.account.default_site
       end
 
       transient do
@@ -58,7 +58,7 @@ module Pageflow
             evaluator.permalink_attributes[:directory] ||
             build(
               :permalink_directory,
-              theming: entry.theming,
+              site: entry.site,
               path: evaluator.permalink_attributes.fetch(:directory_path, '')
             )
 
@@ -70,18 +70,32 @@ module Pageflow
       end
 
       trait :published do
+        first_published_at { 1.month.ago }
+
         transient do
           published_revision_attributes { {} }
         end
 
         after(:create) do |entry, evaluator|
-          create(:revision, :published, evaluator.published_revision_attributes.merge(entry: entry))
+          create(:revision, :published,
+                 evaluator.published_revision_attributes.merge(entry: entry))
         end
       end
 
       trait :published_with_password do
-        after(:create) do |entry, _evaluator|
-          create(:revision, :published, entry: entry, password_protected: true)
+        first_published_at { 1.month.ago }
+
+        transient do
+          published_revision_attributes { {} }
+        end
+
+        after(:create) do |entry, evaluator|
+          create(:revision,
+                 :published,
+                 evaluator.published_revision_attributes.merge(
+                   entry: entry,
+                   password_protected: true
+                 ))
         end
       end
 

data/spec/factories/entry_templates.rb

@@ -1,7 +1,7 @@
 module Pageflow
   FactoryBot.define do
     factory :entry_template, class: Pageflow::EntryTemplate do
-      account
+      site
       entry_type_name { 'paged' }
       theme_name { 'default' }
     end

data/spec/factories/permalink_directory.rb

@@ -1,6 +1,6 @@
 FactoryBot.define do
   factory :permalink_directory, class: Pageflow::PermalinkDirectory do
-    theming
+    site
     path { '' }
   end
 end

data/spec/factories/published_entries.rb

@@ -4,7 +4,7 @@ module Pageflow
       transient do
         title
         account
-        theming
+        site
         type_name { 'paged' }
         revision_attributes { {} }
         permalink_attributes { nil }
@@ -18,7 +18,7 @@ module Pageflow
                                   :published,
                                   title: title,
                                   account: account,
-                                  theming: theming,
+                                  site: site,
                                   type_name: type_name,
                                   published_revision_attributes: revision_attributes,
                                   permalink_attributes: permalink_attributes,

data/spec/factories/sites.rb

@@ -0,0 +1,12 @@
+module Pageflow
+  FactoryBot.define do
+    factory :site, class: Pageflow::Site do
+      feeds_enabled { true }
+      sitemap_enabled { true }
+
+      after(:build) do |site|
+        site.account ||= build(:account, default_site: site)
+      end
+    end
+  end
+end

data/vendor/assets/javascripts/iscroll.js

@@ -101,7 +101,6 @@ var utils = (function () {
 	me.extend(me, {
 		hasTransform: _transform !== false,
 		hasPerspective: _prefixStyle('perspective') in _elementStyle,
-		hasTouch: 'ontouchstart' in window,
 		hasPointer: navigator.msPointerEnabled,
 		hasTransition: _prefixStyle('transition') in _elementStyle
 	});
@@ -862,12 +861,10 @@ IScroll.prototype = {
 			eventType(target, 'MSPointerUp', this);
 		}
 
-		if ( utils.hasTouch ) {
-			eventType(startEventTarget, 'touchstart', this);
-			eventType(target, 'touchmove', this);
-			eventType(target, 'touchcancel', this);
-			eventType(target, 'touchend', this);
-		}
+		eventType(startEventTarget, 'touchstart', this);
+		eventType(target, 'touchmove', this);
+		eventType(target, 'touchcancel', this);
+		eventType(target, 'touchend', this);
 
 		eventType(this.scroller, 'transitionend', this);
 		eventType(this.scroller, 'webkitTransitionEnd', this);