deac/jquery
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming

Browse source 
Conflicts:
	src/core.js
	src/css.js
	src/event.js
This commit is contained in:
John Resig 2011-04-12 16:05:40 -04:00
commit 978c065555
3 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/event.js
View file

@ -275,7 +275,7 @@ jQuery.event = {
"changeData": true
},
trigger: function( event, data, elem ) {
trigger: function( event, data, elem, bubbling /* For Internal Use Only */ ) {
// Event object or event type
var type = event.type || event,
namespaces = [],