Skip to content

Commit 7941c8d

Browse files
committed
Fix #51, fixed bump version in build process
1 parent 8163d2a commit 7941c8d

File tree

7 files changed

+51
-45
lines changed

7 files changed

+51
-45
lines changed

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "jquery-selectric",
33
"description": "Fast, simple and light jQuery plugin to customize HTML selects",
4-
"version": "1.8.4",
4+
"version": "1.8.5",
55
"keywords": [
66
"select",
77
"selectbox",

dist/jquery.selectric.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* /,'
1010
* /'
1111
*
12-
* Selectric Ϟ v1.8.4 (2014-09-23) - http://lcdsantos.github.io/jQuery-Selectric/
12+
* Selectric Ϟ v1.8.5 (2014-10-02) - http://lcdsantos.github.io/jQuery-Selectric/
1313
*
1414
* Copyright (c) 2014 Leonardo Santos; Dual licensed: MIT/GPL
1515
*
@@ -433,10 +433,10 @@
433433
// Select option
434434
function _select(index, close) {
435435
// If element is disabled, can't select it
436-
if ( !_this.items[selected = index].disabled ){
436+
if ( !_this.items[index].disabled ){
437437
// If 'close' is false (default), the options box won't close after
438438
// each selected item, this is necessary for keyboard navigation
439-
$li.removeClass('selected').eq(index).addClass('selected');
439+
$li.removeClass('selected').eq(selected = index).addClass('selected');
440440
_detectItemVisibility(index);
441441
close && _close();
442442
}

dist/jquery.selectric.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gulpfile.js

Lines changed: 41 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -3,36 +3,56 @@ var gulp = require('gulp'),
33
rename = require('gulp-rename'),
44
header = require('gulp-header'),
55
bump = require('gulp-bump'),
6-
prefix = require('gulp-autoprefixer');
6+
prefix = require('gulp-autoprefixer'),
7+
gutil = require('gulp-util');
8+
9+
var fs = require('fs'),
10+
getPackageJson = function () {
11+
return JSON.parse(fs.readFileSync('./package.json', 'utf8'));
12+
};
13+
14+
gulp.task('bump', function(){
15+
var pkg = getPackageJson(),
16+
newVersion = gutil.env.bump || pkg.version;
17+
18+
var stream = gulp.src(['./package.json', './bower.json', './selectric.jquery.json'])
19+
.pipe(bump({
20+
version: newVersion
21+
}))
22+
.pipe(gulp.dest('./'));
23+
24+
return stream;
25+
});
726

827
gulp.task('js', ['bump'], function(){
9-
var pkg = require('./package.json');
10-
var banner = [
11-
'/*!',
12-
' * ,/',
13-
' * ,\'/',
14-
' * ,\' /',
15-
' * ,\' /_____,',
16-
' * .\'____ ,\'',
17-
' * / ,\'',
18-
' * / ,\'',
19-
' * /,\'',
20-
' * /\'',
21-
' *',
22-
' * Selectric \u03DE v<%= pkg.version %> (<%= new Date().toJSON().slice(0,10) %>) - http://lcdsantos.github.io/jQuery-Selectric/',
23-
' *',
24-
' * Copyright (c) <%= new Date().getFullYear() %> Leonardo Santos; Dual licensed: MIT\/GPL',
25-
' *',
26-
' */\n\n'
27-
].join('\n');
28+
var pkg = getPackageJson(),
29+
banner = [
30+
'/*!',
31+
' * ,/',
32+
' * ,\'/',
33+
' * ,\' /',
34+
' * ,\' /_____,',
35+
' * .\'____ ,\'',
36+
' * / ,\'',
37+
' * / ,\'',
38+
' * /,\'',
39+
' * /\'',
40+
' *',
41+
' * Selectric \u03DE v<%= pkg.version %> (<%= new Date().toJSON().slice(0,10) %>) - http://lcdsantos.github.io/jQuery-Selectric/',
42+
' *',
43+
' * Copyright (c) <%= new Date().getFullYear() %> Leonardo Santos; Dual licensed: MIT\/GPL',
44+
' *',
45+
' */\n\n'
46+
].join('\n');
2847

2948
gulp.src('src/jquery.selectric.js')
3049
.pipe(header(banner, { pkg: pkg }))
3150
.pipe(gulp.dest('./dist'));
3251
});
3352

3453
gulp.task('js-min', ['bump'], function(){
35-
var pkg = require('./package.json');
54+
var pkg = getPackageJson();
55+
3656
gulp.src('src/jquery.selectric.js')
3757
.pipe(uglify())
3858
.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 }))
@@ -44,7 +64,6 @@ gulp.task('js-min', ['bump'], function(){
4464

4565
var sass = function(options){
4666
var through = require('through2'),
47-
gutil = require('gulp-util'),
4867
spawn = require('win-spawn'),
4968
exec = require('child_process').exec,
5069
path = require('path');
@@ -105,17 +124,4 @@ gulp.task('css', function(){
105124
.pipe(gulp.dest('./dist'));
106125
});
107126

108-
gulp.task('bump', function(){
109-
var gutil = require('gulp-util'),
110-
newVersion = gutil.env.bump || pkg.version;
111-
112-
var stream = gulp.src(['./package.json', './bower.json', './selectric.jquery.json'])
113-
.pipe(bump({
114-
version: newVersion
115-
}))
116-
.pipe(gulp.dest('./'));
117-
118-
return stream;
119-
});
120-
121127
gulp.task('default', ['bump', 'js', 'js-min', 'css']);

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jquery-selectric",
3-
"version": "1.8.4",
3+
"version": "1.8.5",
44
"repository": {
55
"type": "git",
66
"url": "https://github.com/lcdsantos/jQuery-Selectric.git"

selectric.jquery.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "selectric",
3-
"version": "1.8.4",
3+
"version": "1.8.5",
44
"title": "jQuery Selectric",
55
"author": {
66
"name": "Leonardo Santos",

src/jquery.selectric.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -416,10 +416,10 @@
416416
// Select option
417417
function _select(index, close) {
418418
// If element is disabled, can't select it
419-
if ( !_this.items[selected = index].disabled ){
419+
if ( !_this.items[index].disabled ){
420420
// If 'close' is false (default), the options box won't close after
421421
// each selected item, this is necessary for keyboard navigation
422-
$li.removeClass('selected').eq(index).addClass('selected');
422+
$li.removeClass('selected').eq(selected = index).addClass('selected');
423423
_detectItemVisibility(index);
424424
close && _close();
425425
}

0 commit comments

Comments
 (0)