Merge remote-tracking branch 'origin/master'

Author: lcdsantos

src/.eslintrc renamed to .eslintrc

@@ -1,8 +1,8 @@
 var gulp = require('gulp'),
-    $    = require('gulp-load-plugins')(),
-    fs   = require('fs');
+    $    = require('gulp-load-plugins')();
 
 var getPackageJson = function() {
+  var fs = require('fs');
   return JSON.parse(fs.readFileSync('./package.json', 'utf8'));
 };
 
@@ -26,12 +26,12 @@ gulp.task('bump', function() {
   Javascript
 ======================================*/
 gulp.task('lint', function() {
-  return gulp.src(['src/*.js', 'test/*.js'])
-    .pipe($.eslint())
+  return gulp.src(['./src/*.js'])
+    .pipe($.eslint('.eslintrc'))
     .pipe($.eslint.format());
 });
 
-gulp.task('js', ['lint', 'bump'], function() {
+gulp.task('js', ['bump', 'lint'], function() {
   var pkg = getPackageJson(),
       banner = [
         '/*!',
@@ -124,7 +124,7 @@ gulp.task('watch', ['serve'], function() {
 gulp.task('zip', function() {
   var pkg = getPackageJson();
 
-  return gulp.src('./public/*')
+  return gulp.src('./public/**/*')
     .pipe($.zip('selectric_v' + pkg.version + '.zip'))
     .pipe(gulp.dest('./'));
 });

gulpfile.js

@@ -9,7 +9,7 @@
  *    /,'
  *   /'
  *
- * Selectric ϟ v1.9.5 (Mar 28 2016) - http://lcdsantos.github.io/jQuery-Selectric/
+ * Selectric ϟ v1.9.6 (Mar 28 2016) - http://lcdsantos.github.io/jQuery-Selectric/
  *
  * Copyright (c) 2016 Leonardo Santos; MIT License
  *
@@ -18,9 +18,9 @@
 (function(factory) {
   /* global define */
   /* istanbul ignore next */
-  if (typeof define === 'function' && define.amd) {
+  if ( typeof define === 'function' && define.amd ) {
     define(['jquery'], factory);
-  } else if (typeof module === 'object' && module.exports) {
+  } else if ( typeof module === 'object' && module.exports ) {
     // Node/CommonJS
     module.exports = function( root, jQuery ) {
       if ( jQuery === undefined ) {
@@ -148,7 +148,9 @@
        * @return {object}               The next enabled item.
        */
       nextEnabledItem: function(selectItems, selected) {
-        while ( selectItems[ selected = (selected + 1) % selectItems.length ].disabled );
+        while ( selectItems[ selected = (selected + 1) % selectItems.length ].disabled ) {
+          // empty
+        }
         return selected;
       },
 
@@ -160,7 +162,9 @@
        * @return {object}               The previous enabled item.
        */
       previousEnabledItem: function(selectItems, selected) {
-        while ( selectItems[ selected = (selected > 0 ? selected : selectItems.length) - 1 ].disabled );
+        while ( selectItems[ selected = (selected > 0 ? selected : selectItems.length) - 1 ].disabled ) {
+          // empty
+        }
         return selected;
       },
 
@@ -399,7 +403,6 @@
     getItemsMarkup: function(items) {
       var _this = this;
       var markup = '<ul>';
-      var flattenItems = $.map(items, function(n) { return n; });
 
       $.each(items, function(i, elm) {
         if ( elm.label !== undefined ) {
@@ -649,7 +652,7 @@
         e.stopPropagation();
       }
 
-      if (_this.state.enabled) {
+      if ( _this.state.enabled ) {
         _this.setOptionsDimensions();
 
         // Find any other opened instances of select and close it
@@ -815,8 +818,9 @@
      * @param {function}         fn - Callback function.
      */
     add: function(callbackName, hookName, fn) {
-      if ( !this[callbackName] )
+      if ( !this[callbackName] ) {
         this[callbackName] = {};
+      }
 
       this[callbackName][hookName] = fn;
     },