active_frontend 14.0.79 → 14.0.80

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de8a5f38c474a6680953620fc55a1ae331d04b94
-  data.tar.gz: 9a59c2c42213cc8c132e1a7b084c7a1360aa9490
+  metadata.gz: 26f7d6c60198c236566908ce470752f07eafc567
+  data.tar.gz: 88ffb6f56d5f9cf115a007cbae049f983a670f74
 SHA512:
-  metadata.gz: 24a65f0425927e9fb0c9adcbc3eabd44744a2c77ffe12e412ab9965ae89135887bb298b70952bf4d8900f2007ad9ba7753a96f4a30cfb6bc7240d328c646707e
-  data.tar.gz: 272d7b5d4a2db8a836d67df7adf78dfa25fbe5165aff9c2e1ae96f12451456ac709a9902afaacfb62c60afbd150f959fedd03b05cab04666185c4876832c568d
+  metadata.gz: 89129309ff6370cd03149c63ee8c613544a6299369be28fe8f778867a4f5fa88b128af7bd13e2d556b4233eecee9361b1046b1c9c5d4a4f7945e3610e64392ab
+  data.tar.gz: 8749fc2fe027b08be732d735c84029be1fe2cf2bada74d39ff0e6143f294e9b6b89f8fb30586f498a0b9f6605e92d9adbeffe96e8f16220a184ce9938201d39c

data/lib/active_frontend/version.rb

@@ -1,3 +1,3 @@
 module ActiveFrontend
-  VERSION = '14.0.79'.freeze
+  VERSION = '14.0.80'.freeze
 end

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

@@ -9,7 +9,8 @@
     this.settings = {
       fuzzySearch: this.$element.data('fuzzySearch'),
       includePrompt: this.$element.data('includePrompt'),
-      optionClass: this.$element.data('optionClass'),
+      optionHoverClass: this.$element.data('optionHoverClass'),
+      optionSelectedClass: this.$element.data('optionSelectedClass'),
       text: {
         selectless: this.$element.data('text-selectless') || Selectpicker.DEFAULTS.text.selectless,
         placeholder: this.$element.data('text-placeholder') || Selectpicker.DEFAULTS.text.placeholder,
@@ -18,6 +19,8 @@
     };
     this.options = $.extend({}, Selectpicker.DEFAULTS, this.settings, options);
 
+    this.$options = this.getOptions();
+    this.$selected = this.getSelectedOptionVal();
     this.$fuzzyId = 'bsSelectpicker-fuzzy-' + this.randomNumber();
     this.$widget = $(this.initWidget()).on('click', $.proxy(this.clickWidget, this));
 
@@ -33,8 +36,10 @@
     includePrompt: true,
     item: '<li></li>',
     menu: '<ul class="selectpicker dropmenu caret"><span></span></ul>',
-    onSetValCallback: function (select) {},
-    optionClass: 'text-color-hover-blue',
+    onChangeCallback: function (old_value, new_value) {},
+    onSetValCallback: function (value) {},
+    optionHoverClass: 'text-color-hover-blue',
+    optionSelectedClass: 'text-color-blue',
     text: {
       selectless: 'No options available',
       placeholder: 'Filter options...',
@@ -66,7 +71,10 @@
 
     var value = $(e.target).data('val');
 
+    if (value === undefined) return;
+
     this.setVal(value);
+    this.hideWidget();
   };
 
   Selectpicker.prototype.initWidget = function () {
@@ -80,7 +88,7 @@
         .append(this.fuzzyTemplate());
     }
 
-    $.each(this.getOptions(), function (index, hash) {
+    $.each(this.parseOptionsToHash(), function (index, hash) {
       var item = $(_self.options.item);
 
       item.append(_self.optionTemplate(hash));
@@ -110,6 +118,7 @@
   };
 
   Selectpicker.prototype.showWidget = function (e) {
+    this.$selected = this.getSelectedOptionVal();
     this.$container.addClass('open');
 
     var _self = this;
@@ -131,24 +140,35 @@
 
     this.$element.val(value);
     this.options.onSetValCallback(value);
+
+    if (this.$selected !== value.toString()) {
+      this.$container
+        .find('.' + this.options.optionSelectedClass)
+        .removeClass(this.options.optionSelectedClass);
+      this.$container
+        .find("a[data-val='" + value + "']")
+        .addClass(this.options.optionSelectedClass);
+      this.options.onChangeCallback(this.$selected, value);
+    }
   };
 
   Selectpicker.prototype.randomNumber = function () {
     return Math.floor((Math.random() * 100000) + 1);
   };
 
-  Selectpicker.prototype.getOptions = function () {
+  Selectpicker.prototype.parseOptionsToHash = function () {
     var _self = this;
     var array = [];
 
-    this.$element.find('option').each(function() {
+    this.$options.each(function() {
       var option = $(this);
 
       if (!_self.options.includePrompt && option.val() === '') return;
 
       var hash = {
         text: option.text(),
-        value: option.val()
+        value: option.val(),
+        selected: (option.val() === _self.$selected)
       };
 
       if (option.val() === '') {
@@ -161,8 +181,20 @@
     return array;
   };
 
+  Selectpicker.prototype.getOptions = function () {
+    return this.$element.find('option');
+  };
+
+  Selectpicker.prototype.getSelectedOption = function () {
+    return this.$element.find('option:selected');
+  };
+
+  Selectpicker.prototype.getSelectedOptionVal = function () {
+    return this.getSelectedOption().val();
+  };
+
   Selectpicker.prototype.optionCount = function () {
-    return this.getOptions().length;
+    return this.parseOptionsToHash().length;
   };
 
   Selectpicker.prototype.hasSelects = function () {
@@ -186,9 +218,14 @@
     return item;
   };
 
+  Selectpicker.prototype.optionClass = function (hash) {
+    return this.options.optionHoverClass +
+      (hash.selected ? (' ' + this.options.optionSelectedClass) : '');
+  };
+
   Selectpicker.prototype.optionTemplate = function (hash) {
     return '<a href="#" class="' +
-             this.options.optionClass +
+             this.optionClass(hash) +
              '" data-val="' +
              hash.value +
              '">' +

metadata

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