active_frontend 14.0.57 → 14.0.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 423d21c42bd7254d7ef43b7834df7f674ca06872
-  data.tar.gz: 936521347d186c01299d1b1e6a813e3ccfef248e
+  metadata.gz: 410ecb7142e9a3940069a50b04e2cc911f4176e9
+  data.tar.gz: 48f6845ad13b66025735d9dffabd96bc7683095d
 SHA512:
-  metadata.gz: ea0fb467e4f7aa89dd3fca2946d2c3a93db520a9a09d31ca05168902c5a42bee470909d1f8e5bc4d8ce9c358a8efe402caa8f87f8cbc36327585dfb8ba910df4
-  data.tar.gz: 53130f6e9f6de5cd46248e4ba476fdcc8fb68297f0f4ab79d5610f03db7eac49a1869d6250164f2fc374b78a91bbdbca364b221361b719c944a48433de712aeb
+  metadata.gz: 52a2cbc83490faa90a04684f1d5c2454a38b2e791e343c9b773204de68b770232bcf98c5d569cd949c8a1af4562dd6ba55cc55d6c9172efffab6e0d66f3f1055
+  data.tar.gz: fd55e040d75bf3f19809eaf32c475bf262e786839ccbd3bfbea4976e6d5d5f497c41b27264b707b64a2b1967eeba3642b6a7e7a5b1c17554c9902086b9867e56

data/lib/active_frontend/version.rb

@@ -1,3 +1,3 @@
 module ActiveFrontend
-  VERSION = '14.0.57'.freeze
+  VERSION = '14.0.58'.freeze
 end

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

@@ -7,7 +7,12 @@
   var Choicepicker = function (element, options) {
     this.$element = $(element);
     this.settings = {
-      options: this.$element.data('options'),
+      choices: this.$element.data('choices'),
+      text: {
+        all: this.$element.data('text-all') || Choicepicker.DEFAULTS.text.all,
+        choiceless: this.$element.data('text-choiceless') || Choicepicker.DEFAULTS.text.choiceless,
+        none: this.$element.data('text-none') || Choicepicker.DEFAULTS.text.none
+      },
       type: this.$element.data('type')
     };
     this.options = $.extend({}, Choicepicker.DEFAULTS, this.settings, options);
@@ -22,15 +27,15 @@
 
   Choicepicker.VERSION = '1.0.0';
   Choicepicker.DEFAULTS = {
-    callback: function (option) {},
+    callback: function (choice) {},
+    choices: [],
+    choiceClass: 'form-align-vertical',
     item: '<li></li>',
     menu: '<ul class="choicepicker dropmenu caret"><span></span></ul>',
-    optionClass: 'form-align-vertical',
-    options: [],
     text: {
       all: 'All',
-      none: 'None',
-      optionless: 'No options available'
+      choiceless: 'No choices available',
+      none: 'None'
     },
     type: 'checkbox'
   };
@@ -38,7 +43,7 @@
   Choicepicker.prototype.constructor = Choicepicker;
 
   Choicepicker.prototype.init = function () {
-    if (!this.hasOptions()) return;
+    if (!this.hasChoices()) return;
 
     this.elementReadOnly();
     this.setWidget();
@@ -54,7 +59,7 @@
   Choicepicker.prototype.clickWidget = function (e) {
     e.stopPropagation();
 
-    if (!this.hasOptions()) return;
+    if (!this.hasChoices()) return;
 
     this.setVal();
   };
@@ -63,7 +68,7 @@
     var _self = this;
     var menu = $(this.options.menu);
 
-    $.each(this.options.options, function (index, hash) {
+    $.each(this.options.choices, function (index, hash) {
       var item = $(_self.options.item);
 
       item.append(_self.optionTemplate(hash))
@@ -145,7 +150,7 @@
     var checkbox = $('<input type="' + type +'" value="' + hash.value + '" name="' + hash.name + '" id="' + selector + '">');
     checkbox.prop('checked', hash.checked);
 
-    var container = $('<div class="form-' + type + ' ' + this.options.optionClass + '">');
+    var container = $('<div class="form-' + type + ' ' + this.options.choiceClass + '">');
     container.append(checkbox);
     container.append(label);
 
@@ -173,23 +178,23 @@
     return label + ' (+' + count + ')';
   };
 
-  Choicepicker.prototype.optionsCount = function () {
-    return Object.keys(this.options.options).length;
+  Choicepicker.prototype.choiceCount = function () {
+    return Object.keys(this.options.choices).length;
   };
 
-  Choicepicker.prototype.hasOptions = function () {
-    return this.optionsCount() !== 0;
+  Choicepicker.prototype.hasChoices = function () {
+    return this.choiceCount() !== 0;
   };
 
   Choicepicker.prototype.setSelectionsLabel = function () {
     var _self = this;
-    var total = this.optionsCount();
+    var total = this.choiceCount();
     var count = 0;
     var label = '';
 
-    if (total === 0) return this.options.text.optionless;
+    if (total === 0) return this.options.text.choiceless;
 
-    $.each(this.options.options, function (index, hash) {
+    $.each(this.options.choices, function (index, hash) {
       if (hash.checked === undefined) {
         hash.checked = false;
       } else {
@@ -247,10 +252,12 @@
 
   $(document)
     .on('ready.bs.choicepicker.data-api', function () {
-      var $this = $(this).find('[data-toggle="choicepicker"]');
-      if ($this.data('choicepicker')) return;
-      Plugin.call($this, $this.data());
-    }).on('focus.bs.choicepicker.data-api click.bs.choicepicker.data-api', function (e) {
+      $('[data-toggle="choicepicker"]').each(function () {
+        var $this = $(this);
+        if ($this.data('choicepicker')) return;
+        Plugin.call($this, $this.data());
+      });
+    }).on('focus.bs.choicepicker.data-api click.bs.choicepicker.data-api', '[data-toggle="choicepicker"]', function (e) {
       var $this = $(this);
       if ($this.data('choicepicker')) return;
       Plugin.call($this, $this.data());

data/vendor/assets/stylesheets/blocks/_form.scss

@@ -492,7 +492,10 @@ textarea {
   input,
   textarea,
   select {
-    &:focus + label {
+    &:focus + label,
+    &:focus + .dropmenu + label,
+    &:focus + .dropdown + label,
+    &:focus + .dropup + label {
       opacity: 1;
       top: 0;
     }
@@ -520,10 +523,6 @@ textarea {
     vertical-align: middle;
   }
 
-  .btn {
-    padding-left: 10px;
-    padding-right: 10px;
-  }
   .form-addon {
     border-style: solid;
     border-width: 1px;

metadata

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