diff options
| author | Andrew Plummer <plummer.andrew@gmail.com> | 2013-01-31 12:01:34 -0600 |
|---|---|---|
| committer | Corey Frang <gnarf@gnarf.net> | 2013-01-31 12:04:32 -0600 |
| commit | d654914fd02412f8d2537279bb8a4db9ecc7095e (patch) | |
| tree | 1c1e37f0d7a5e39a59782dfefc3a7da28647b3ea /src/event.js | |
| parent | d3a2ef7cfec6d798dce8fefa96098bc38b9c5a1d (diff) | |
| download | jquery-d654914fd02412f8d2537279bb8a4db9ecc7095e.tar.gz jquery-d654914fd02412f8d2537279bb8a4db9ecc7095e.zip | |
event: Stricter type checking in trigger - Fixes #13360 - Closes gh-1153
Squashed commit of the following:
commit 5935a362c75ecef04d5ec9775cbcaf2165921e8d
Author: Andrew Plummer <plummer.andrew@gmail.com>
Date: Fri Feb 1 02:40:42 2013 +0900
Using "hasOwnProperty" to check for direct properties "type" and
"namespace" on events before triggering.
(cherry picked from commit f005af54e4983658e3ae504111885921c4dca383)
Diffstat (limited to 'src/event.js')
| -rw-r--r-- | src/event.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/event.js b/src/event.js index 54e08c8e7..4d7d6a895 100644 --- a/src/event.js +++ b/src/event.js @@ -202,8 +202,8 @@ jQuery.event = { var i, cur, tmp, bubbleType, ontype, handle, special, eventPath = [ elem || document ], - type = event.type || event, - namespaces = event.namespace ? event.namespace.split(".") : []; + type = core_hasOwn.call( event, "type" ) ? event.type : event, + namespaces = core_hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : []; cur = tmp = elem = elem || document; |