Merge branch 'master' into master

Author: u01jmg3

.github/ISSUE_TEMPLATE.md

@@ -0,0 +1,51 @@
+Welcome to the Selectize bug tracker. Thank you for taking the time to
+make Selectize a better library!
+
+Please keep in mind this repository has an important issue backlog and
+that maintainers have limited time to fix issues, triage, and understand
+them.
+
+If you've never done so, please read the
+[guide to reporting issues](https://github.com/selectize/selectize.js/wiki/Reporting-issues-guide)
+in the Wiki to help us better understand your issue.
+
+Place an `x` in the checklist steps (`[ ]` becomes `[x]`) to demonstrate
+you have done/verified all the steps you needed to do.
+
+Thank you for reading this! You can now erase everything up to the
+following dashes, and then complete what's after.
+
+ISSUES THAT EITHER:
+
+* IGNORE THE ISSUE GUIDELINES
+* ERASE THE FOLLOWING TEMPLATE
+* DON'T FOLLOW THE PROPER NUMBERED FORMAT FOR STEPS TO REPRODUCE
+
+COULD BE CLOSED.
+
+---
+
+I did:
+
+* [ ] Search for if my issue has already been submitted
+* [ ] Make sure I'm reporting something precise that needs to be fixed
+* [ ] Give my issue a descriptive and concise title
+* [ ] Create a *minimal* working example on JsFiddle or Codepen
+	(or gave a link to a demo on the Selectize docs)
+* [ ] Indicate *precise* steps to reproduce in *numbers* and the result,
+	  like below
+
+[replace me with a short description of issue]
+
+Steps to reproduce:
+
+1.
+2.
+3.
+
+Expected result:
+
+Actual result:
+
+[you can add explanations here of the context/what you were trying to
+do, and if you have findings about what the cause might be]

CHANGELOG.md

@@ -0,0 +1,62 @@
+<!-- Feel free to put either your handle and/or full name, according to
+     your privacy needs -->
+
+*  New feature: allow to disable single options or complete optgroups
+
+   *@zeitiger*
+
+## v0.12.3 · 24 August 2016
+*  Make `label[for]` work after applying Selectize (#755)
+
+   *Barrett Sonntag* (@barretts)
+
+*  Output friendly error message when Microplguin is missing (#1137).
+   Special thanks to @styxxx for proposing the improvement.
+
+*  Add local server command `grunt server`.
+
+*  Stop creating items automatically when text is pasted, only create
+   them when pasted text contains delimiter.
+
+*  Fix regression 'Required fields can not be focusable' in Chrome
+	(#733)
+
+*  Fix detection of Validity API, we had false negatives before.
+
+   *Jonathan Allard* (@joallard)
+
+*  Fix open keyboard bug under iOS after closing selection (#1127)
+
+   *@zeitiger*
+
+*  Fix highlighting more than one character (#1099, #1098)
+
+   *@skimi*
+
+
+## v0.12.2 · 23 June 2016
+*  Fix issue preventing build ("Cannot assign to read only property
+   'subarray'") because of bug in uglifyjs. (#1072)
+
+   *@jaridmargolin*
+
+*  Fix tabbing issue (#877) on IE11. (#997)
+
+   *@bwilson-ux*
+
+*  Fix jQuery initialization for jQuery >= 1.9 (#1045)
+
+   *@mpokrywka*
+
+*  Make `remove_button` work for single-option usage (#848)
+
+   *@ChoppyThing*
+
+*  Fixed bug that made `allowEmptyOption: true` useless (#739)
+
+   *@mcavalletto*
+
+*  Functions in option `render` can now return a DOM node in addition to
+   text. (#617)
+
+   *@topaxi*

Gruntfile.js

@@ -5,8 +5,10 @@ module.exports = function(grunt) {
 	grunt.loadNpmTasks('grunt-contrib-uglify');
 	grunt.loadNpmTasks('grunt-contrib-concat');
 	grunt.loadNpmTasks('grunt-contrib-clean');
+	grunt.loadNpmTasks('grunt-contrib-connect');
 	grunt.loadNpmTasks('grunt-contrib-copy');
 	grunt.loadNpmTasks('grunt-contrib-less');
+	grunt.loadNpmTasks('grunt-contrib-watch');
 	grunt.loadNpmTasks('grunt-replace');
 
 	grunt.registerTask('configure', [
@@ -33,6 +35,11 @@ module.exports = function(grunt) {
 		'compile'
 	]);
 
+	grunt.registerTask('serve', [
+			'connect',
+			'watch'
+	])
+
 	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');
@@ -76,8 +83,8 @@ module.exports = function(grunt) {
 	];
 
 	var files_js_dependencies = [
-		'bower_components/sifter/sifter.js',
-		'bower_components/microplugin/src/microplugin.js',
+		'node_modules/sifter/sifter.js',
+		'node_modules/microplugin/src/microplugin.js',
 	];
 
 	var less_imports = [];
@@ -105,7 +112,7 @@ module.exports = function(grunt) {
 	})();
 
 	grunt.initConfig({
-		pkg: grunt.file.readJSON('bower.json'),
+		pkg: grunt.file.readJSON('package.json'),
 		bower: {
 			install: {
 				options: {
@@ -202,10 +209,13 @@ module.exports = function(grunt) {
 				}
 			}
 		},
+		connect: {
+			keepalive: true
+		},
 		uglify: {
 			main: {
 				options: {
-					'banner': '/*! selectize.js - v<%= pkg.version %> | https://github.com/brianreavis/selectize.js | Apache License (v2) */\n',
+					'banner': '/*! selectize.js - v<%= pkg.version %> | https://github.com/selectize/selectize.js | Apache License (v2) */\n',
 					'report': 'gzip',
 					'ascii-only': true
 				},
@@ -214,6 +224,15 @@ module.exports = function(grunt) {
 					'dist/js/standalone/selectize.min.js': ['dist/js/standalone/selectize.js']
 				}
 			}
+		},
+		watch: {
+			files: [
+				'src/**/*.js'
+			],
+			tasks: [
+				'concat:js',
+				'build_standalone'
+			]
 		}
 	});
-};
+};

Makefile

@@ -13,7 +13,6 @@ ifeq ($(strip $(version)),)
 	@echo "\033[1;30mmake release version=1.0.0\033[0;39m"
 else
 	sed -i.bak 's/"version": "[^"]*"/"version": "$(version)"/' selectize.jquery.json
-	sed -i.bak 's/"version": "[^"]*"/"version": "$(version)"/' bower.json
 	sed -i.bak 's/"version": "[^"]*"/"version": "$(version)"/' package.json
 	rm *.bak
 	make compile
@@ -31,4 +30,4 @@ else
 	git push origin gh-pages
 	git checkout master
 	@echo "\033[32mv${version} released\033[0;39m"
-endif
+endif

README.md

@@ -1,16 +1,16 @@
-[**Selectize needs your help. I'm looking for maintainers!**](https://github.com/brianreavis/selectize.js/issues/752)
+→ Selectize is looking for [new members on the maintenance team](https://github.com/selectize/selectize.js/issues/752)!
 
 # selectize.js
 
 [![NPM version](http://img.shields.io/npm/v/selectize.svg?style=flat)](https://www.npmjs.org/package/selectize)
-![Bower version](http://img.shields.io/bower/v/selectize.svg?style=flat)
-[![Build Status](http://img.shields.io/travis/brianreavis/selectize.js/master.svg?style=flat)](https://travis-ci.org/brianreavis/selectize.js)
-[![Coverage Status](http://img.shields.io/coveralls/brianreavis/selectize.js/master.svg?style=flat)](https://coveralls.io/r/brianreavis/selectize.js)
+[![CDNJS version](http://img.shields.io/cdnjs/v/selectize.js.svg?style=flat)](https://cdnjs.com/libraries/selectize.js)
+[![Build Status](http://img.shields.io/travis/selectize/selectize.js/master.svg?style=flat)](https://travis-ci.org/selectize/selectize.js)
+[![Coverage Status](http://img.shields.io/coveralls/selectize/selectize.js/master.svg?style=flat)](https://coveralls.io/r/selectize/selectize.js)
 
 Selectize is an extensible [jQuery](http://jquery.com/)-based custom <select> UI control. It's useful for tagging, contact lists, country selectors, and so on. It clocks in at around ~7kb (gzipped). The goal is to provide a solid & usable experience with a clean and powerful API.
 
-- [Demos](http://brianreavis.github.io/selectize.js/)
-- [Changelog](https://github.com/brianreavis/selectize.js/releases)
+- [Demos](http://selectize.github.io/selectize.js/)
+- [Changelog](https://github.com/selectize/selectize.js/releases)
 - [Examples](examples/)
 - [Usage Documentation](docs/usage.md)
 - [API Documentation](docs/api.md)
@@ -35,9 +35,17 @@ Selectize is an extensible [jQuery](http://jquery.com/)-based custom <select&
 - [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))
 
-### Files
+### Installation and files
 
-All pre-built files needed to use Selectize can be found in the ["dist"](dist/) folder.
+All pre-built files needed to use Selectize can be found in the
+["dist"](dist/) folder.
+
+If you're looking to get started with minimal fuss, include
+`standalone/selectize.min.js` (bundles Sifter and Microplugin
+dependencies – also available un-minifed for debugging, just remove the
+`.min` part) and `css/selectize.default.css`.
+
+Selectize is available at [cdnjs](https://cdnjs.com/libraries/selectize.js).
 
 - [**js/**](dist/js)
 	- [**standalone/**](dist/js/standalone)
@@ -86,8 +94,34 @@ grunt --plugins=remove_button,restore_on_backspace
 ```
 
 ### Contributing
+When issuing a pull request:
+
+* please **do not include/commit changes in the `dist/` folder** to avoid
+  merge conflicts.  A good way to include the right files is to use
+  `git gui` or `git add` when committing to select the files you want to
+  add to your commit.
+
+* please **include tests** with your feature so that we're not tempted to
+  break it in the future!
+
+Add an entry to the top of the CHANGELOG, and update the documentation
+in `docs/` as needed. (Refactors and documentation changes don't need a
+changelog entry.)
+
+Squash your commits together in one or a few complete, logical commits,
+with a concise and descriptive message. One commit means one
+feature/bugfix/thing that has changed, or a diff bringing the code one
+step forward to a better, working state.
+
+Once your commit is nice and clean, and you want to *discard the other
+changes*, you can use `git checkout .` (that will erase changes to
+tracked files) and `git clean [-i/--interactive]` (to erase untracked
+files).  **However, be careful with those commands, as their function
+is to erase things/changes.**
 
-When issuing a pull request, *please exclude changes in the "dist" folder to avoid merge conflicts*. Also, please ensure all the tests pass:
+
+#### Tests
+Please ensure all the tests pass:
 
 ```sh
 $ npm test # phantomjs
@@ -96,9 +130,22 @@ $ BROWSERS=Firefox,Chrome npm test
 $ BROWSERS=Firefox,Chrome,Safari npm test
 ```
 
+#### Local environment
+To run Selectize locally:
+
+```sh
+$ npm start
+```
+
+You can then run the examples in `http://localhost:8000/examples/`.
+
+However, be careful not to add the `dist/` files in your commit, as
+Grunt automatically regenerates the files in `dist/` as the source is
+changed.
+
 ## License
 
-Copyright © 2013–2015 [Brian Reavis](http://twitter.com/brianreavis) & [Contributors](https://github.com/brianreavis/selectize.js/graphs/contributors)
+Copyright © 2013–2016 [Brian Reavis](http://twitter.com/brianreavis) & [Contributors](https://github.com/selectize/selectize.js/graphs/contributors)
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at: http://www.apache.org/licenses/LICENSE-2.0
 

bower.json

@@ -1,40 +1,48 @@
 {
-	"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.12.1",
-	"license": "Apache License, Version 2.0",
-	"readmeFilename": "README.md",
-	"repository": {
-		"type": "git",
-		"url": "git://github.com/brianreavis/selectize.js.git"
-	},
-	"main": [
-		"dist/css/selectize.css",
-		"dist/js/selectize.js"
-	],
-	"ignore": [
-		"Makefile",
-		"Gruntfile.js",
-		"examples",
-		"node_modules",
-		"bower_components",
-		"docs",
-		"src",
-		"test",
-		".travis.yml",
-		"testem.json",
-		"selectize.jquery.json",
-		"*.sh",
-		"package.json"
-	],
-	"dependencies": {
-		"jquery": ">=1.7.0",
-		"sifter": "0.4.x",
-		"microplugin": "0.0.x"
-	},
-	"devDependencies": {
-		"bootstrap2": "bootstrap#2",
-		"bootstrap3": "bootstrap#3.2"
-	}
+  "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.",
+  "license": "Apache License, Version 2.0",
+  "readmeFilename": "README.md",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/selectize/selectize.js.git"
+  },
+  "main": [
+    "dist/css/selectize.css",
+    "dist/js/selectize.js"
+  ],
+  "ignore": [
+    "Makefile",
+    "Gruntfile.js",
+    "examples",
+    "node_modules",
+    "bower_components",
+    "docs",
+    "src",
+    "test",
+    ".travis.yml",
+    "testem.json",
+    "selectize.jquery.json",
+    "*.sh",
+    "package.json"
+  ],
+  "dependencies": {
+    "jquery": ">=1.7.0",
+    "microplugin": "0.0.x",
+    "sifter": "0.5.x"
+  },
+  "devDependencies": {
+    "bootstrap2": "bootstrap#2",
+    "bootstrap3": "bootstrap#3.2"
+  }
 }