selectize-rails 0.7.5 → 0.7.6

data/README.md

@@ -41,6 +41,7 @@ See the [demo page of Brian Reavis](http://brianreavis.github.io/selectize.js/)
 
 | Version | Notes                                                       |
 | -------:| ----------------------------------------------------------- |
+|   0.7.6 | Update to v0.7.6 of selectize.js                            |
 |   0.7.5 | Update to v0.7.5 of selectize.js                            |
 |   0.7.4 | Update to v0.7.4 of selectize.js                            |
 |   0.7.3 | Update to v0.7.3 of selectize.js                            |

data/lib/selectize-rails/version.rb

@@ -1,5 +1,5 @@
 module Selectize
   module Rails
-    VERSION = "0.7.5"
+    VERSION = "0.7.6"
   end
 end

data/vendor/assets/javascripts/selectize.js

@@ -258,11 +258,7 @@
 					var field = options.sort;
 					var multiplier = options.direction === 'desc' ? -1 : 1;
 					return function(a, b) {
-						a = a && String(self.items[a.id][field] || '').toLowerCase();
-						b = b && String(self.items[b.id][field] || '').toLowerCase();
-						if (a > b) return 1 * multiplier;
-						if (b > a) return -1 * multiplier;
-						return 0;
+						return cmp(self.items[a.id][field], self.items[b.id][field]) * multiplier;
 					};
 				})());
 			}
@@ -280,6 +276,17 @@
 	// utilities
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+	var cmp = function(a, b) {
+		if (typeof a === 'number' && typeof b === 'number') {
+			return a > b ? 1 : (a < b ? -1 : 0);
+		}
+		a = String(a || '').toLowerCase();
+		b = String(b || '').toLowerCase();
+		if (a > b) return 1;
+		if (b > a) return -1;
+		return 0;
+	};
+
 	var extend = function(a, b) {
 		var i, n, k, object;
 		for (i = 1, n = arguments.length; i < n; i++) {
@@ -454,7 +461,7 @@
 	};
 
 	var utils = {
-		isArray: Array.isArray || function() {
+		isArray: Array.isArray || function(vArg) {
 			return Object.prototype.toString.call(vArg) === '[object Array]';
 		}
 	};
@@ -463,7 +470,7 @@
 }));
 
 /**
- * selectize.js (v0.7.5)
+ * selectize.js (v0.7.6)
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -2627,7 +2634,7 @@
 	
 		dataAttr: 'data-data',
 		optgroupField: 'optgroup',
-		sortField: null,
+		sortField: '$order',
 		sortDirection: 'asc',
 		valueField: 'value',
 		labelField: 'text',
@@ -2708,6 +2715,7 @@
 		var init_select = function($input, settings_element) {
 			var i, n, tagName;
 			var $children;
+			var order = 0;
 			settings_element.maxItems = !!$input.attr('multiple') ? null : 1;
 	
 			var readData = function($el) {
@@ -2719,16 +2727,22 @@
 			};
 	
 			var addOption = function($option, group) {
+				var value, option;
+	
 				$option = $($option);
 	
-				var value = $option.attr('value') || '';
+				value = $option.attr('value') || '';
 				if (!value.length) return;
 	
-				settings_element.options[value] = readData($option) || {
+				option = readData($option) || {
 					'text'     : $option.text(),
 					'value'    : value,
 					'optgroup' : group
 				};
+	
+				option.$order = ++order;
+				settings_element.options[value] = option;
+	
 				if ($option.is(':selected')) {
 					settings_element.items.push(value);
 				}

data/vendor/assets/stylesheets/selectize.bootstrap2.css

@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap2.css (v0.7.5) - Bootstrap 2 Theme
+ * selectize.bootstrap2.css (v0.7.6) - Bootstrap 2 Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

data/vendor/assets/stylesheets/selectize.bootstrap3.css

@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap3.css (v0.7.5) - Bootstrap 3 Theme
+ * selectize.bootstrap3.css (v0.7.6) - Bootstrap 3 Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

data/vendor/assets/stylesheets/selectize.css

@@ -1,5 +1,5 @@
 /**
- * selectize.css (v0.7.5)
+ * selectize.css (v0.7.6)
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

data/vendor/assets/stylesheets/selectize.default.css

@@ -1,5 +1,5 @@
 /**
- * selectize.default.css (v0.7.5) - Default Theme
+ * selectize.default.css (v0.7.6) - Default Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

data/vendor/assets/stylesheets/selectize.legacy.css

@@ -1,5 +1,5 @@
 /**
- * selectize.legacy.css (v0.7.5) - Default Theme
+ * selectize.legacy.css (v0.7.6) - Default Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: selectize-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-09 00:00:00.000000000 Z
+date: 2013-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler