Merge remote-tracking branch 'upstream/master'

* upstream/master: (69 commits)
  Released 0.11.0.
  Added "allowEmptyOption" option (selectize#163).
  Fixed broken bootstrap3 build.
  Fixing confusing description
  renamed the undefined plugins variable to selector_plugins
  Released 0.10.1.
  Bind createFilter callback to Selectize instance.
  Released 0.10.0.
  Calculate scrollbar width (fixes selectize#360).
  Fix for selectize#438 + tests.
  Added createFilter sample to contacts demo.
  Cherry picked commit 6e04d7b from selectize#370.
  Minor cleanup of selectize#405.
  Forgot self qualifier on
  Jquery cached data allocated by selectized is now cleaned up at destroy time
  Removing extra tabs
  selectized class should not have been added before the classes were checked and propegated to all of the controls created by selectize.  It was previously added after this initialization and is now also added at the same time.
  Used method call to isFull to avoid duplicate code
  Consolidated the refreshState call to capture just becoming full during bulk (or any) addItem call
  Delaying updating attributes and caret during bulk insertion
  ...

Conflicts:
	src/selectize.js

Author: Andrew Volozhanin

Gruntfile.js

@@ -6,8 +6,8 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-concat');
 	grunt.loadNpmTasks('grunt-contrib-clean');
 	grunt.loadNpmTasks('grunt-contrib-copy');
+	grunt.loadNpmTasks('grunt-contrib-less');
 	grunt.loadNpmTasks('grunt-replace');
-	grunt.loadNpmTasks('grunt-recess');
 
 	grunt.registerTask('configure', [
 		'clean:pre',
@@ -20,10 +20,10 @@ module.exports = function(grunt) {
 		'concat:less_theme_dependencies',
 		'concat:less_plugins',
 		'concat:js',
-		'recess',
+		'less:uncompressed',
 		'clean_bootstrap2_css',
 		'replace',
-		'concat:js_standalone',
+		'build_standalone',
 		'uglify',
 		'clean:post',
 	]);
@@ -36,10 +36,33 @@ module.exports = function(grunt) {
 	grunt.registerTask('clean_bootstrap2_css', 'Cleans CSS rules ocurring before the header comment.', function() {
 		var file = 'dist/css/selectize.bootstrap2.css';
 		var source = fs.readFileSync(file, 'utf8');
-		fs.writeFileSync(file, source.replace(/^(.|\s)+?\/\*/m, '/*'), 'utf8');
+		grunt.file.write(file, source.replace(/^(.|\s)+?\/\*/m, '/*'));
 		grunt.log.writeln('Cleaned "' + file + '".');
 	});
 
+	grunt.registerTask('build_standalone', '', function() {
+		var files, i, n, source, name, path, modules = [];
+
+		// amd definitions must be changed to be not anonymous
+		// @see https://github.com/brianreavis/selectize.js/issues/89
+		files = [];
+		for (i = 0, n = files_js_dependencies.length; i < n; i++) {
+			path = files_js_dependencies[i];
+			name = path.match(/([^\/]+?).js$/)[1];
+			source = grunt.file.read(path).replace('define(factory);', 'define(\'' + name + '\', factory);');
+			modules.push(source);
+		}
+
+		path = 'dist/js/selectize.js';
+		source = grunt.file.read(path).replace(/define\((.*?)factory\);/, 'define(\'selectize\', $1factory);');
+		modules.push(source);
+
+		// write output
+		path = 'dist/js/standalone/selectize.js';
+		grunt.file.write(path, modules.join('\n\n'));
+		grunt.log.writeln('Built "' + path + '".');
+	});
+
 	var files_js = [
 		'src/contrib/*.js',
 		'src/*.js',
@@ -66,7 +89,7 @@ module.exports = function(grunt) {
 		if (!selector_plugins) return;
 
 		if (selector_plugins.indexOf(',') !== -1) {
-			selector_plugins = '{' + plugins.split(/\s*,\s*/).join(',') + '}';
+			selector_plugins = '{' + selector_plugins.split(/\s*,\s*/).join(',') + '}';
 		}
 
 		// javascript
@@ -131,10 +154,8 @@ module.exports = function(grunt) {
 				]
 			}
 		},
-		recess: {
-			options: {
-				compile: true
-			},
+		less: {
+			options: {},
 			uncompressed: {
 				files: {
 					'dist/css/selectize.css': ['dist/less/selectize.less'],
@@ -173,25 +194,10 @@ module.exports = function(grunt) {
 					],
 					'dist/less/selectize.bootstrap3.tmp.less': [
 						'bower_components/bootstrap3/less/variables.less',
-						'bower_components/bootstrap3/less/mixins.less',
+						'bower_components/bootstrap3/less/mixins/nav-divider.less',
 						'dist/less/selectize.bootstrap3.less'
 					]
 				}
-			},
-			js_standalone: {
-				options: {
-					stripBanners: false
-				},
-				files: {
-					'dist/js/standalone/selectize.js': (function() {
-						var files = [];
-						for (var i = 0, n = files_js_dependencies.length; i < n; i++) {
-							files.push(files_js_dependencies[i]);
-						}
-						files.push('dist/js/selectize.js');
-						return files;
-					})()
-				}
 			}
 		},
 		uglify: {

Makefile

@@ -1,11 +1,13 @@
 .PHONY: compile release test
 plugins=*
+GRUNT=node_modules/.bin/grunt
+TESTEM=node_modules/.bin/testem
 
 all: compile
 test:
-	testem
+	$(TESTEM)
 compile:
-	grunt --plugins=$(plugins)
+	$(GRUNT) --plugins=$(plugins)
 release:
 ifeq ($(strip $(version)),)
 	@echo "\033[31mERROR:\033[0;39m No version provided."

README.md

@@ -24,7 +24,7 @@ Selectize is an extensible jQuery-based custom <select> UI control. It's u
 
 ### Dependencies
 
-- [jquery](https://github.com/jquery/jquery)
+- [jquery](https://github.com/jquery/jquery) (1.7 and greater)
 - [sifter](https://github.com/brianreavis/sifter.js) (bundled in ["standalone" build](dist/js/standalone))
 - [microplugin](https://github.com/brianreavis/microplugin.js) (bundled in ["standalone" build](dist/js/standalone))
 
@@ -45,6 +45,8 @@ All pre-built files needed to use Selectize can be found in the ["dist"](dist/)
 - [**css/**](dist/css)
 	- [selectize.css](dist/css/selectize.css) — Core styles
 	- [selectize.default.css](dist/css/selectize.default.css) — Default theme (with core styles)
+	- [selectize.bootstrap2.css](dist/css/selectize.bootstrap2.css) - Bootstrap 2 theme
+	- [selectize.bootstrap3.css](dist/css/selectize.bootstrap3.css) - Bootstrap 3 theme
 
 ### Usage
 
@@ -68,7 +70,6 @@ By default, all [plugins](src/plugins) are included. To hand-pick what plugins (
 
 ```sh
 # dependencies
-npm install -g grunt-cli
 npm install -g bower
 npm install
 

bower.json

@@ -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.2",
+	"version": "0.11.0",
 	"license": "Apache License, Version 2.0",
 	"readmeFilename": "README.md",
 	"repository": {
@@ -25,15 +25,16 @@
 		".travis.yml",
 		"testem.json",
 		"selectize.jquery.json",
-		"*.sh"
+		"*.sh",
+		"package.json"
 	],
 	"dependencies": {
-		"jquery": ">=0.6.0",
+		"jquery": ">=1.7.0",
 		"sifter": "0.3.x",
 		"microplugin": "0.0.x"
 	},
 	"devDependencies": {
 		"bootstrap2": "bootstrap#2",
-		"bootstrap3": "bootstrap#3"
+		"bootstrap3": "bootstrap#3.2"
 	}
 }