aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Gibson <richard.gibson@gmail.com>2013-01-13 20:05:43 -0500
committerRichard Gibson <richard.gibson@gmail.com>2013-01-13 20:05:43 -0500
commita7683d866c87796b1885ea46ec0f7db2e1ef426d (patch)
tree2e937feb830353fd6a328073852ff35db6a9e064
parentf860e0bd2f7dd228a14704d78ed5208cbe870d01 (diff)
downloadjquery-a7683d866c87796b1885ea46ec0f7db2e1ef426d.tar.gz
jquery-a7683d866c87796b1885ea46ec0f7db2e1ef426d.zip
No ticket: sync with master @ b75b9ef8
-rw-r--r--src/event.js5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/event.js b/src/event.js
index 2c319f3e0..6c0dc41ca 100644
--- a/src/event.js
+++ b/src/event.js
@@ -237,7 +237,6 @@ jQuery.event = {
new jQuery.Event( type, typeof event === "object" && event );
event.isTrigger = true;
- event.type = type;
event.namespace = namespaces.join(".");
event.namespace_re = event.namespace ?
new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
@@ -467,8 +466,8 @@ jQuery.event = {
event.target = originalEvent.srcElement || document;
}
- // Support: Safari
- // Target should not be a text node (#504)
+ // Support: Chrome 23+, Safari?
+ // Target should not be a text node (#504, #13143)
if ( event.target.nodeType === 3 ) {
event.target = event.target.parentNode;
}