diff options
| author | John Resig <jeresig@gmail.com> | 2011-04-12 16:05:40 -0400 |
|---|---|---|
| committer | John Resig <jeresig@gmail.com> | 2011-04-12 16:05:40 -0400 |
| commit | 978c0655550ffbe32d977dbc997082e287c3a2b8 (patch) | |
| tree | ad219d7cc4850f8def53f4d7aaed841c345447b9 /src/event.js | |
| parent | e7787cd09805583ff690d9c5e4b4c58a88393bf9 (diff) | |
| parent | 82626799cacef94a1b35d0a0b4d284b38104704b (diff) | |
| download | jquery-978c0655550ffbe32d977dbc997082e287c3a2b8.tar.gz jquery-978c0655550ffbe32d977dbc997082e287c3a2b8.zip | |
Merge branch 'Sub_Naming' of https://github.com/timmywil/jquery into timmywil-Sub_Naming
Conflicts:
src/core.js
src/css.js
src/event.js
Diffstat (limited to 'src/event.js')
| -rw-r--r-- | src/event.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/event.js b/src/event.js index 275afdf93..d6b116d2e 100644 --- a/src/event.js +++ b/src/event.js @@ -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 = [], |