Skip to content

Commit

Permalink
Generating correct v1.6.3. Fixes #740
Browse files Browse the repository at this point in the history
  • Loading branch information
t0xicCode committed Oct 3, 2014
1 parent 66f3923 commit 3b5cfe0
Show file tree
Hide file tree
Showing 36 changed files with 44 additions and 40 deletions.
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -241,9 +241,9 @@ module.exports = function (grunt) {
grunt.registerTask('dist-js', ['clean:js', 'concat', 'uglify']);

// Full distribution
grunt.registerTask('dist', ['dist-css', 'dist-js']);
grunt.registerTask('dist', ['dist-css', 'dist-js', 'compress']);

// Default task.
grunt.registerTask('default', ['clean', 'dist', 'compress']);
grunt.registerTask('default', ['clean', 'dist-css', 'dist-js']);

};
2 changes: 1 addition & 1 deletion dist/css/bootstrap-select.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/css/bootstrap-select.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions dist/js/bootstrap-select.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down Expand Up @@ -109,7 +109,7 @@
this.init();
};

Selectpicker.VERSION = '1.6.2';
Selectpicker.VERSION = '1.6.3';

// part of this is duplicated in i18n/defaults-en_US.js. Make sure to update both.
Selectpicker.DEFAULTS = {
Expand Down Expand Up @@ -826,7 +826,7 @@
var that = this,
no_results = $('<li class="no-results"></li>');

this.$newElement.on('click.dropdown.data-api', function () {
this.$newElement.on('click.dropdown.data-api touchstart.dropdown.data-api', function () {
that.$menu.find('.active').removeClass('active');
if (!!that.$searchbox.val()) {
that.$searchbox.val('');
Expand All @@ -839,6 +839,10 @@
}, 10);
});

this.$searchbox.on('click.dropdown.data-api focus.dropdown.data-api touchend.dropdown.data-api', function (e) {
e.stopPropagation();
});

this.$searchbox.on('input propertychange', function () {
if (that.$searchbox.val()) {

Expand Down
2 changes: 1 addition & 1 deletion dist/js/bootstrap-select.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/bootstrap-select.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-cs_CZ.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-cs_CZ.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-de_DE.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-de_DE.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-en_US.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-en_US.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-es_CL.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-es_CL.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-eu.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-eu.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-fr_FR.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-fr_FR.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-it_IT.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-it_IT.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-nl_NL.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-nl_NL.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-pl_PL.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-pl_PL.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-pt_BR.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-pt_BR.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-ro_RO.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-ro_RO.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-ru_RU.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-ru_RU.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-ua_UA.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-ua_UA.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-zh_CN.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-zh_CN.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-zh_TW.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down
2 changes: 1 addition & 1 deletion dist/js/i18n/defaults-zh_TW.min.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* Bootstrap-select v1.6.2 (http://silviomoreto.github.io/bootstrap-select/)
* Bootstrap-select v1.6.3 (http://silviomoreto.github.io/bootstrap-select/)
*
* Copyright 2013-2014 bootstrap-select
* Licensed under MIT (https://github.com/silviomoreto/bootstrap-select/blob/master/LICENSE)
Expand Down

0 comments on commit 3b5cfe0

Please sign in to comment.