new version 0.7.4

manuelvanrijn · Sep 3, 2013 · 7454862 · 7454862
1 parent 97108a7
commit 7454862
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ See the [demo page of Brian Reavis](http://brianreavis.github.io/selectize.js/)
 
 | Version | Notes                                                       |
 | -------:| ----------------------------------------------------------- |
+|   0.7.4 | Update to v0.7.4 of selectize.js                            |
 |   0.7.3 | Update to v0.7.3 of selectize.js                            |
 |   0.7.2 | Update to v0.7.2 of selectize.js                            |
 |   0.7.0 | Update to v0.7.0 of selectize.js                            |

diff --git a/lib/selectize-rails/version.rb b/lib/selectize-rails/version.rb
@@ -1,5 +1,5 @@
 module Selectize
   module Rails
-    VERSION = "0.7.3"
+    VERSION = "0.7.4"
   end
 end
diff --git a/vendor/assets/javascripts/selectize.js b/vendor/assets/javascripts/selectize.js
@@ -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
@@ -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
@@ -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;
 			}
 
@@ -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];

diff --git a/vendor/assets/stylesheets/selectize.bootstrap2.css b/vendor/assets/stylesheets/selectize.bootstrap2.css
@@ -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
@@ -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;

diff --git a/vendor/assets/stylesheets/selectize.bootstrap3.css b/vendor/assets/stylesheets/selectize.bootstrap3.css
@@ -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
@@ -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;

diff --git a/vendor/assets/stylesheets/selectize.css b/vendor/assets/stylesheets/selectize.css
@@ -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
@@ -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;

diff --git a/vendor/assets/stylesheets/selectize.default.css b/vendor/assets/stylesheets/selectize.default.css
@@ -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
@@ -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;

diff --git a/vendor/assets/stylesheets/selectize.legacy.css b/vendor/assets/stylesheets/selectize.legacy.css
@@ -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
@@ -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;