Fix #49

Author: lcdsantos

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "jquery-selectric",
   "description": "Fast, simple and light jQuery plugin to customize HTML selects",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "keywords": [
     "select",
     "selectbox",

dist/jquery.selectric.js

@@ -9,7 +9,7 @@
  *    /,'
  *   /'
  *
- * Selectric Ϟ v1.8.3 (2014-09-22) - http://lcdsantos.github.io/jQuery-Selectric/
+ * Selectric Ϟ v1.8.4 (2014-09-23) - http://lcdsantos.github.io/jQuery-Selectric/
  *
  * Copyright (c) 2014 Leonardo Santos; Dual licensed: MIT/GPL
  *
@@ -163,8 +163,6 @@
           if ( _this.options.inheritOriginalWidth && originalWidth > 0 )
             $outerWrapper.width(originalWidth);
 
-          isEnabled = true;
-
           _populate();
         }
 
@@ -204,18 +202,23 @@
             $label.html(_this.items[currValue].text);
           }
 
-          $wrapper.add($original, $outerWrapper, $input).off(bindSufix);
+          $wrapper.add($original).add($outerWrapper).add($input).off(bindSufix);
 
           $outerWrapper.prop('class', [_this.classes.wrapper, $original.prop('class').replace(/\S+/g, pluginName + '-$&'), _this.options.responsive ? _this.classes.responsive : ''].join(' '));
 
           if ( !$original.prop('disabled') ){
+            isEnabled = true;
+
             // Not disabled, so... Removing disabled class and bind hover
-            $outerWrapper.removeClass(_this.classes.disabled).on('mouseenter' + bindSufix + ' mouseleave' + bindSufix, function(){
+            $outerWrapper.removeClass(_this.classes.disabled).on('mouseenter' + bindSufix + ' mouseleave' + bindSufix, function(e){
               $(this).toggleClass(_this.classes.hover);
-            });
 
-            // Click on label and :focus on original select will open the options box
-            _this.options.openOnHover && $wrapper.on('mouseenter' + bindSufix, _open);
+              // Delay close effect when openOnHover is true
+              if ( _this.options.openOnHover ){
+                clearTimeout(_this.closeTimer);
+                e.type == 'mouseleave' ? _this.closeTimer = setTimeout(_close, 500) : _open();
+              }
+            });
 
             // Toggle open/close
             $wrapper.on('click' + bindSufix, function(e){
@@ -382,14 +385,6 @@
               });
             }
 
-            // Delay close effect when openOnHover is true
-            if ( _this.options.openOnHover ){
-              clearTimeout(_this.closeTimer);
-              $outerWrapper.one('mouseleave' + bindSufix, function(){
-                _this.closeTimer = setTimeout(_close, 500);
-              });
-            }
-
             // Toggle options box visibility
             $outerWrapper.addClass(_this.classes.open);
             _detectItemVisibility(selected);

dist/jquery.selectric.min.js

@@ -5,9 +5,8 @@ var gulp   = require('gulp'),
     bump   = require('gulp-bump'),
     prefix = require('gulp-autoprefixer');
 
-var pkg = require('./package.json');
-
-gulp.task('js', function(){
+gulp.task('js', ['bump'], function(){
+  var pkg = require('./package.json');
   var banner = [
     '/*!',
     ' *         ,/',
@@ -32,7 +31,8 @@ gulp.task('js', function(){
     .pipe(gulp.dest('./dist'));
 });
 
-gulp.task('js-min', function(){
+gulp.task('js-min', ['bump'], function(){
+  var pkg = require('./package.json');
   gulp.src('src/jquery.selectric.js')
     .pipe(uglify())
     .pipe(header('/*! Selectric ϟ v<%= pkg.version %> (<%= new Date().toJSON().slice(0,10) %>) - git.io/tjl9sQ - Copyright (c) <%= new Date().getFullYear() %> Leonardo Santos - Dual licensed: MIT/GPL */\n', { pkg: pkg }))
@@ -109,11 +109,13 @@ gulp.task('bump', function(){
   var gutil = require('gulp-util'),
       newVersion = gutil.env.bump || pkg.version;
 
-  gulp.src(['./package.json', './bower.json', './selectric.jquery.json'])
+  var stream = gulp.src(['./package.json', './bower.json', './selectric.jquery.json'])
     .pipe(bump({
       version: newVersion
     }))
     .pipe(gulp.dest('./'));
+
+  return stream;
 });
 
 gulp.task('default', ['bump', 'js', 'js-min', 'css']);

gulpfile.js

@@ -708,11 +708,11 @@ <h2>Demo</h2>
 	$(function(){
 		$('select, .select').selectric();
 
-		/*$('.customOptions').selectric({
+		$('.customOptions').selectric({
 			optionsItemBuilder: function(itemData, element, index){
 				return element.val().length ? '<span class="ico ico-' + element.val() +  '"></span>' + itemData.text : itemData.text;
 			}
-		});*/
+		});
 	});
 </script>
 </body>

index.html

@@ -1,6 +1,6 @@
 {
   "name": "jquery-selectric",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "repository": {
     "type": "git",
     "url": "https://github.com/lcdsantos/jQuery-Selectric.git"

package.json

@@ -1,6 +1,6 @@
 {
   "name": "selectric",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "title": "jQuery Selectric",
   "author": {
     "name": "Leonardo Santos",

selectric.jquery.json

@@ -146,8 +146,6 @@
           if ( _this.options.inheritOriginalWidth && originalWidth > 0 )
             $outerWrapper.width(originalWidth);
 
-          isEnabled = true;
-
           _populate();
         }
 
@@ -187,18 +185,23 @@
             $label.html(_this.items[currValue].text);
           }
 
-          $wrapper.add($original, $outerWrapper, $input).off(bindSufix);
+          $wrapper.add($original).add($outerWrapper).add($input).off(bindSufix);
 
           $outerWrapper.prop('class', [_this.classes.wrapper, $original.prop('class').replace(/\S+/g, pluginName + '-$&'), _this.options.responsive ? _this.classes.responsive : ''].join(' '));
 
           if ( !$original.prop('disabled') ){
+            isEnabled = true;
+
             // Not disabled, so... Removing disabled class and bind hover
-            $outerWrapper.removeClass(_this.classes.disabled).on('mouseenter' + bindSufix + ' mouseleave' + bindSufix, function(){
+            $outerWrapper.removeClass(_this.classes.disabled).on('mouseenter' + bindSufix + ' mouseleave' + bindSufix, function(e){
               $(this).toggleClass(_this.classes.hover);
-            });
 
-            // Click on label and :focus on original select will open the options box
-            _this.options.openOnHover && $wrapper.on('mouseenter' + bindSufix, _open);
+              // Delay close effect when openOnHover is true
+              if ( _this.options.openOnHover ){
+                clearTimeout(_this.closeTimer);
+                e.type == 'mouseleave' ? _this.closeTimer = setTimeout(_close, 500) : _open();
+              }
+            });
 
             // Toggle open/close
             $wrapper.on('click' + bindSufix, function(e){
@@ -365,14 +368,6 @@
               });
             }
 
-            // Delay close effect when openOnHover is true
-            if ( _this.options.openOnHover ){
-              clearTimeout(_this.closeTimer);
-              $outerWrapper.one('mouseleave' + bindSufix, function(){
-                _this.closeTimer = setTimeout(_close, 500);
-              });
-            }
-
             // Toggle options box visibility
             $outerWrapper.addClass(_this.classes.open);
             _detectItemVisibility(selected);