Skip to content

Commit

Permalink
Merge branch 'master' of git://github.com/jquery/jquery
Browse files Browse the repository at this point in the history
Conflicts:
	test/delegatetest.html
  • Loading branch information
jaubourg committed Dec 21, 2009
2 parents 67d61fd + d7a0023 commit 592806b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions test/delegatetest.html
Expand Up @@ -111,12 +111,12 @@ <h2>Submit Tests</h2>
$(".radio_test").live("change",makeChangeFunc("#radio"))
$('textarea').live('change', makeChangeFunc("#textarea"))
$('#input').live('change', makeChangeFunc("#text"))
$().bind('change', makeChangeFunc("#boundChange"))
$(document).bind('change', makeChangeFunc("#boundChange"))

$("#text_submit").live("submit", makeChangeFunc("#textSubmit", true) )
$("#password_submit").live("submit", makeChangeFunc("#passwordSubmit", true) )
$("#submit_submit").live("submit", makeChangeFunc("#submitSubmit", true) )
$().bind('submit', makeChangeFunc("#boundSubmit"))
$(document).bind('submit', makeChangeFunc("#boundSubmit"))

</script>
</body>
Expand Down

0 comments on commit 592806b

Please sign in to comment.