pageflow 15.2.2 → 15.6.1

data/admins/pageflow/membership.rb

@@ -64,6 +64,18 @@ module Pageflow
                               end)
 
     controller do
+      # We put the `belongs_to` call in the controller block to work
+      # around the issue that ActiveAdmin does not yet support
+      # polymorphic nested resources [1]. This works since the
+      # underlying InheritedResources library does support polymorphic
+      # nesting [2]. As mentioned in the ActiveAdmin issue, we need to
+      # set up routes manually then, though. This is done in
+      # `Pageflow.routes` [3].
+      #
+      # [1] activeadmin/activeadmin#221
+      # [2] https://github.com/activeadmin/inherited_resources#polymorphic-belongs-to
+      # [3] https://github.com/codevise/pageflow/blob/023fdb7c5b3b917bb94f4adafa18a31f8bd9c753/lib/pageflow.rb#L10
+
       belongs_to :entry, parent_class: Pageflow::Entry, polymorphic: true
       belongs_to :account, parent_class: Pageflow::Account, polymorphic: true
       belongs_to :user, parent_class: User, polymorphic: true

data/admins/pageflow/user.rb

@@ -25,8 +25,6 @@ module Pageflow
       column :first_name
       column :last_name
       column :email
-      column :last_sign_in_at
-      column :sign_in_count
       column :suspended?
     end
 
@@ -122,9 +120,11 @@ module Pageflow
 
     collection_action :quota_state do
       @account = Pageflow::Account.find(params[:account_id])
-      authorize!(:add_member_to, @account)
-
-      render(layout: false)
+      if authorized?(:see_user_quota, @account)
+        render(layout: false)
+      else
+        render(partial: 'not_allowed_to_see_user_quota')
+      end
     end
 
     collection_action 'me', title: I18n.t('pageflow.admin.users.account'), method: [:get, :patch] do

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

@@ -85,4 +85,69 @@ jQuery(function($) {
       return $(folder).data('role') === 'all';
     }
   });
+
+  $('.admin_entries form.entry').each(function() {
+    var accountSelect = $('#entry_account_id', this);
+    var entryTypeInput = $('#entry_type_name_input', this);
+    var entryTypeSelect = $('#entry_type_name', this);
+    var entryTypeOptions = $('#entry_type_name option', this);
+
+    function updateEntryTypeOptions() {
+      var selectedAccountId = accountSelect.val();
+      hideAllOptions();
+
+      $.get('/admin/entries/entry_types?account_id=' + selectedAccountId)
+        .done(function(response) {
+          var typeNames = response.map(function(item) {
+            return item.type_name;
+          });
+          updateForm(typeNames);
+          if (currentSelectedUnavailable(typeNames)) {
+            updateSelected(typeNames[0]);
+          }
+          if (response.length < 2) {
+            hideInput();
+          } else {
+            showInput();
+          }
+        });
+    }
+
+    function updateForm(entryTypes) {
+      entryTypes.forEach(showOption);
+    }
+
+    function currentSelectedUnavailable(entryTypes) {
+      var selectedEntryType = entryTypeSelect.children('option:selected').val();
+
+      return !entryTypes.includes(selectedEntryType);
+    }
+
+    function updateSelected(firstAvailable) {
+      entryTypeSelect.val(firstAvailable);
+    }
+
+    function hideInput() {
+      entryTypeInput.hide();
+    }
+
+    function showInput() {
+      entryTypeInput.show();
+    }
+
+    function hideAllOptions() {
+      entryTypeOptions.each(function() {
+        $(this).hide();
+      });
+    }
+
+    function showOption(entryType) {
+      $('#entry_type_name option[value=' + entryType + ']').show();
+    }
+
+    if (entryTypeOptions.length > 1) {
+      accountSelect.on('change', updateEntryTypeOptions);
+      updateEntryTypeOptions();
+    }
+  });
 });

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;
@@ -1120,13 +1140,30 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
    *   A text that will be appended to the translation based inline
    *   text.
    *
-   * @param {boolean} [options.disabled]
-   *   Render input as disabled.
+   * @param {string|string[]} [options.disabledBinding]
+   *   Name of an attribute to control whether the input is disabled. If
+   *   the `disabled` and `disabledBinding` options are not set,
+   *   input will be disabled whenever this attribute has a truthy value.
+   *   When multiple attribute names are passed, the function passed to
+   *   the `disabled` option will receive an array of values in the same
+   *   order.
+   *
+   * @param {function|boolean} [options.disabled]
+   *   Render input as disabled. A Function taking the value of the
+   *  `disabledBinding` attribute as parameter. Input will be disabled
+   *  only if function returns `true`.
+   *
+   * @param {any} [options.disabledBindingValue]
+   *   Input will be disabled whenever the value of the `disabledBinding`
+   *   attribute equals the value of this option.
    *
