active_frontend 14.0.17 → 14.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 172b12bf5f617882455d02532dc3026ef2e38d4a
-  data.tar.gz: 6d351cb2a3f005c22a585568a927b8cbe9ea9306
+  metadata.gz: 908fca1eee6f9052c96127456b8c558cc0db4ba4
+  data.tar.gz: 47b54d7cf89ca24622d1b45ea522719c50ed0692
 SHA512:
-  metadata.gz: 10b8945f842e161d1e4aeb03e206c17546111d5692894ea33e9aacfb7b28806bc5bae30ad69c2b50ca86429b4206ce5a490073cc5a4387ec62722c1812b28e8b
-  data.tar.gz: 6254c70bb0b8e61c45eb7237b8add53b004595d3c37b520f69ce67f86570cb45f686aa587902d6127a9577bab6a656a28a898f82465dd7af12ff6cb0639308dd
+  metadata.gz: 1ae1d482f796d7f8df937b8d00564329557cc4e244b55a94377a847a0e5642bc293bcb57c452c4cd73612f39c7463e1507bd62c2302fb7b4ebe264f19df59a43
+  data.tar.gz: 14a4bbe94ca225585a63d6f35ffd8cec8ed64c6642da731f95671bcc9674af71989f839d4dee021bb6fbad3aadc95aef0d1344a0a0fceb093f4e67f319b3f261

data/lib/active_frontend/version.rb

@@ -1,3 +1,3 @@
 module ActiveFrontend
-  VERSION = '14.0.17'.freeze
+  VERSION = '14.0.18'.freeze
 end

data/vendor/assets/javascripts/base/_affirm.js

@@ -7,16 +7,24 @@
   var Affirm = function (element, options) {
     this.$element = $(element);
     this.settings = {
-      title: this.$element.data('title'),
-      offset: this.$element.data('offset'),
-      removeClass: this.$element.data('remove-class')
+      btnClass: {
+        cancel: this.$element.data('btn-class-cancel') || Affirm.DEFAULTS.btnClass.cancel,
+        confirm: this.$element.data('btn-class-confirm') || Affirm.DEFAULTS.btnClass.confirm
+      },
+      format: this.$element.data('format'),
+      text: {
+        cancel: this.$element.data('text-cancel') || Affirm.DEFAULTS.text.cancel,
+        confirm: this.$element.data('text-confirm') || Affirm.DEFAULTS.text.confirm
+      },
+      title: this.$element.data('title')
     };
-    this.options = $.extend({}, Affirm.DEFAULTS, options);
+    this.options = $.extend({}, Affirm.DEFAULTS, this.settings, options);
 
     this.init();
   };
 
   if (!$.fn.modal) throw new Error('Affirm requires modal.js');
+  if (!$.fn.popover) throw new Error('Affirm requires popover.js');
 
   Affirm.VERSION = '1.0.0';
   Affirm.DEFAULTS = {
@@ -24,14 +32,12 @@
       cancel: 'btn margin-size-right-xs',
       confirm: 'btn btn-color-red'
     },
-    modalClass: 'modal fade',
-    modalId: 'bsAffirmModal',
     format: 'modal',
     text: {
       cancel: 'No, Cancel',
       confirm: 'Yes, Confirm'
     },
-    title: 'Are you 100% sure about this?'
+    title: 'Are you sure about this?'
   };
 
   Affirm.prototype.constructor = Affirm;
