netteForms.js: fixed getValue for multi select box

nette · May 4, 2015 · cde467a · cde467a
1 parent 800df9b
commit cde467a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/assets/netteForms.js b/src/assets/netteForms.js
@@ -66,9 +66,6 @@ Nette.getValue = function(elem) {
 	} else if (elem.type === 'file') {
 		return elem.files || elem.value;
 
-	} else if (elem.name.match(/\[\]$/)) { // multi element with single option
-		return Nette.getValue([elem]);
-
 	} else if (elem.tagName.toLowerCase() === 'select') {
 		var index = elem.selectedIndex,
 			options = elem.options,
@@ -85,6 +82,9 @@ Nette.getValue = function(elem) {
 		}
 		return values;
 
+	} else if (elem.name && elem.name.match(/\[\]$/)) { // multi element with single option
+		return Nette.getValue([elem]);
+
 	} else if (elem.type === 'checkbox') {
 		return elem.checked;
 

diff --git a/tests/netteForms/spec/Nette.validateRuleSpec.js b/tests/netteForms/spec/Nette.validateRuleSpec.js
@@ -285,15 +285,15 @@ describe('Nette.getValue & validateRule', function() {
 
 	it('multi selectbox', function() {
 		fixtures.set('<form> \
-			<select name="input" multiple> \
+			<select name="input[]" multiple> \
 				<optgroup label="World"><option value="bu" id="option-2">Buranda</option></optgroup> \
 				<option value="?" id="option-3">other</option> \
 			</select> \
 		</form>');
 
 		var doc = fixtures.window().document,
 			form = doc.forms[0],
-			el = form.input;
+			el = form['input[]'];
 
 		expect(Nette.getValue(el)).toEqual([]);
 		expect(Nette.validateRule(el, 'filled')).toBe(false);