pageflow 17.0.5 → 17.1.0

data/package/package.json

@@ -21,12 +21,13 @@
   },
   "scripts": {
     "test": "jest",
-    "lint": "eslint ."
+    "lint": "eslint"
   },
   "dependencies": {
     "backbone-events-standalone": "^0.2.7",
     "classlist.js": "^1.1.20150312",
     "core-js": "^3.4.1",
+    "sortablejs": "^1.15.3",
     "i18n-js": "^3.5.1",
     "postcss-functions": "^3.0.0"
   }

data/package/testHelpers.js

@@ -11,22 +11,18 @@ var Base = Object$1.extend({
     this.$el = $el;
   }
 });
-
 Base.classMethods = function (Constructor) {
   return {
     find: function find(viewOrParentElement) {
       var selector = Constructor.prototype.selector;
       var parentElement = viewOrParentElement.$el || viewOrParentElement;
       var element = parentElement.find(selector);
-
       if (element.length > 1) {
         throw new Error('Selector "' + selector + '" matches multiple elements in view. Expected only one');
       }
-
       if (element.length === 0) {
         throw new Error('Selector "' + selector + '" did not match any elements in view.');
       }
-
       return new Constructor(element);
     },
     findAll: function findAll(viewOrParentElement) {
@@ -45,69 +41,58 @@ Base.classMethods = function (Constructor) {
       var element = elements.filter(function () {
         return predicate($(this));
       });
-
       if (element.length > 1) {
         throw new Error(selectorString + ' matches multiple elements in view. Expected only one');
       }
-
       if (element.length === 0) {
         throw new Error(selectorString + ' did not match any elements in view.');
       }
-
       return new Constructor(element);
     },
     render: function render(view, options) {
       view.render();
-
       if (options && options.appendTo) {
         options.appendTo.append(view.$el);
       }
-
       return new Constructor(view.$el);
     }
   };
 };
-
-Base.extend = function () {
+Base.extend = function /* arguments */
+() {
   var result = Object$1.extend.apply(this, arguments);
-
   _.extend(result, Base.classMethods(result));
-
   return result;
 };
 
 var DropDownButton = Base.extend({
   selector: '.drop_down_button',
   menuItemNames: function menuItemNames() {
-    return this.$el.find('li').map(function () {
+    return this.$el.find('li:not(.is_hidden)').map(function () {
       return $(this).data('name');
     }).get();
   },
   menuItemLabels: function menuItemLabels() {
-    return this.$el.find('li a').map(function () {
+    return this.$el.find('li:not(.is_hidden) a').map(function () {
       return $(this).text();
     }).get();
   },
   selectMenuItemByName: function selectMenuItemByName(name) {
-    var menuItem = this.$el.find('li').filter(function () {
+    var menuItem = this.$el.find('li:not(.is_hidden)').filter(function () {
       return $(this).data('name') == name;
     });
-
     if (!menuItem.length) {
       throw new Error('Could not find menu item with name "' + name + '"');
     }
-
     menuItem.find('a').trigger('click');
   },
   selectMenuItemByLabel: function selectMenuItemByLabel(label) {
-    var menuItemLink = this.$el.find('li a').filter(function () {
+    var menuItemLink = this.$el.find('li:not(.is_hidden) a').filter(function () {
       return $(this).text() == label;
     });
-
     if (!menuItemLink.length) {
       throw new Error('Could not find menu item with label "' + label + '"');
     }
-
     menuItemLink.trigger('click');
   }
 });
@@ -157,7 +142,6 @@ var ThemeItem = Base.extend({
     this.$el.find('.use_theme').trigger('click');
   }
 });
-
 ThemeItem.findByName = function (themeName, options) {
   return this.findBy(function ($el) {
     return $el.data('themeName') === themeName;
@@ -241,9 +225,7 @@ var ColorInput = Base.extend({
   },
   fillIn: function fillIn(value, clock) {
     this._input().val(value);
-
     this._input().trigger('keyup');
-
     clock.tick(500);
   },
   swatches: function swatches() {
@@ -308,7 +290,6 @@ function _objectSpread2(target) {
 var Base$1 = Base.extend({
   selector: '.input'
 });
-
 Base$1.findByPropertyName = function (propertyName, options) {
   return this.findBy(function (el) {
     return el.data('inputPropertyName') === propertyName;
@@ -349,7 +330,6 @@ var SelectInput = Base$1.extend({
 /**
  * Build editor Backbone models for tests.
  */
-
 var factories = {
   /**
    * Build an entry model.
@@ -377,11 +357,9 @@ var factories = {
    */
   entry: function entry(model, attributes) {
     var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
-
     if (typeof model !== 'function') {
       return factories.entry(Entry, model, attributes);
     }
-
     ensureFileTypes(options);
     ensureFilesCollections(options);
     ensureWidgetsCollections(options);
@@ -391,17 +369,14 @@ var factories = {
       storylines: new Backbone.Collection(),
       chapters: new Backbone.Collection()
     }, options));
-
     if (entry.setupFromEntryTypeSeed && options.entryTypeSeed) {
       entry.setupFromEntryTypeSeed(options.entryTypeSeed);
     }
-
     return entry;
   },
   theme: function theme(attributes, options) {
     return new Theme(attributes, options);
   },
-
   /**
    * Construct a file type registry that can be passed to {@link
    * #factoriesentry factories.entry}.
@@ -482,7 +457,6 @@ var factories = {
     fileTypes.setup(fileTypesSetupArray);
     return fileTypes;
   },
-
   /**
   * Shorthand for calling {@link #factoriesfiletypes
   * factories.fileTypes} with a builder function that calls
@@ -580,18 +554,15 @@ var factories = {
   widgetTypes: function widgetTypes(attributesList, beforeSetup) {
     var widgetTypes = new WidgetTypes();
     var attributesListsByRole = {};
-
     _(attributesList).each(function (attributes) {
       attributesListsByRole[attributes.role] = attributesListsByRole[attributes.role] || [];
       attributesListsByRole[attributes.role].push(_.extend({
         translationKey: 'widget_name.' + attributes.name
       }, attributes));
     });
-
     if (beforeSetup) {
       beforeSetup(widgetTypes);
     }
-
     widgetTypes.setup(attributesListsByRole);
     return widgetTypes;
   },
@@ -600,18 +571,15 @@ var factories = {
       router: {
         navigate: function navigate(path, _ref) {
           var trigger = _ref.trigger;
-
           if (trigger) {
             api.trigger('navigate', path);
           }
         }
       }
     });
-
     if (beforeSetup) {
       beforeSetup(api);
     }
-
     api.pageTypes.setup(_.map(api.pageTypes.clientSideConfigs, function (config, name) {
       return {
         name: name,
@@ -624,23 +592,22 @@ var factories = {
     return api;
   }
 };
-
 function ensureFileTypes(options) {
   if (!options.fileTypes) {
     options.fileTypes = new FileTypes();
     options.fileTypes.setup([]);
   }
 }
-
 function ensureFilesCollections(options) {
   if (!options.files) {
     options.files = FilesCollection.createForFileTypes(options.fileTypes, options.filesAttributes);
   }
 }
-
 function ensureWidgetsCollections(options) {
   if (!options.widgets) {
-    options.widgets = new WidgetsCollection(options.widgetsAttributes);
+    options.widgets = new WidgetsCollection(options.widgetsAttributes, {
+      widgetTypes: options.widgetTypes
+    });
   }
 }
 
@@ -655,7 +622,6 @@ function fakeBrowserAgent(name) {
   if (!userAgents[name]) {
     throw new Error("Unknown browser ".concat(name, "."));
   }
-
   return new browser.Agent(userAgents[name]);
 }
 
@@ -673,14 +639,12 @@ var state = window.pageflow || {};
  *   Properties to set on the global state. Functions as values will
  *   be evaluated and the return value will be assigned instead.
  */
-
 var setupGlobals = function setupGlobals(mapping) {
   var globalsBackup;
   beforeEach(function () {
     if (globalsBackup) {
       throw new Error('There can only be one setupGlobals call per test.');
     }
-
     globalsBackup = {};
     setGlobals(mapping);
   });
@@ -688,19 +652,15 @@ var setupGlobals = function setupGlobals(mapping) {
     _.each(mapping, function (_, key) {
       state[key] = globalsBackup[key];
     });
-
     globalsBackup = null;
   });
-
   function setGlobals(mapping) {
     _.each(mapping, function (value, key) {
       globalsBackup[key] = state[key];
       state[key] = typeof value === 'function' ? value.call(this) : value;
     });
-
     return mapping;
   }
-
   return {
     setGlobals: setGlobals
   };
@@ -746,15 +706,12 @@ var setupGlobals = function setupGlobals(mapping) {
  *   });
  * });
  */
-
 function useFakeTranslations(translations) {
   var _ref = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {},
-      multiLocale = _ref.multiLocale;
-
+    multiLocale = _ref.multiLocale;
   var originalTranslations;
   beforeEach(function () {
     originalTranslations = I18n.translations;
-
     if (multiLocale) {
       I18n.translations = keysWithDotsToNestedObjects(translations);
     } else {
@@ -767,17 +724,14 @@ function useFakeTranslations(translations) {
     I18n.translations = originalTranslations;
   });
 }
-
 function keysWithDotsToNestedObjects(translations) {
   return _(translations).reduce(function (result, value, key) {
     var keys = key.split('.');
     var last = keys.pop();
-
     var inner = _(keys).reduce(function (r, key) {
       r[key] = r[key] || {};
       return r[key];
     }, result);
-
     inner[last] = value;
     return result;
   }, {});