Merge branch 'master' into feature/#90-retain-mobile-dropdown

Author: gearsdigital

public/jquery.selectric.js

@@ -291,8 +291,11 @@
     /** Activates the plugin */
     activate: function() {
       var _this = this;
+      var hiddenChildren = _this.elements.items.closest(':visible').children(':hidden').addClass(_this.classes.tempshow);
       var originalWidth = _this.$element.width();
 
+      hiddenChildren.removeClass(_this.classes.tempshow);
+
       _this.utils.triggerCallback('BeforeActivate', _this);
 
       _this.elements.outerWrapper.prop('class',
@@ -485,7 +488,7 @@
         value     : $elm.val(),
         className : $elm.prop('class'),
         text      : $elm.html(),
-        slug      : _this.utils.replaceDiacritics($elm.html()),
+        slug      : $.trim(_this.utils.replaceDiacritics($elm.html())),
         selected  : $elm.prop('selected'),
         disabled  : isDisabled
       };

public/jquery.selectric.min.js

@@ -274,8 +274,11 @@
     /** Activates the plugin */
     activate: function() {
       var _this = this;
+      var hiddenChildren = _this.elements.items.closest(':visible').children(':hidden').addClass(_this.classes.tempshow);
       var originalWidth = _this.$element.width();
 
+      hiddenChildren.removeClass(_this.classes.tempshow);
+
       _this.utils.triggerCallback('BeforeActivate', _this);
 
       _this.elements.outerWrapper.prop('class',
@@ -468,7 +471,7 @@
         value     : $elm.val(),
         className : $elm.prop('class'),
         text      : $elm.html(),
-        slug      : _this.utils.replaceDiacritics($elm.html()),
+        slug      : $.trim(_this.utils.replaceDiacritics($elm.html())),
         selected  : $elm.prop('selected'),
         disabled  : isDisabled
       };

src/jquery.selectric.js

@@ -155,6 +155,17 @@ describe('basic suite', function() {
     expect($('.selectric-wrapper').width()).toBe(selectWidth);
   });
 
+  it('should have same width of original <select> even if parent is hidden', function() {
+    loadFixtures('hidden.html');
+    var selectHidden = $('#select-hidden').selectric({
+      inheritOriginalWidth: true
+    });
+    selectHidden.closest('.wrapper').show();
+    var selectWidth = selectHidden.width();
+    selectHidden.closest('.wrapper').hide();
+    expect($('.selectric-wrapper').width()).toBe(selectWidth);
+  });
+
   it('should replace diacritics', function() {
     select.append('<option>áàãéèíìóòõúùñçÿ</option>');
     select.selectric('refresh');

test/basic.spec.js

@@ -0,0 +1,9 @@
+<div style="display: none;" class="wrapper">
+  <select id="select-hidden">
+    <option value="bilberry">Bilberry</option>
+    <option value="blackberry">Blackberry</option>
+    <option value="blackcurrant">Blackcurrant</option>
+    <option value="blueberry">Blueberry</option>
+    <option value="cantaloupe">Cantaloupe</option>
+  </select>
+</div>