Skip to content

J
jquery
Commit a7683d86 authored by Richard Gibson's avatar Richard Gibson
Browse files
Options

No ticket: sync with master @ b75b9ef8

parent f860e0bd
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 3 deletions
src/event.js
View file @ a7683d86
...@@ -237,7 +237,6 @@ jQuery.event = { ...@@ -237,7 +237,6 @@ jQuery.event = {
new jQuery.Event( type, typeof event === "object" && event ); new jQuery.Event( type, typeof event === "object" && event );
event.isTrigger = true; event.isTrigger = true;
event.type = type;
event.namespace = namespaces.join("."); event.namespace = namespaces.join(".");
event.namespace_re = event.namespace ? event.namespace_re = event.namespace ?
new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) : new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
...@@ -467,8 +466,8 @@ jQuery.event = { ...@@ -467,8 +466,8 @@ jQuery.event = {
event.target = originalEvent.srcElement || document; event.target = originalEvent.srcElement || document;
} }
// Support: Safari // Support: Chrome 23+, Safari?
// Target should not be a text node (#504) // Target should not be a text node (#504, #13143)
if ( event.target.nodeType === 3 ) { if ( event.target.nodeType === 3 ) {
event.target = event.target.parentNode; event.target = event.target.parentNode;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment