Skip to content

Commit

Permalink
Released 0.7.4.
Browse files Browse the repository at this point in the history
  • Loading branch information
brianreavis committed Sep 2, 2013
1 parent 48430d8 commit f23080e
Show file tree
Hide file tree
Showing 17 changed files with 35 additions and 49 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.7.3",
"version": "0.7.4",
"license": "Apache License, Version 2.0",
"readmeFilename": "README.md",
"repository": {
Expand Down
3 changes: 2 additions & 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.7.3) - Bootstrap 2 Theme
* selectize.bootstrap2.css (v0.7.4) - 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 Expand Up @@ -96,6 +96,7 @@
font-weight: bold;
color: inherit;
text-align: center;
text-decoration: none;
vertical-align: middle;
border-left: 1px solid #cccccc;
-webkit-border-radius: 0 2px 2px 0;
Expand Down
3 changes: 2 additions & 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.7.3) - Bootstrap 3 Theme
* selectize.bootstrap3.css (v0.7.4) - 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 Expand Up @@ -96,6 +96,7 @@
font-weight: bold;
color: inherit;
text-align: center;
text-decoration: none;
vertical-align: middle;
border-left: 1px solid rgba(0, 0, 0, 0);
-webkit-border-radius: 0 2px 2px 0;
Expand Down
3 changes: 2 additions & 1 deletion dist/css/selectize.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.css (v0.7.3)
* selectize.css (v0.7.4)
* 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 @@ -96,6 +96,7 @@
font-weight: bold;
color: inherit;
text-align: center;
text-decoration: none;
vertical-align: middle;
border-left: 1px solid #d0d0d0;
-webkit-border-radius: 0 2px 2px 0;
Expand Down
3 changes: 2 additions & 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.7.3) - Default Theme
* selectize.default.css (v0.7.4) - 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 Expand Up @@ -96,6 +96,7 @@
font-weight: bold;
color: inherit;
text-align: center;
text-decoration: none;
vertical-align: middle;
border-left: 1px solid #0073bb;
-webkit-border-radius: 0 2px 2px 0;
Expand Down
3 changes: 2 additions & 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.7.3) - Default Theme
* selectize.legacy.css (v0.7.4) - 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 Expand Up @@ -96,6 +96,7 @@
font-weight: bold;
color: inherit;
text-align: center;
text-decoration: none;
vertical-align: middle;
border-left: 1px solid #74b21e;
-webkit-border-radius: 0 2px 2px 0;
Expand Down
22 changes: 6 additions & 16 deletions dist/js/selectize.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* selectize.js (v0.7.3)
* selectize.js (v0.7.4)
* 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 @@ -707,20 +707,6 @@
}
},

/**
* Triggers a callback defined in the user-provided settings.
* Events: onItemAdd, onOptionAdd, etc
*
* @param {string} event
*/
triggerCallback: function(event) {
var args;
if (typeof this.settings[event] === 'function') {
args = Array.prototype.slice.apply(arguments, [1]);
this.settings[event].apply(this, args);
}
},

/**
* Triggered when the value of the control has been changed.
* This should propagate the event to the original DOM
Expand Down Expand Up @@ -1894,7 +1880,7 @@
}

// allow the callback to abort
if (!values.length || (typeof self.settings.onDelete === 'function' && self.settings.onDelete(values) === false)) {
if (!values.length || (typeof self.settings.onDelete === 'function' && self.settings.onDelete.apply(self, [values]) === false)) {
return false;
}

Expand Down Expand Up @@ -2475,6 +2461,10 @@
Selectize.define('remove_button', function(options) {
var self = this;

if (self.settings.mode === 'single') {
return;
}

// override the item rendering method to add a "x" to each
this.settings.render.item = function(data) {
var label = data[self.settings.labelField];
Expand Down
4 changes: 2 additions & 2 deletions dist/js/selectize.min.js

Large diffs are not rendered by default.

22 changes: 6 additions & 16 deletions dist/js/standalone/selectize.js
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@
}));

/**
* selectize.js (v0.7.3)
* selectize.js (v0.7.4)
* 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 @@ -1171,20 +1171,6 @@
}
},

/**
* Triggers a callback defined in the user-provided settings.
* Events: onItemAdd, onOptionAdd, etc
*
* @param {string} event
*/
triggerCallback: function(event) {
var args;
if (typeof this.settings[event] === 'function') {
args = Array.prototype.slice.apply(arguments, [1]);
this.settings[event].apply(this, args);
}
},

/**
* Triggered when the value of the control has been changed.
* This should propagate the event to the original DOM
Expand Down Expand Up @@ -2358,7 +2344,7 @@
}

// allow the callback to abort
if (!values.length || (typeof self.settings.onDelete === 'function' && self.settings.onDelete(values) === false)) {
if (!values.length || (typeof self.settings.onDelete === 'function' && self.settings.onDelete.apply(self, [values]) === false)) {
return false;
}

Expand Down Expand Up @@ -2939,6 +2925,10 @@
Selectize.define('remove_button', function(options) {
var self = this;

if (self.settings.mode === 'single') {
return;
}

// override the item rendering method to add a "x" to each
this.settings.render.item = function(data) {
var label = data[self.settings.labelField];
Expand Down
6 changes: 3 additions & 3 deletions dist/js/standalone/selectize.min.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions dist/less/plugins/remove_button.less
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
font-weight: bold;
font-size: 12px;
color: inherit;
text-decoration: none;
vertical-align: middle;
display: inline-block;
padding: @selectize-padding-item-y 0 0 0;
Expand Down
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.7.3) - Bootstrap 2 Theme
* selectize.bootstrap2.css (v0.7.4) - 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.7.3) - Bootstrap 3 Theme
* selectize.bootstrap3.css (v0.7.4) - 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.7.3) - Default Theme
* selectize.default.css (v0.7.4) - 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.7.3) - Default Theme
* selectize.legacy.css (v0.7.4) - 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.7.3",
"version": "0.7.4",
"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.7.3",
"version": "0.7.4",
"title": "Selectize.js",
"author": {
"name": "Brian Reavis",
Expand Down

0 comments on commit f23080e

Please sign in to comment.