@@ -39,19 +45,23 @@
   Affirm.prototype.init = function () {
     var _self = this;
     var body = $('body');
-    var modalId = '#' + this.options.modalId;
 
-    this.$element.click(function () {
-      $(modalId).remove();
-      body.append(_self.modalTemplate());
-      $(modalId).modal('show');
+    this.$element.click(function (e) {
+      e.stopPropagation();
+      e.preventDefault();
+
+      _self.displayFormat();
 
       return false;
     });
 
-    body.on('click', '[data-affirm-toggle="confirm"]', function () {
-      $(modalId).modal('hide');
-    });
+    $('body')
+      .on('click', '[data-affirm-toggle="cancel"]', function () {
+        _self.cancelFormat();
+      })
+      .on('click', '[data-affirm-toggle="confirm"]', function () {
+        _self.confirmFormat();
+      });
   };
 
   Affirm.prototype.cancelBtn = function () {
@@ -85,9 +95,8 @@
     var footer = $('<div class="modal-footer text-align-right">')
       .append(this.cancelBtn())
       .append(this.confirmBtn());
-    var modal = $('<div role="modal">')
-      .addClass(this.options.modalClass)
-      .attr('id', this.options.modalId)
+    var modal = $('<div class="modal fade" role="modal">')
+      .attr('id', 'bsAffirmModal')
       .append(header)
       .append(body)
       .append(footer);
@@ -95,6 +104,67 @@
     return modal;
   };
 
+  Affirm.prototype.displayModal = function () {
+    var modalId = '#bsAffirmModal';
+
+    $(modalId).remove();
+    $('body').append(this.modalTemplate());
+    $(modalId).modal('show');
+  };
+
+  Affirm.prototype.popoverTemplate = function () {
+    var cancelBtn = this.cancelBtn()
+      .addClass('btn-size-s');
+    var confirmBtn = this.confirmBtn()
+      .addClass('btn-size-s');
+    var navigation = $('<div class="popover-nav text-align-center row">')
+      .append(cancelBtn)
+      .append(confirmBtn);
+    var popover = $('<div class="popover" role="tooltip">')
+      .append('<div class="arrow"></div>')
+      .append('<strong class="popover-title"></strong>')
+      .append('<div class="popover-content"></div>')
+      .append(navigation);
+
+    return popover;
+  };
+
+  Affirm.prototype.displayPopover = function () {
+    $('.popover').remove();
+
+    this.$element.popover({
+      container: false,
+      content: this.$element.attr('data-affirm'),
+      html: true,
+      placement: 'top',
+      title: this.options.title,
+      template: this.popoverTemplate(),
+      trigger: 'manual'
+    });
+
+    this.$element.popover('show');
+  };
+
+  Affirm.prototype.displayFormat = function () {
+    if (this.options.format === 'popover') {
+      this.displayPopover();
+    } else {
+      this.displayModal();
+    }
+  };
+
+  Affirm.prototype.cancelFormat = function () {
+    if (this.options.format === 'popover') this.$element.popover('hide');
+  };
+
+  Affirm.prototype.confirmFormat = function () {
+    if (this.options.format === 'popover') {
+      this.$element.popover('hide');
+    } else {
+      $('#bsAffirmModal').modal('show');
+    }
+  };
+
   // AFFIRM PLUGIN DEFINITION
   // ========================
 

data/vendor/assets/javascripts/base/_animation.js

@@ -49,9 +49,9 @@
 
     element.removeClass(animation)
       .addClass(animation)
-      .on(Animation.TRANSITION_END, function (event) {
-        event.stopPropagation();
-        event.preventDefault();
+      .on(Animation.TRANSITION_END, function (e) {
+        e.stopPropagation();
+        e.preventDefault();
 
         if (infinite !== true) element.removeClass(animation);
         if (hide === true) element.addClass('hidden');

data/vendor/assets/stylesheets/components/_nav_and_tab.scss

@@ -197,7 +197,7 @@
 
     > a {
       border-bottom: 2px solid color(transparent);
-      padding-bottom: 13px;
+      padding-bottom: 15px;
 
       &:hover,
       &:active,
@@ -217,6 +217,14 @@
       }
     }
   }
+
+  > .btn,
+  > .btn-group {
+    margin-top: -12px;
+
+    &.pull-left,
+    &.pull-right { margin-top: -7px; }
+  }
 }
 .nav-stacked > li {
   float: none;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_frontend
 version: !ruby/object:Gem::Version
-  version: 14.0.17
+  version: 14.0.18
 platform: ruby
 authors:
 - Juan Gomez