Merged selectize#69 + added tests for selectize#70.

Author: brianreavis

.gitignore

@@ -1,5 +1,5 @@
 .DS_Store
-*.log
-
-# WebDAV file system cache
-.DAV/
+.DAV
+node_modules
+bower_components
+*.log

selectize.js

@@ -2534,7 +2534,7 @@
 				if (!value.length) return;
 
 				settings_element.options[value] = readData($option) || {
-					'text'     : $option.text(), //don't use .html() as it escapes - we leave that to the render
+					'text'     : $option.text(),
 					'value'    : value,
 					'optgroup' : group
 				};
@@ -2575,7 +2575,7 @@
 			var $input = $(this);
 			var tag_name = $input[0].tagName.toLowerCase();
 			var settings_element = {
-				'placeholder' : $input.attr('placeholder'),
+				'placeholder' : $input.children('option[value=""]').text() || $input.attr('placeholder'),
 				'options'     : {},
 				'optgroups'   : {},
 				'items'       : []

selectize.min.js

@@ -51,7 +51,7 @@ $.fn.selectize = function(settings) {
 			if (!value.length) return;
 
 			settings_element.options[value] = readData($option) || {
-				'text'     : $option.text(), //don't use .html() as it escapes - we leave that to the render
+				'text'     : $option.text(),
 				'value'    : value,
 				'optgroup' : group
 			};
@@ -92,7 +92,7 @@ $.fn.selectize = function(settings) {
 		var $input = $(this);
 		var tag_name = $input[0].tagName.toLowerCase();
 		var settings_element = {
-			'placeholder' : $input.attr('placeholder'),
+			'placeholder' : $input.children('option[value=""]').text() || $input.attr('placeholder'),
 			'options'     : {},
 			'optgroups'   : {},
 			'items'       : []

src/selectize.jquery.js

@@ -27,10 +27,15 @@
 		});
 
 		describe('<select>', function() {
-			it('complete without exceptions', function() {
+			it('should complete without exceptions', function() {
 				test = setup_test('<select>', {});
 				test.teardown();
 			});
+			it('should add options in text form (no html entities)', function() {
+				test = setup_test('<select><option selected value="a">&lt;hi&gt;</option></select>', {});
+				expect(test.selectize.options['a'].text).to.be.equal('<hi>');
+				test.teardown();
+			});
 			describe('getValue()', function() {
 				it('should return "" when empty', function() {
 					test = setup_test('<select>', {});
@@ -46,7 +51,7 @@
 		});
 
 		describe('<select multiple>', function() {
-			it('complete without exceptions', function() {
+			it('should complete without exceptions', function() {
 				test = setup_test('<select>', {});
 				test.teardown();
 			});