Merge commit '816b527c52e60c89865d68b1e8e1d7e0a302cc6c'

brianreavis · brianreavis · commit ab884a5bbddb · 2014-06-01T17:30:40.000-06:00
diff --git a/src/selectize.js b/src/selectize.js
@@ -1447,7 +1447,9 @@ $.extend(Selectize.prototype, {
 		var self = this;
 		var invalid = self.isRequired && !self.items.length;
 		if (!invalid) self.isInvalid = false;
-		self.$control_input.prop('required', invalid);
+		if (self.isRequired) {
+			self.$control_input.prop('required', invalid);
+		};
 		self.refreshClasses();
 	},
 
diff --git a/test/setup.js b/test/setup.js
@@ -218,6 +218,30 @@
 			}
 		});
 
+		describe('<select> (not required)', function(){
+			var $form, $button, test;
+
+			beforeEach(function() {
+				test = setup_test('<select>' +
+					'<option value="">Select an option...</option>' +
+					'<option value="a">A</option>' +
+				'</select>', {});
+				$form = test.$select.parents('form');
+				$button = $('<button type="submit">').appendTo($form);
+			});
+			afterEach(function() {
+				$form.off('.test_required');
+				$button.remove();
+			});
+
+			it('should have isRequired property set to false', function() {
+				expect(test.selectize.isRequired).to.be.equal(false);
+			});
+			it('should not have the required class', function() {
+				expect(test.selectize.$control.hasClass('required')).to.be.equal(false);
+			});
+		});
+
 	});
 
-})();
+})();
