Merge in data_nocollide branch. Fixes #6968, improves unit testing framework checks...

[jquery.git] / src / event.js

diff --git a/src/event.js b/src/event.js
index 7fa5488..2ddf288 100644 (file)
--- a/src/event.js
+++ b/src/event.js
@@ -607,7 +607,7 @@ jQuery.Event = function( src ) {
 
                // Events bubbling up the document may have been marked as prevented
                // by a handler lower down the tree; reflect the correct value.
-               this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false ||
+               this.isDefaultPrevented = (src.defaultPrevented || src.returnValue === false || 
                        src.getPreventDefault && src.getPreventDefault()) ? returnTrue : returnFalse;
 
        // Event type