Added a fix for IE for binding events onto IFrame content.
This commit is contained in:
parent
8a97cd67ef
commit
0027439156
1 changed files with 17 additions and 11 deletions
28
jquery/jquery.js
vendored
28
jquery/jquery.js
vendored
|
@ -13,7 +13,7 @@
|
||||||
window.undefined = window.undefined;
|
window.undefined = window.undefined;
|
||||||
|
|
||||||
// Map over the $ in case of overwrite
|
// Map over the $ in case of overwrite
|
||||||
if ( $ ) var ._$ = $;
|
if ( $ ) var _$ = $;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new jQuery Object
|
* Create a new jQuery Object
|
||||||
|
@ -804,15 +804,20 @@ jQuery.event = {
|
||||||
},
|
},
|
||||||
|
|
||||||
handle: function(event) {
|
handle: function(event) {
|
||||||
if ( !event && !window.event ) return;
|
// Handle adding events to items in IFrames, in IE
|
||||||
|
event = event ||
|
||||||
|
jQuery.event.fix( ((this.ownerDocument || this.document ||
|
||||||
|
this).parentWindow || window).event );
|
||||||
|
|
||||||
|
// If no correct event was found, fail
|
||||||
|
if ( !event ) return;
|
||||||
|
|
||||||
var returnValue = true, handlers = [];
|
var returnValue = true, handlers = [];
|
||||||
event = event || jQuery.event.fix(window.event);
|
|
||||||
|
|
||||||
for ( var j in this.events[event.type] )
|
for ( var j in this.events[event.type] )
|
||||||
handlers[handlers.length] = this.events[event.type][j];
|
handlers[handlers.length] = this.events[event.type][j];
|
||||||
|
|
||||||
for ( var i = 0; i < handlers.length; i++ ) {
|
for ( var i = 0; i < handlers.length; i++ )
|
||||||
if ( handlers[i].constructor == Function ) {
|
if ( handlers[i].constructor == Function ) {
|
||||||
this.handleEvent = handlers[i];
|
this.handleEvent = handlers[i];
|
||||||
if (this.handleEvent(event) === false) {
|
if (this.handleEvent(event) === false) {
|
||||||
|
@ -821,18 +826,19 @@ jQuery.event = {
|
||||||
returnValue = false;
|
returnValue = false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
return returnValue;
|
return returnValue;
|
||||||
},
|
},
|
||||||
|
|
||||||
fix: function(event) {
|
fix: function(event) {
|
||||||
event.preventDefault = function() {
|
if ( event ) {
|
||||||
this.returnValue = false;
|
event.preventDefault = function() {
|
||||||
};
|
this.returnValue = false;
|
||||||
|
};
|
||||||
|
|
||||||
event.stopPropagation = function() {
|
event.stopPropagation = function() {
|
||||||
this.cancelBubble = true;
|
this.cancelBubble = true;
|
||||||
};
|
};
|
||||||
|
}
|
||||||
|
|
||||||
return event;
|
return event;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue