Skip to content

Commit

Permalink
Released 0.8.5.
Browse files Browse the repository at this point in the history
  • Loading branch information
brianreavis committed Nov 25, 2013
1 parent 52f8ccc commit 34f1d18
Show file tree
Hide file tree
Showing 16 changed files with 39 additions and 31 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "selectize",
"keywords": ["select", "ui", "form", "input", "control", "autocomplete", "tagging", "tag"],
"description": "Selectize is a jQuery-based custom <select> UI control. Useful for tagging, contact lists, country selectors, etc.",
"version": "0.8.4",
"version": "0.8.5",
"license": "Apache License, Version 2.0",
"readmeFilename": "README.md",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion dist/css/selectize.bootstrap2.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.bootstrap2.css (v0.8.4) - Bootstrap 2 Theme
* selectize.bootstrap2.css (v0.8.5) - Bootstrap 2 Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion dist/css/selectize.bootstrap3.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.bootstrap3.css (v0.8.4) - Bootstrap 3 Theme
* selectize.bootstrap3.css (v0.8.5) - Bootstrap 3 Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion dist/css/selectize.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.css (v0.8.4)
* selectize.css (v0.8.5)
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion dist/css/selectize.default.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.default.css (v0.8.4) - Default Theme
* selectize.default.css (v0.8.5) - Default Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion dist/css/selectize.legacy.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.legacy.css (v0.8.4) - Default Theme
* selectize.legacy.css (v0.8.5) - Default Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
16 changes: 10 additions & 6 deletions dist/js/selectize.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.js (v0.8.4)
* selectize.js (v0.8.5)
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down Expand Up @@ -1215,12 +1215,15 @@
* Selects all items (CTRL + A).
*/
selectAll: function() {
this.$activeItems = Array.prototype.slice.apply(this.$control.children(':not(input)').addClass('active'));
if (this.$activeItems.length) {
this.hideInput();
this.close();
var self = this;
if (self.settings.mode === 'single') return;

self.$activeItems = Array.prototype.slice.apply(self.$control.children(':not(input)').addClass('active'));
if (self.$activeItems.length) {
self.hideInput();
self.close();
}
this.focus();
self.focus();
},

/**
Expand Down Expand Up @@ -2049,6 +2052,7 @@
}

self.showInput();
self.positionDropdown();
self.refreshOptions(true);

// select previous option
Expand Down
6 changes: 3 additions & 3 deletions dist/js/selectize.min.js

Large diffs are not rendered by default.

20 changes: 12 additions & 8 deletions dist/js/standalone/selectize.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

(function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(factory);
define('sifter', factory);
} else if (typeof exports === 'object') {
module.exports = factory();
} else {
Expand Down Expand Up @@ -464,7 +464,7 @@

(function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(factory);
define('microplugin', factory);
} else if (typeof exports === 'object') {
module.exports = factory();
} else {
Expand Down Expand Up @@ -603,7 +603,7 @@

(function(root, factory) {
if (typeof define === 'function' && define.amd) {
define(['jquery','sifter','microplugin'], factory);
define('selectize', ['jquery','sifter','microplugin'], factory);
} else {
root.Selectize = factory(root.jQuery, root.Sifter, root.MicroPlugin);
}
Expand Down Expand Up @@ -1799,12 +1799,15 @@
* Selects all items (CTRL + A).
*/
selectAll: function() {
this.$activeItems = Array.prototype.slice.apply(this.$control.children(':not(input)').addClass('active'));
if (this.$activeItems.length) {
this.hideInput();
this.close();
var self = this;
if (self.settings.mode === 'single') return;

self.$activeItems = Array.prototype.slice.apply(self.$control.children(':not(input)').addClass('active'));
if (self.$activeItems.length) {
self.hideInput();
self.close();
}
this.focus();
self.focus();
},

/**
Expand Down Expand Up @@ -2633,6 +2636,7 @@
}

self.showInput();
self.positionDropdown();
self.refreshOptions(true);

// select previous option
Expand Down
4 changes: 2 additions & 2 deletions dist/js/standalone/selectize.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/less/selectize.bootstrap2.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.bootstrap2.css (v0.8.4) - Bootstrap 2 Theme
* selectize.bootstrap2.css (v0.8.5) - Bootstrap 2 Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion dist/less/selectize.bootstrap3.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.bootstrap3.css (v0.8.4) - Bootstrap 3 Theme
* selectize.bootstrap3.css (v0.8.5) - Bootstrap 3 Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion dist/less/selectize.default.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.default.css (v0.8.4) - Default Theme
* selectize.default.css (v0.8.5) - Default Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion dist/less/selectize.legacy.less
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.legacy.css (v0.8.4) - Default Theme
* selectize.legacy.css (v0.8.5) - Default Theme
* Copyright (c) 2013 Brian Reavis & contributors
*
* Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "selectize",
"keywords": ["select", "ui", "form", "input", "control", "autocomplete", "tagging", "tag"],
"description": "Selectize is a jQuery-based custom <select> UI control. Useful for tagging, contact lists, country selectors, etc.",
"version": "0.8.4",
"version": "0.8.5",
"author": "Brian Reavis <brian@thirdroute.com>",
"repository": {
"type": "git",
Expand Down
2 changes: 1 addition & 1 deletion selectize.jquery.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "selectize",
"version": "0.8.4",
"version": "0.8.5",
"title": "Selectize.js",
"author": {
"name": "Brian Reavis",
Expand Down

0 comments on commit 34f1d18

Please sign in to comment.