@@ -1,6 +1,8 @@ <form action="#/pretend/post/url" method="post"> <p><label for="name">Name:</label><input type="text" name="name" /></p> <p><label for="email">Email:</label><input type="text" name="email" /></p> + <p><label for="role_admin">Admin?</label><input type="checkbox" name="roles[]" value="admin" id="role_admin"/></p> + <p><label for="role_author">Author?</label><input type="checkbox" name="roles[]" value="author" id="role_author"/></p> <p><input type="submit" value="Post!" /></p> </form> examples/form_handling/files/form.html @@ -148,7 +148,7 @@ }); return "Sammy.Object: {" + s.join(',') + "}"; } - }); + }); // == Sammy.Application // @@ -664,8 +664,16 @@ path = $form.attr('action'); verb = $form.attr('method').toString().toLowerCase(); params = {'$form': $form}; - $form.find(':input[type!=submit]').each(function() { - params[$(this).attr('name')] = $(this).val(); + $.each($form.serializeArray(), function(i, field) { + if (params[field.name]) { + if ($.isArray(params[field.name])) { + params[field.name].push(field.value); + } else { + params[field.name] = [params[field.name], field.value]; + } + } else { + params[field.name] = field.value; + } }); try { // catch 404s returned = this.runRoute(verb, path, params); lib/sammy.js @@ -25,6 +25,8 @@ <div id="test_area"></div> <form id="test_form" action="#/test" method="post"> <input type="hidden" name="test_input" value="TEST" /> + <input type="checkbox" name="check[]" value="TEST 1" checked="checked" /> + <input type="checkbox" name="check[]" value="TEST 2" checked="checked" /> </form> </div> <ol id="tests"></ol> test/sammy.html @@ -178,6 +178,7 @@ this.route('post', /test/, function() { this.app.form_was_run = 'YES'; + this.app.form_params = this.params; return false; }); @@ -207,12 +208,22 @@ .should('bind events to all forms', function() { var app = this.app; app.run('#/'); - // $('form').submit(); - // matches(/sammy-app/, $('form')[0].className); - // soon(function() { - // equals(app.form_was_run, 'YES'); - // app.unload(); - // }, this, 1, 2); + $('form').submit(); + matches(/sammy-app/, $('form')[0].className); + soon(function() { + equals(app.form_was_run, 'YES'); + app.unload(); + }, this, 1, 2); + }) + .should('parse params for forms', function() { + var app = this.app; + app.run('#/'); + $('form').submit(); + soon(function() { + ok(app.form_params); + isObj(app.form_params['check[]'], ['TEST 1', 'TEST 2']); + app.unload(); + }, this, 1, 2); }) .should('trigger routes on URL change', function() { var app = this.app; test/test_sammy_application.js 91715999c339c041671b3e0e6380d10ac87e8d10 Aaron Quint aaronquint@tie-fighter.local http://github.com/quirkey/sammy/commit/c78e130cc02448fe009c7ce969e5b4ffd6fa6684 c78e130cc02448fe009c7ce969e5b4ffd6fa6684 2009-09-26T13:11:09-07:00 2009-09-26T13:11:09-07:00 Fixed params parsing for form submission. First, use $.fn.serializeArray() to get the form values, then parse them correctly, so that if two inputs have the same name attribute they're returned as an array ad24d72db62f23436ea8b96b3e8c2089330b5145 Aaron Quint aaronquint@tie-fighter.local