-   * @param {string} [options.visibleBinding]
+   * @param {string|string[]} [options.visibleBinding]
    *   Name of an attribute to control whether the input is visible. If
    *   the `visible` and `visibleBindingValue` options are not set,
    *   input will be visible whenever this attribute has a truthy value.
+   *   When multiple attribute names are passed, the function passed to
+   *   the `visible` option will receive an array of values in the same
+   *   order.
    *
    * @param {function|boolean} [options.visible]
    *   A Function taking the value of the `visibleBinding` attribute as
@@ -1181,15 +1218,10 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       this.$el.data('labelText', this.labelText());
       this.$el.data('inlineHelpText', this.inlineHelpText());
       this.ui.labelText.text(this.labelText());
-      this.ui.inlineHelp.html(this.inlineHelpText());
-
-      if (!this.inlineHelpText()) {
-        this.ui.inlineHelp.hide();
-      }
-
+      this.updateInlineHelp();
       this.setLabelFor();
-      this.updateDisabled();
-      this.setupVisibleBinding();
+      this.setupAttributeBinding('disabled', this.updateDisabled);
+      this.setupAttributeBinding('visible', this.updateVisible);
     },
 
     /**
@@ -1204,6 +1236,13 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         fallbackPrefix: 'activerecord.attributes'
       }));
     },
+    updateInlineHelp: function updateInlineHelp() {
+      this.ui.inlineHelp.html(this.inlineHelpText());
+
+      if (!this.inlineHelpText()) {
+        this.ui.inlineHelp.hide();
+      }
+    },
 
     /**
      * The inline help text for the form field.
@@ -1214,7 +1253,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         fallbackPrefix: 'pageflow.ui.inline_help'
       });
 
-      if (this.options.disabled) {
+      if (this.isDisabled()) {
         keys = translationKeysWithSuffix(keys, 'disabled');
       }
 
@@ -1230,40 +1269,61 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         this.ui.label.attr('for', id);
       }
     },
+    isDisabled: function isDisabled() {
+      return this.getAttributeBoundOption('disabled');
+    },
     updateDisabled: function updateDisabled() {
+      this.updateInlineHelp();
+
       if (this.ui.input) {
         this.updateDisabledAttribute(this.ui.input);
       }
     },
     updateDisabledAttribute: function updateDisabledAttribute(element) {
-      if (this.options.disabled) {
+      if (this.isDisabled()) {
         element.attr('disabled', true);
       } else {
         element.removeAttr('disabled');
       }
     },
-    setupVisibleBinding: function setupVisibleBinding() {
+    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 (this.options.visibleBinding) {
-        this.listenTo(this.model, 'change:' + this.options.visibleBinding, updateVisible);
-        updateVisible(this.model, this.model.get(this.options.visibleBinding));
+      if (binding) {
+        _.flatten([binding]).forEach(function (attribute) {
+          _this.listenTo(_this.model, 'change:' + attribute, update);
+        });
       }
 
-      function updateVisible(model, value) {
-        view.$el.toggleClass('input-hidden_via_binding', !isVisible(value));
+      update();
+
+      function update() {
+        updateMethod.call(view, view.getAttributeBoundOption(optionName));
       }
+    },
+    getAttributeBoundOption: function getAttributeBoundOption(optionName) {
+      var _this2 = this;
 
-      function isVisible(value) {
-        if ('visibleBindingValue' in view.options) {
-          return value === view.options.visibleBindingValue;
-        } else if (typeof view.options.visible === 'function') {
-          return !!view.options.visible(value);
-        } else if ('visible' in view.options) {
-          return !!view.options.visible;
-        } else {
-          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 !!this.options[optionName](value);
+      } else if (optionName in this.options) {
+        return !!this.options[optionName];
+      } else if (binding) {
+        return !!value;
       }
     }
   };
@@ -1414,11 +1474,14 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
         this.listenTo(this.model, 'change:' + this.options.placeholderBinding, this.updatePlaceholder);
       }
     },
+    updateDisabled: function updateDisabled() {
+      this.updatePlaceholder();
+    },
     updatePlaceholder: function updatePlaceholder() {
       this.ui.input.attr('placeholder', this.placeholderText());
     },
     placeholderText: function placeholderText() {
-      if (!this.options.disabled || !this.options.hidePlaceholderIfDisabled) {
+      if (!this.isDisabled() || !this.options.hidePlaceholderIfDisabled) {
         if (this.options.placeholder) {
           if (typeof this.options.placeholder == 'function') {
             return this.options.placeholder(this.model);
@@ -1429,6 +1492,8 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
           return this.placeholderModelValue();
         }
       }
+
+      return '';
     },
     placeholderModelValue: function placeholderModelValue() {
       return this.options.placeholderModel && this.options.placeholderModel.get(this.options.propertyName);
@@ -1581,12 +1646,22 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       this.updateSettings();
     },
     updateSettings: function updateSettings() {
+      this.resetSwatchesInStoredSettings();
       this.ui.input.minicolors('settings', {
         defaultValue: this.defaultValue(),
         swatches: this.getSwatches()
       });
       this.load();
     },
+    // see https://github.com/claviska/jquery-minicolors/issues/287
+    resetSwatchesInStoredSettings: function resetSwatchesInStoredSettings() {
+      var settings = this.ui.input.data('minicolors-settings');
+
+      if (settings) {
+        delete settings.swatches;
+        this.ui.input.data('minicolors-settings', settings);
+      }
+    },
     load: function load() {
       this.ui.input.minicolors('value', this.model.get(this.options.propertyName) || this.defaultValue());
       this.$el.toggleClass('is_default', !this.model.has(this.options.propertyName));
@@ -1692,6 +1767,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 +1873,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 +1901,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 +2033,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 +2180,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);
@@ -2163,6 +2246,21 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
     }
   });
 
+  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';
@@ -2205,24 +2303,32 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       this.validate();
     },
     onChange: function onChange() {
-      var view = this;
-      this.saveDisplayProperty();
-      this.validate().done(function () {
-        view.save();
+      var _this = this;
+
+      this.validate().then(function () {
+        return _this.save();
+      }, function () {
+        return _this.saveDisplayProperty();
       });
     },
     saveDisplayProperty: function saveDisplayProperty() {
+      this.model.unset(this.options.propertyName, {
+        silent: true
+      });
       this.model.set(this.options.displayPropertyName, this.ui.input.val());
-      this.model.unset(this.options.propertyName);
     },
     save: function save() {
-      var view = this;
-      $.when(this.transformPropertyValue(this.ui.input.val())).then(function (value) {
-        view.model.set(view.options.propertyName, value);
+      var _this2 = this;
+
+      var value = this.ui.input.val();
+      $.when(this.transformPropertyValue(value)).then(function (transformedValue) {
+        var _this2$model$set;
+
+        _this2.model.set((_this2$model$set = {}, _defineProperty(_this2$model$set, _this2.options.displayPropertyName, value), _defineProperty(_this2$model$set, _this2.options.propertyName, transformedValue), _this2$model$set));
       });
     },
     load: function load() {
-      this.ui.input.val(this.model.get(this.options.displayPropertyName));
+      this.ui.input.val(this.model.has(this.options.displayPropertyName) ? this.model.get(this.options.displayPropertyName) : this.model.get(this.options.propertyName));
       this.onLoad();
     },
 
@@ -2431,6 +2537,15 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       });
       this.load();
     },
+    updateDisabled: function updateDisabled(disabled) {
+      this.$el.toggleClass('disabled', !!disabled);
+
+      if (disabled) {
+        this.ui.widget.slider('disable');
+      } else {
+        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 : '%';
@@ -2555,8 +2670,11 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       this.load();
       this.listenTo(this.model, 'change:' + this.options.propertyName, this.load);
     },
+    updateDisabled: function updateDisabled() {
+      this.load();
+    },
     save: function save() {
-      if (!this.options.disabled) {
+      if (!this.isDisabled()) {
         this.model.set(this.options.propertyName, this.ui.input.is(':checked'));
       }
     },
@@ -2566,7 +2684,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
       }
     },
     displayValue: function displayValue() {
-      if (this.options.disabled && this.options.displayUncheckedIfDisabled) {
+      if (this.isDisabled() && this.options.displayUncheckedIfDisabled) {
         return false;
       } else {
         return this.model.get(this.options.propertyName);
@@ -2799,8 +2917,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 +2931,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 +2948,7 @@ this.pageflow._uiGlobalInterop = (function (exports, Marionette, _, $, I18n$1, B
           });
         }
       },
-      'mouseout [data-tooltip]': function mouseoutDataTooltip() {
+      'mouseleave [data-tooltip]': function mouseleaveDataTooltip() {
         this.tooltip.hide();
       }
     },