active_frontend 14.0.68 → 14.0.69

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b25f622d68447b81d1a8cb26267c3a9f030ffc6d
-  data.tar.gz: 621772b755be94bd5b7c0e08641067ce0f493b59
+  metadata.gz: 0733efbe467ee1f300a256f64489a898521a045d
+  data.tar.gz: c27e6b9c2796793ac339eff852fc4ffa1dd2a7b2
 SHA512:
-  metadata.gz: 876a37c6c47e09a66ec45a843036169bcc42c091e81271342ee4e45e1534b375e3a9c99e6dbb2be611261fc1e4edfb0726d456705510a4f669cbc1ce37347310
-  data.tar.gz: c6a8b3d24a4c0112376fabb94b0e5ef1505322bba2338e1ef336f65989b7281ed868ffd938502183f28fa78da12a37785e53fca9b6fafb172460812e1eea18e9
+  metadata.gz: 0c11087d00cc9329c686fdc9932f26e38304454f740bb192b2ee13afa4295153166cd44ab0db5819170bc28d79d0d660adf74765eed890d540e1aea5060aaf89
+  data.tar.gz: c3f1156a906b9110e63111be1a23c8b8ae4d279bfd5e443239ca20629313a3e5b23482925a62ec2fc78748e71905a715486ffd22edbb38cfb30402ea2053df0c

data/lib/active_frontend/version.rb

@@ -1,3 +1,3 @@
 module ActiveFrontend
-  VERSION = '14.0.68'.freeze
+  VERSION = '14.0.69'.freeze
 end

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

@@ -8,10 +8,12 @@
     this.$element = $(element);
     this.settings = {
       choices: this.$element.data('choices'),
+      fuzzySearch: this.$element.data('fuzzySearch'),
       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,
+        placeholder: this.$element.data('text-placeholder') || Choicepicker.DEFAULTS.text.placeholder,
         selectAll: this.$element.data('text-select-all') || Choicepicker.DEFAULTS.text.selectAll
       },
       type: this.$element.data('type')
@@ -20,24 +22,28 @@
 
     this.$checkAll = false;
     this.$selector = 'bsChoicepicker-label-' + this.randomNumber() + '-';
+    this.$fuzzyId = 'bsChoicepicker-fuzzy-' + this.randomNumber();
     this.$widget = $(this.initWidget()).on('click', $.proxy(this.clickWidget, this));
 
     this.init();
   };
 
   if (!$.fn.dropdown) throw new Error('Choicepicker requires dropdown.js');
+  if (!$.fn.list) throw new Error('Choicepicker requires list.js');
 
   Choicepicker.VERSION = '1.0.0';
   Choicepicker.DEFAULTS = {
     callback: function (choice) {},
     choices: [],
     choiceClass: 'form-align-vertical',
+    fuzzySearch: true,
     item: '<li></li>',
     menu: '<ul class="choicepicker dropmenu caret"><span></span></ul>',
     text: {
       all: 'All',
       choiceless: 'No choices available',
       none: 'None',
+      placeholder: 'Filter options...',
       selectAll: 'Select all'
     },
     type: 'checkbox'
@@ -72,9 +78,16 @@
     var _self = this;
     var menu = $(this.options.menu);
 
+    if (this.options.fuzzySearch) {
+      menu.attr('data-toggle', 'list')
+        .attr('data-input', '#' + this.$fuzzyId)
+        .find('span')
+        .append(this.fuzzyTemplate());
+    }
+
     if (this.options.type === 'checkbox') {
       menu.find('span')
-        .append(this.titleTemplate());
+        .append(this.allTemplate());
     }
 
     $.each(this.options.choices, function (index, hash) {
@@ -176,7 +189,20 @@
     return $('<label for="' + selector + '">');
   };
 
-  Choicepicker.prototype.titleTemplate = function () {
+  Choicepicker.prototype.fuzzyTemplate = function () {
+    var container = $('<div class="form-input form-size-s">');
+    var textbox = $('<input type="text" placeholder="' + this.options.text.placeholder + '" id="' + this.$fuzzyId + '" autofocus>');
+
+    container.append(textbox);
+
+    var item = $(this.options.item);
+    item.addClass('choicepicker-fuzzy list-skip-filter')
+      .append(container);
+
+    return item;
+  };
+
+  Choicepicker.prototype.allTemplate = function () {
     var selector = this.checkAllSelector();
     var boxLabel = $('<label for="' + selector + '">');
     var textLabel = boxLabel.clone();
@@ -191,7 +217,8 @@
     container.append(boxLabel);
 
     var item = $(this.options.item);
-    item.append(container)
+    item.addClass('list-skip-filter')
+      .append(container)
       .append(textLabel.text(this.options.text.selectAll));
 
     return item;

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

@@ -13,7 +13,7 @@
     this.options = $.extend({}, List.DEFAULTS, this.settings, options);
 
     this.$input = $(this.options.input);
-    this.$lis = this.$element.children();
+    this.$lis = this.listLis();
     this.$len = this.$lis.length;
 
     this.init();
@@ -41,6 +41,7 @@
 
       for (var i = 0; i < _self.$len; i++) {
         var li = $(_self.$lis[i]);
+        if (li.hasClass('list-skip-filter')) { continue; }
 
         if (li.text().toLowerCase().indexOf(filter) >= 0) {
           li.removeClass('hidden');
@@ -51,9 +52,16 @@
       }
 
       if (_self.options.placeholder !== null) {
+        var emptyLi = '<li class="bsListEmpty">' + _self.options.emptyText + '</li>';
         list.find('.bsListEmpty').remove();
 
-        if (visible === 0) list.append('<li class="bsListEmpty">' + _self.options.emptyText + '</li>');
+        if (visible === 0) {
+          if (_self.hasSpan()) {
+            list.find('span').append(emptyLi);
+          } else {
+            list.append(emptyLi);
+          }
+        }
       }
 
       _self.options.callback(visible);
@@ -62,6 +70,20 @@
     });
   };
 
+  List.prototype.hasSpan = function () {
+    return this.$element.children().first().is('span');
+  };
+
+  List.prototype.listLis = function () {
+    var kids = this.$element.children();
+
+    if (this.hasSpan()) {
+      kids = kids.children();
+    }
+
+    return kids;
+  };
+
   // LIST PLUGIN DEFINITION
   // ======================
 

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

@@ -14,8 +14,8 @@
      overflow-x: auto;
 
      > li {
-       border-bottom: 1px solid;
-       border-bottom-color: inherit;
+       border-top: 1px solid;
+       border-top-color: inherit;
        clear: both;
        display: block;
        font-weight: inherit;
@@ -23,7 +23,10 @@
        padding: 16px 20px 14px;
        margin: 0;
 
-       &:last-child { border-bottom: 0; }
+       &:first-child { border-top: 0; }
+
+       &.hidden { display: none; }
+       &.choicepicker-fuzzy { padding: 10px 10px 5px; }
 
        > label {
          font-weight: text-weight(normal);

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_frontend
 version: !ruby/object:Gem::Version
-  version: 14.0.68
+  version: 14.0.69
 platform: ruby
 authors:
 - Juan Gomez
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-13 00:00:00.000000000 Z
+date: 2017-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails