pageflow 15.2.2 → 15.3.0

data/app/assets/javascripts/pageflow/admin/users.js

@@ -8,7 +8,7 @@ jQuery(function($) {
       var selectedAccountId = accountSelect.val();
 
       $.get('/admin/users/quota_state?account_id=' + selectedAccountId)
-        .success(function(html) {
+        .done(function(html) {
           quotaStateContainer.html(html);
           updateForm();
         });

data/app/assets/javascripts/pageflow/asset_urls.js.erb

@@ -1,3 +1,4 @@
+var pageflow = window.pageflow || {};
 pageflow.assetUrls = {
   unmuteSound: '<%= asset_path("pageflow/unmute.mp3") %>',
   largeBandwidthProbe: '<%= Rails.env.test? ? asset_path("bandwidth_probe_large.png") : "//#{File.join(Pageflow.config.zencoder_options[:s3_host_alias], "bandwidth_probe_large.png")}" %>',

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

@@ -1,12 +0,0 @@
-// base JavaScript file for Pageflow.
-// This file is meant to hold code we develop.
-// And vendor code that changes a lot.
-
-//= require polyfills/bind
-
-//= require ./videojs
-
-//= require ./dist/frontend
-//= require ./dist/react-client
-
-//= require ./asset_urls

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

@@ -1,7 +1,3 @@
-// Files in the dist folder are generated by Webpack in the
-// packages/pageflow-react directory.
+// Deprecation: File moved to pageflow_paged
 
-//= require_self
-//= require pageflow/dist/react-server
-
-var PAGEFLOW_EDITOR = false;
+//= require pageflow_paged/components

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

@@ -158,10 +158,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   }
 
   function _iterableToArrayLimit(arr, i) {
-    if (!(Symbol.iterator in Object(arr) || Object.prototype.toString.call(arr) === "[object Arguments]")) {
-      return;
-    }
-
+    if (typeof Symbol === "undefined" || !(Symbol.iterator in Object(arr))) return;
     var _arr = [];
     var _n = true;
     var _d = false;
@@ -187,12 +184,31 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     return _arr;
   }
 
+  function _arrayLikeToArray(arr, len) {
+    if (len == null || len > arr.length) len = arr.length;
+
+    for (var i = 0, arr2 = new Array(len); i < len; i++) {
+      arr2[i] = arr[i];
+    }
+
+    return arr2;
+  }
+
+  function _unsupportedIterableToArray(o, minLen) {
+    if (!o) return;
+    if (typeof o === "string") return _arrayLikeToArray(o, minLen);
+    var n = Object.prototype.toString.call(o).slice(8, -1);
+    if (n === "Object" && o.constructor) n = o.constructor.name;
+    if (n === "Map" || n === "Set") return Array.from(n);
+    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen);
+  }
+
   function _nonIterableRest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance");
+    throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
   }
 
   function _slicedToArray(arr, i) {
-    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _nonIterableRest();
+    return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest();
   }
 
   /**
@@ -274,7 +290,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
    *         <button class=${styles.addButton}></button>
    *       `,
    *
-   *       events: cssModulesUtils.ui(styles, {
+   *       events: cssModulesUtils.events(styles, {
    *         'click addButton': () => console.log('clicked add button');
    *       })
    *     });
@@ -1009,10 +1025,14 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         this.ui.label.text(text);
         this.$el.toggleClass('align_bottom_right', options.align === 'bottom right');
         this.$el.toggleClass('align_bottom_left', options.align === 'bottom left');
+        this.$el.toggleClass('align_top_center', options.align === 'top center');
 
         if (options.align === 'bottom right' || options.align === 'bottom left') {
           offsetTop = 10;
           offsetLeft = 0;
+        } else if (options.align === 'top center') {
+          offsetTop = -10;
+          offsetLeft = 0;
         } else {
           offsetTop = -17;
           offsetLeft = 10;
@@ -1692,6 +1712,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
    *   value of the `placeholderModel` occurs whenever the attribute is
    *   blank.
    *
+   * @param {function} [options.optionDisabled]
+   *   Receives value and has to return boolean indicating whether
+   *   option is disabled.
+   *
    * @class
    */
 
@@ -1794,6 +1818,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         option.value = value;
         option.text = this.options.texts[index];
 
+        if (this.options.optionDisabled && this.options.optionDisabled(value)) {
+          option.setAttribute('disabled', true);
+        }
+
         if (group) {
           option.setAttribute('data-group', group);
           this.findOrCreateOptGroup(group).append(option);
@@ -1818,10 +1846,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       if (!this.isClosed) {
         var value = this.model.get(this.options.propertyName);
 
-        if (this.model.has(this.options.propertyName) && this.ui.select.find('option[value="' + value + '"]').length) {
+        if (this.model.has(this.options.propertyName) && this.ui.select.find('option[value="' + value + '"]:not([disabled])').length) {
           this.ui.select.val(value);
         } else {
-          this.ui.select.val(this.ui.select.find('option:first').val());
+          this.ui.select.val(this.ui.select.find('option:not([disabled]):first').val());
         }
       }
     }
@@ -1950,7 +1978,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.open_in_new_tab') )) == null ? '' : __t) +
   '\n        </label>\n        <span class="inline_help">\n          ' +
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.open_in_new_tab_help') )) == null ? '' : __t) +
-  '\n        </span>\n      </div>\n    </div>\n    <div class="fragment_link_panel">\n      <!-- LinkInputView is inserted here -->\n    </div>\n\n    <!-- wysihtml5 does not handle hidden fields correctly -->\n    <div class="internal">\n      <input type="text" data-wysihtml5-dialog-field="href" class="current_url" value="http://">\n      <input type="text" data-wysihtml5-dialog-field="target" class="current_target" value="_blank">\n    </div>\n\n    <a class="button" data-wysihtml5-dialog-action="save">\n      ' +
+  '\n        </span>\n      </div>\n    </div>\n    <div class="fragment_link_panel">\n      <!-- LinkInputView is inserted here -->\n    </div>\n\n    <!-- wysihtml5 does not handle hidden fields correctly -->\n    <div class="internal">\n      <input type="text" data-wysihtml5-dialog-field="href" class="current_url" value="">\n      <input type="text" data-wysihtml5-dialog-field="target" class="current_target" value="_blank">\n    </div>\n\n    <a class="button" data-wysihtml5-dialog-action="save">\n      ' +
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.save') )) == null ? '' : __t) +
   '\n    </a>\n    <a class="button" data-wysihtml5-dialog-action="cancel">\n      ' +
   ((__t = ( I18n.t('pageflow.ui.templates.inputs.text_area_input.cancel') )) == null ? '' : __t) +
@@ -2097,7 +2125,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         var currentUrl = this.ui.urlInput.val();
 
         if (currentUrl.startsWith('#')) {
-          this.ui.displayUrlInput.val('http://');
+          this.ui.displayUrlInput.val('');
           this.ui.openInNewTabCheckBox.prop('checked', true);
         } else {
           this.ui.displayUrlInput.val(currentUrl);
@@ -2799,8 +2827,8 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     events: {
       'mouseover [data-tooltip]': function mouseoverDataTooltip(event) {
         if (!this.tooltip.visible) {
-          var target = $(event.target);
-          var key = target.data('tooltip');
+          var target = $(event.currentTarget);
+          var key = target.attr('data-tooltip');
           var position;
 
           if (target.data('tooltipAlign') === 'bottom left') {
@@ -2813,6 +2841,11 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
               left: target.position().left + target.outerWidth(),
               top: target.position().top + target.outerHeight()
             };
+          } else if (target.data('tooltipAlign') === 'top center') {
+            position = {
+              left: target.position().left + target.outerWidth() / 2,
+              top: target.position().top + 2
+            };
           } else {
             position = {
               left: target.position().left + target.outerWidth(),
@@ -2825,7 +2858,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
           });
         }
       },
-      'mouseout [data-tooltip]': function mouseoutDataTooltip() {
+      'mouseleave [data-tooltip]': function mouseleaveDataTooltip() {
         this.tooltip.hide();
       }
     },

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

@@ -2,15 +2,18 @@
 // This file is meant to hold code we don't develop and/or rarely change.
 // It means this asset will stay cached for much longer.
 
-//= require i18n
-//= require jquery
-//= require jquery-ui/widget
-//= require jquery_ujs
-//= require jquery.fullscreen
-//= require jquery.placeholder
+// = require polyfills/bind
+// = require ./videojs
+// = require ./asset_urls
 
-//= require iscroll
-//= require audio5.min
+// = require i18n
+// = require jquery
+// = require jquery-ui/widget
+// = require jquery_ujs
+// = require jquery.fullscreen
+// = require jquery.placeholder
 
-//= require react
-//= require backbone-rails
+// = require iscroll
+// = require audio5.min
+
+// = require backbone-rails

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

@@ -18,13 +18,6 @@ body {
   -ms-touch-action: none;
 }
 
-.ios7.ipad body {
-  @media screen and (orientation: landscape) {
-    position: fixed;
-    margin-top: 0px;
-  }
-}
-
 body.js, .js #outer_wrapper {
   overflow: hidden;
 }

data/app/assets/stylesheets/pageflow/editor/base.scss

@@ -1,5 +1,7 @@
 @import "bourbon";
 
+@import "pageflow/fonts";
+
 @import "pageflow/jquery_ui";
 @import "pageflow/ui";
 @import "pageflow/animations";

data/app/assets/stylesheets/pageflow/editor/composables.scss

@@ -4,6 +4,10 @@
 
 // See entry_type/scrolled/package/src/editor/buttons.module.css
 
-.icon_button {
+.primary_icon_button {
   @include icon-button;
 }
+
+.secondary_icon_button {
+  @include icon-button(#888);
+}

data/app/assets/stylesheets/pageflow/editor/emulation_mode_button.scss

@@ -1,78 +1,67 @@
 .emulation_mode_button {
-  @include background-icon-right($color: #444, $font-size: 16px, $top: 4px);
-  @include up-open-icon;
+  position: relative;
   float: left;
-  height: 25px;
-  width: 100px;
+  cursor: pointer;
 
-  &-menu {
-    background-color: #fff;
-    border: solid 1px #aaa;
-    padding: 1px;
-    position: absolute;
-    bottom: 1px;
-    left: 1px;
-    visibility: hidden;
-    width: 200px;
-    z-index: 1;
+  &-wrapper {
+    width: 110px;
+    height: 30px;
   }
 
-  &-menu_header {
-    margin: 3px 6px;
+  &-desktop_icon,
+  &-phone_icon {
+    @include background-icon-center($color: #444, $font-size: 16px);
+    width: 40px;
+    height: 100%;
   }
 
-  &:hover .emulation_mode_button-menu {
-    visibility: visible;
+  &-desktop_icon {
+    @include monitor-icon;
+    float: left;
   }
 
-  &-display {
-    @include background-icon-center($color: #444, $font-size: 16px, $left: 15px);
-    display: none;
-    padding: 5px 10px 5px 30px;
-
-    &.active {
-      display: block;
-    }
+  &-phone_icon {
+    @include mobile-icon;
+    float: right;
   }
 
-  &-menu_item {
-    @include background-icon-center($color: #444, $font-size: 16px, $left: 15px, $top: 15px);
+  &-track,
+  &-thumb {
+    position: absolute;
+    background-color: #1976d2;
   }
 
-  &-menu_link {
-    padding: 7px 35px 7px 35px;
-    display: block;
-
-    &:hover {
-      background-color: #eee;
-    }
+  &-track {
+    top: 8px;
+    left: 40px;
+    border-radius: 7px;
+    opacity: 0.5;
+    width: 34px;
+    height: 14px;
   }
 
-  .active .emulation_mode_button-menu_link {
-    @include background-icon-right($color: #444, $font-size: 12px, $right: 15px, $top: 9px);
-    @include fa-check-icon;
-    pointer-events: none;
+  &-thumb {
+    top: 5px;
+    left: 37px;
+    width: 20px;
+    height: 20px;
+    border-radius: 50%;
+    box-shadow: 0 2px 1px -1px rgba(0, 0, 0, 0.2), 0 1px 1px 0 rgba(0, 0, 0, 0.14), 0 1px 3px 0 rgba(0, 0, 0, 0.12);
+    transition: transform 150ms cubic-bezier(0.4, 0, 0.2, 1) 0ms;
   }
 
-  &-disabled_hint {
-    display: none;
-    font-size: 10px;
+  &.active .emulation_mode_button-thumb {
+    transform: translateX(20px);
   }
 
-  .disabled {
-    pointer-events: none;
-    opacity: 0.3;
-
-    .emulation_mode_button-disabled_hint {
-      display: block;
+  &.disabled {
+    .emulation_mode_button-wrapper {
+      opacity: 0.4;
     }
-  }
 
-  &-phone {
-    @include mobile-icon;
-  }
-
-  &-desktop {
-    @include monitor-icon;
+    .emulation_mode_button-track,
+    .emulation_mode_button-thumb {
+      background-color: #000;
+    }
   }
 }

data/app/assets/stylesheets/pageflow/editor/help.scss

@@ -158,10 +158,10 @@
 }
 
 .editor .help_button {
-  @include background-icon-right($color: #a0c4e0, $font-size: 16px, $right: 5px, $top: 5px);
+  @include background-icon-right($color: #a0c4e0, $font-size: 16px, $right: 5px, $top: 7px);
   @include help-circled-icon;
 
-  padding: 5px 30px 0 5px;
+  padding: 7px 30px 0 5px;
   float: right;
   height: 20px;
   cursor: pointer;

data/app/assets/stylesheets/pageflow/ui/tooltip.scss

@@ -1,10 +1,9 @@
 .tooltip {
-  $background-color: rgba(0, 0, 0, 0.7);
+  $background-color: rgba(0, 0, 0, 0.9);
 
   position: absolute;
   z-index: 10001;
   top: 40px;
-  left: 400px;
   max-width: 70%;
   padding: 10px 15px;
   color: #fff;
@@ -46,6 +45,21 @@
     }
   }
 
+  &.align_top_center {
+    transform: translate(-50%, -100%);
+
+    &:after {
+      border-top: solid 10px $background-color;
+      border-right: solid 10px transparent;
+      border-bottom: solid 10px transparent;
+      border-left: solid 10px transparent;
+
+      top: 100%;
+      left: 50%;
+      transform: translateX(-50%);
+    }
+  }
+
   &.align_bottom_right {
     @include transform(translateX(-100%));
 
@@ -54,4 +68,4 @@
       left: auto;
     }
   }
-}
+}

data/app/helpers/pageflow/admin/entries_helper.rb

@@ -18,6 +18,22 @@ module Pageflow
           I18n.t(state, scope: 'activerecord.values.pageflow/entry.publication_states')
         end
       end
+
+      def entry_type_collection
+        entry_type_collection_for_config(Pageflow.config)
+      end
+
+      def entry_type_collection_for_account(target)
+        entry_type_collection_for_config(Pageflow.config_for(target))
+      end
+
+      private
+
+      def entry_type_collection_for_config(config)
+        config.entry_types.map(&:name).index_by do |type|
+          I18n.t(type, scope: 'activerecord.values.pageflow/entry.type_names')
+        end
+      end
     end
   end
 end