scratch – Diff between revs 58 and 125

Subversion Repositories:

?pathlinks?

Rev 58 – Details – Blame – Last modification – View Log

-define( [
+define([
 	"./core",
-	"./var/document",
+	"./var/strundefined",
-	"./var/documentElement",
+	"./var/rnotwhite",
-	"./var/rnothtmlwhite",
+	"./var/hasOwn",
 	"./var/slice",
+	"./event/support",
-	"./data/var/dataPriv",
+	"./data/var/data_priv",
+	"./core/init",
-	"./core/init",
+	"./data/accepts",
 	"./selector"
-], function( jQuery, document, documentElement, rnothtmlwhite, slice, dataPriv ) {
-"use strict";
+], function( jQuery, strundefined, rnotwhite, hasOwn, slice, support, data_priv ) {
 var
+	rkeyEvent = /^key/,
-	rkeyEvent = /^key/,
+	rmouseEvent = /^(?:mouse|pointer|contextmenu)|click/,
-	rmouseEvent = /^(?:mouse|pointer|contextmenu|drag|drop)|click/,
+	rfocusMorph = /^(?:focusinfocus|focusoutblur)$/,
-	rtypenamespace = /^([^.]*)(?:\.(.+)|)/;
+	rtypenamespace = /^([^.]*)(?:\.(.+)|)$/;
 function returnTrue() {
 	return true;
+}
-function returnFalse() {
 	return false;
 function returnFalse() {
 	return false;
 // Support: IE <=9 only
 // See #13393 for more info
-function safeActiveElement() {
-	try {
-		return document.activeElement;
-	} catch ( err ) { }
-}
-function on( elem, types, selector, data, fn, one ) {
-	var origFn, type;
-	// Types can be a map of types/handlers
-	if ( typeof types === "object" ) {
-		// ( types-Object, selector, data )
-		if ( typeof selector !== "string" ) {
-			// ( types-Object, data )
-			data = data || selector;
-			selector = undefined;
-		}
-		for ( type in types ) {
-			on( elem, type, selector, data, types[ type ], one );
-		}
-		return elem;
-	}
-	if ( data == null && fn == null ) {
-		// ( types, fn )
-		fn = selector;
-		data = selector = undefined;
-	} else if ( fn == null ) {
-		if ( typeof selector === "string" ) {
-			// ( types, selector, fn )
-			fn = data;
-			data = undefined;
-		} else {
-			// ( types, data, fn )
-			fn = data;
-			data = selector;
-			selector = undefined;
-		}
-	}
-	if ( fn === false ) {
-		fn = returnFalse;
-	} else if ( !fn ) {
-		return elem;
-	}
-	if ( one === 1 ) {
-		origFn = fn;
-		fn = function( event ) {
-			// Can use an empty set, since event contains the info
-			jQuery().off( event );
-			return origFn.apply( this, arguments );
-		};
-		// Use same guid so caller can remove using origFn
-		fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
 function safeActiveElement() {
-	return elem.each( function() {
+	try {
-		jQuery.event.add( this, types, fn, data, selector );
+		return document.activeElement;
-	} );
+	} catch ( err ) { }
+}
 	add: function( elem, types, handler, data, selector ) {
 		var handleObjIn, eventHandle, tmp,
 			events, t, handleObj,
 			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.get( elem );
+			elemData = data_priv.get( elem );
 		// Don't attach events to noData or text/comment nodes (but allow plain objects)
 		if ( !elemData ) {
 			handleObjIn = handler;
 			handler = handleObjIn.handler;
 			selector = handleObjIn.selector;
+		}
-		// Ensure that invalid selectors throw exceptions at attach time
-		// Evaluate against documentElement in case elem is a non-element node (e.g., document)
-		if ( selector ) {
-			jQuery.find.matchesSelector( documentElement, selector );
-		}
 		// Make sure that the handler has a unique ID, used to find/remove it later
 		if ( !handler.guid ) {
 			handler.guid = jQuery.guid++;
+		}
 		// Init the element's event structure and main handler, if this is the first
-		if ( !( events = elemData.events ) ) {
+		if ( !(events = elemData.events) ) {
 			events = elemData.events = {};
+		}
-		if ( !( eventHandle = elemData.handle ) ) {
-			eventHandle = elemData.handle = function( e ) {
+		if ( !(eventHandle = elemData.handle) ) {
 			eventHandle = elemData.handle = function( e ) {
 				// Discard the second event of a jQuery.event.trigger() and
 				// when an event is called after a page has unloaded
-				return typeof jQuery !== "undefined" && jQuery.event.triggered !== e.type ?
+				return typeof jQuery !== strundefined && jQuery.event.triggered !== e.type ?
 					jQuery.event.dispatch.apply( elem, arguments ) : undefined;
 			};
 		}
 		// Handle multiple events separated by a space
-		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[ 1 ];
+			type = origType = tmp[1];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
 			// Update special based on newly reset type
 			special = jQuery.event.special[ type ] || {};
 			// handleObj is passed to all event handlers
-			handleObj = jQuery.extend( {
+			handleObj = jQuery.extend({
 				type: type,
 				origType: origType,
 				data: data,
 				handler: handler,
 				guid: handler.guid,
 				selector: selector,
 				needsContext: selector && jQuery.expr.match.needsContext.test( selector ),
-				namespace: namespaces.join( "." )
+				namespace: namespaces.join(".")
 			}, handleObjIn );
 			// Init the event handler queue if we're the first
-			if ( !( handlers = events[ type ] ) ) {
+			if ( !(handlers = events[ type ]) ) {
-				handlers = events[ type ] = [];
-				handlers.delegateCount = 0;
+				handlers = events[ type ] = [];
-				// Only use addEventListener if the special events handler returns false
+				handlers.delegateCount = 0;
-				if ( !special.setup ||
-					special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
+				// Only use addEventListener if the special events handler returns false
 				if ( !special.setup || special.setup.call( elem, data, namespaces, eventHandle ) === false ) {
 					if ( elem.addEventListener ) {
-						elem.addEventListener( type, eventHandle );
+						elem.addEventListener( type, eventHandle, false );
 	remove: function( elem, types, handler, selector, mappedTypes ) {
 		var j, origCount, tmp,
 			events, t, handleObj,
 			special, handlers, type, namespaces, origType,
-			elemData = dataPriv.hasData( elem ) && dataPriv.get( elem );
+			elemData = data_priv.hasData( elem ) && data_priv.get( elem );
-		if ( !elemData || !( events = elemData.events ) ) {
+		if ( !elemData || !(events = elemData.events) ) {
 			return;
 		}
 		// Once for each type.namespace in types; type may be omitted
-		types = ( types || "" ).match( rnothtmlwhite ) || [ "" ];
+		types = ( types || "" ).match( rnotwhite ) || [ "" ];
 		t = types.length;
 		while ( t-- ) {
-			tmp = rtypenamespace.exec( types[ t ] ) || [];
+			tmp = rtypenamespace.exec( types[t] ) || [];
-			type = origType = tmp[ 1 ];
+			type = origType = tmp[1];
-			namespaces = ( tmp[ 2 ] || "" ).split( "." ).sort();
+			namespaces = ( tmp[2] || "" ).split( "." ).sort();
+			}
 			special = jQuery.event.special[ type ] || {};
 			type = ( selector ? special.delegateType : special.bindType ) || type;
-			handlers = events[ type ] || [];
-			tmp = tmp[ 2 ] &&
+			handlers = events[ type ] || [];
-				new RegExp( "(^|\\.)" + namespaces.join( "\\.(?:.*\\.|)" ) + "(\\.|$)" );
+			tmp = tmp[2] && new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" );
 			// Remove matching events
 			origCount = j = handlers.length;
 			while ( j-- ) {
 				handleObj = handlers[ j ];
 				if ( ( mappedTypes || origType === handleObj.origType ) &&
-					( !handler || handler.guid === handleObj.guid ) &&
-					( !tmp || tmp.test( handleObj.namespace ) ) &&
+					( !handler || handler.guid === handleObj.guid ) &&
-					( !selector || selector === handleObj.selector ||
+					( !tmp || tmp.test( handleObj.namespace ) ) &&
-						selector === "**" && handleObj.selector ) ) {
+					( !selector || selector === handleObj.selector || selector === "**" && handleObj.selector ) ) {
 					handlers.splice( j, 1 );
+			}
 			// Remove generic event handler if we removed something and no more handlers exist
 			// (avoids potential for endless recursion during removal of special event handlers)
-			if ( origCount && !handlers.length ) {
-				if ( !special.teardown ||
+			if ( origCount && !handlers.length ) {
-					special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
 				if ( !special.teardown || special.teardown.call( elem, namespaces, elemData.handle ) === false ) {
 					jQuery.removeEvent( elem, type, elemData.handle );
+				}
 				delete events[ type ];
 			}
+		}
+		// Remove the expando if it's no longer used
-		// Remove data and the expando if it's no longer used
+		if ( jQuery.isEmptyObject( events ) ) {
-		if ( jQuery.isEmptyObject( events ) ) {
+			delete elemData.handle;
-			dataPriv.remove( elem, "handle events" );
+			data_priv.remove( elem, "events" );
 		}
 	},
+	trigger: function( event, data, elem, onlyHandlers ) {
-	dispatch: function( nativeEvent ) {
-		// Make a writable jQuery.Event from the native event object
-		var event = jQuery.event.fix( nativeEvent );
+		var i, cur, tmp, bubbleType, ontype, handle, special,
+			eventPath = [ elem || document ],
+			type = hasOwn.call( event, "type" ) ? event.type : event,
+			namespaces = hasOwn.call( event, "namespace" ) ? event.namespace.split(".") : [];
+		cur = tmp = elem = elem || document;
+		// Don't do events on text and comment nodes
+		if ( elem.nodeType === 3 || elem.nodeType === 8 ) {
+			return;
+		}
+		// focus/blur morphs to focusin/out; ensure we're not firing them right now
+		if ( rfocusMorph.test( type + jQuery.event.triggered ) ) {
+			return;
+		}
+		if ( type.indexOf(".") >= 0 ) {
+			// Namespaced trigger; create a regexp to match event type in handle()
+			namespaces = type.split(".");
+			type = namespaces.shift();
+			namespaces.sort();
+		}
+		ontype = type.indexOf(":") < 0 && "on" + type;
+		// Caller can pass in a jQuery.Event object, Object, or just an event type string
+		event = event[ jQuery.expando ] ?
+			event :
+			new jQuery.Event( type, typeof event === "object" && event );
+		// Trigger bitmask: & 1 for native handlers; & 2 for jQuery (always true)
+		event.isTrigger = onlyHandlers ? 2 : 3;
+		event.namespace = namespaces.join(".");
+		event.namespace_re = event.namespace ?
+			new RegExp( "(^|\\.)" + namespaces.join("\\.(?:.*\\.|)") + "(\\.|$)" ) :
+			null;
+		// Clean up the event in case it is being reused
+		event.result = undefined;
+		if ( !event.target ) {
+			event.target = elem;
+		}
+		// Clone any incoming data and prepend the event, creating the handler arg list
+		data = data == null ?
+			[ event ] :
+			jQuery.makeArray( data, [ event ] );
+		// Allow special events to draw outside the lines
+		special = jQuery.event.special[ type ] || {};
+		if ( !onlyHandlers && special.trigger && special.trigger.apply( elem, data ) === false ) {
+			return;
+		}
-		var i, j, ret, matched, handleObj, handlerQueue,
+		// Determine event propagation path in advance, per W3C events spec (#9951)
-			args = new Array( arguments.length ),
+		// Bubble up to document, then to window; watch for a global ownerDocument var (#9724)
+		if ( !onlyHandlers && !special.noBubble && !jQuery.isWindow( elem ) ) {
+			bubbleType = special.delegateType || type;
+			if ( !rfocusMorph.test( bubbleType + type ) ) {
+				cur = cur.parentNode;
+			}
+			for ( ; cur; cur = cur.parentNode ) {
-			handlers = ( dataPriv.get( this, "events" ) || {} )[ event.type ] || [],
+				eventPath.push( cur );
+				tmp = cur;
+			}
+			// Only add window if we got to document (e.g., not plain obj or detached DOM)
+			if ( tmp === (elem.ownerDocument || document) ) {
+				eventPath.push( tmp.defaultView || tmp.parentWindow || window );
+			}
+		}
+		// Fire handlers on the event path
+		i = 0;
+		while ( (cur = eventPath[i++]) && !event.isPropagationStopped() ) {
+			event.type = i > 1 ?
+				bubbleType :
+				special.bindType || type;
+			// jQuery handler
+			handle = ( data_priv.get( cur, "events" ) || {} )[ event.type ] && data_priv.get( cur, "handle" );
+			if ( handle ) {
+				handle.apply( cur, data );
+			}
+			// Native handler
+			handle = ontype && cur[ ontype ];
+			if ( handle && handle.apply && jQuery.acceptData( cur ) ) {
+				event.result = handle.apply( cur, data );
+				if ( event.result === false ) {
+					event.preventDefault();
+				}
+			}
+		}
+		event.type = type;
+		// If nobody prevented the default action, do it now
+		if ( !onlyHandlers && !event.isDefaultPrevented() ) {
+			if ( (!special._default || special._default.apply( eventPath.pop(), data ) === false) &&
+				jQuery.acceptData( elem ) ) {
+				// Call a native DOM method on the target with the same name name as the event.
+				// Don't do default actions on window, that's where global variables be (#6170)
+				if ( ontype && jQuery.isFunction( elem[ type ] ) && !jQuery.isWindow( elem ) ) {
+					// Don't re-trigger an onFOO event when we call its FOO() method
+					tmp = elem[ ontype ];
+					if ( tmp ) {
+						elem[ ontype ] = null;
+					}
+					// Prevent re-triggering of the same event, since we already bubbled it above
+					jQuery.event.triggered = type;
+					elem[ type ]();
+					jQuery.event.triggered = undefined;
+					if ( tmp ) {
+						elem[ ontype ] = tmp;
+					}
+				}
+			}
+		}
+		return event.result;
+	},
+	dispatch: function( event ) {
+		// Make a writable jQuery.Event from the native event object
+		event = jQuery.event.fix( event );
 			special = jQuery.event.special[ event.type ] || {};
 		var i, j, ret, matched, handleObj,
-		// Use the fix-ed jQuery.Event rather than the (read-only) native event
+			handlerQueue = [],
-		args[ 0 ] = event;
+			args = slice.call( arguments ),
 		// Determine handlers
 		handlerQueue = jQuery.event.handlers.call( this, event, handlers );
 		// Run delegates first; they may want to stop propagation beneath us
 		i = 0;
-		while ( ( matched = handlerQueue[ i++ ] ) && !event.isPropagationStopped() ) {
+		while ( (matched = handlerQueue[ i++ ]) && !event.isPropagationStopped() ) {
 			event.currentTarget = matched.elem;
-			j = 0;
-			while ( ( handleObj = matched.handlers[ j++ ] ) &&
+			j = 0;
-				!event.isImmediatePropagationStopped() ) {
+			while ( (handleObj = matched.handlers[ j++ ]) && !event.isImmediatePropagationStopped() ) {
 				// Triggered event must either 1) have no namespace, or 2) have namespace(s)
 				// a subset or equal to those in the bound event (both can have no namespace).
-				if ( !event.rnamespace || event.rnamespace.test( handleObj.namespace ) ) {
+				if ( !event.namespace_re || event.namespace_re.test( handleObj.namespace ) ) {
 					event.handleObj = handleObj;
 					event.data = handleObj.data;
-					ret = ( ( jQuery.event.special[ handleObj.origType ] || {} ).handle ||
+					ret = ( (jQuery.event.special[ handleObj.origType ] || {}).handle || handleObj.handler )
-						handleObj.handler ).apply( matched.elem, args );
+							.apply( matched.elem, args );
 					if ( ret !== undefined ) {
 		return event.result;
 	},
 	handlers: function( event, handlers ) {
-		var i, handleObj, sel, matchedHandlers, matchedSelectors,
+		var i, matches, sel, handleObj,
 			handlerQueue = [],
 			delegateCount = handlers.delegateCount,
-			cur = event.target;
-		// Find delegate handlers
-		if ( delegateCount &&
+			cur = event.target;
-			// Support: IE <=9
-			// Black-hole SVG <use> instance trees (trac-13180)
-			cur.nodeType &&
-			// Support: Firefox <=42
-			// Suppress spec-violating clicks indicating a non-primary pointer button (trac-3861)
-			// https://www.w3.org/TR/DOM-Level-3-Events/#event-type-click
+		// Find delegate handlers
-			// Support: IE 11 only
+		// Black-hole SVG <use> instance trees (#13180)
-			// ...but not arrow key "clicks" of radio inputs, which can have `button` -1 (gh-2343)
-			!( event.type === "click" && event.button >= 1 ) ) {
+		// Avoid non-left-click bubbling in Firefox (#3861)
+		if ( delegateCount && cur.nodeType && (!event.button || event.type !== "click") ) {
-			for ( ; cur !== this; cur = cur.parentNode || this ) {
-				// Don't check non-elements (#13208)
+			for ( ; cur !== this; cur = cur.parentNode || this ) {
 				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-				if ( cur.nodeType === 1 && !( event.type === "click" && cur.disabled === true ) ) {
+				// Don't process clicks on disabled elements (#6911, #8165, #11382, #11764)
-					matchedHandlers = [];
+				if ( cur.disabled !== true || event.type !== "click" ) {
-					matchedSelectors = {};
+					matches = [];
 					for ( i = 0; i < delegateCount; i++ ) {
 						handleObj = handlers[ i ];
 						// Don't conflict with Object.prototype properties (#13203)
 						sel = handleObj.selector + " ";
-						if ( matchedSelectors[ sel ] === undefined ) {
+						if ( matches[ sel ] === undefined ) {
-							matchedSelectors[ sel ] = handleObj.needsContext ?
+							matches[ sel ] = handleObj.needsContext ?
-								jQuery( sel, this ).index( cur ) > -1 :
+								jQuery( sel, this ).index( cur ) >= 0 :
 								jQuery.find( sel, this, null, [ cur ] ).length;
+						}
-						if ( matchedSelectors[ sel ] ) {
+						if ( matches[ sel ] ) {
-							matchedHandlers.push( handleObj );
+							matches.push( handleObj );
+						}
+					}
-					if ( matchedHandlers.length ) {
-						handlerQueue.push( { elem: cur, handlers: matchedHandlers } );
+					if ( matches.length ) {
-					}
+						handlerQueue.push({ elem: cur, handlers: matches });
+					}
+				}
+			}
+		}
-		// Add the remaining (directly-bound) handlers
-		cur = this;
+		// Add the remaining (directly-bound) handlers
 		if ( delegateCount < handlers.length ) {
-			handlerQueue.push( { elem: cur, handlers: handlers.slice( delegateCount ) } );
+			handlerQueue.push({ elem: this, handlers: handlers.slice( delegateCount ) });
-		}
+		}
-		return handlerQueue;
-	},
+		return handlerQueue;
+	},
-	addProp: function( name, hook ) {
-		Object.defineProperty( jQuery.Event.prototype, name, {
-			enumerable: true,
+	// Includes some event props shared by KeyEvent and MouseEvent
-			configurable: true,
+	props: "altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),
-			get: jQuery.isFunction( hook ) ?
-				function() {
+	fixHooks: {},
+	keyHooks: {
+		props: "char charCode key keyCode".split(" "),
+		filter: function( event, original ) {
-					if ( this.originalEvent ) {
+			// Add which for key events
-							return hook( this.originalEvent );
+			if ( event.which == null ) {
-					}
+				event.which = original.charCode != null ? original.charCode : original.keyCode;
+			}
+			return event;
+		}
-				} :
+	},
-				function() {
+	mouseHooks: {
+		props: "button buttons clientX clientY offsetX offsetY pageX pageY screenX screenY toElement".split(" "),
+		filter: function( event, original ) {
-					if ( this.originalEvent ) {
+			var eventDoc, doc, body,
+				button = original.button;
+			// Calculate pageX/Y if missing and clientX/Y available
+			if ( event.pageX == null && original.clientX != null ) {
+				eventDoc = event.target.ownerDocument || document;
-							return this.originalEvent[ name ];
+				doc = eventDoc.documentElement;
+				body = eventDoc.body;
-					}
+				event.pageX = original.clientX + ( doc && doc.scrollLeft || body && body.scrollLeft || 0 ) - ( doc && doc.clientLeft || body && body.clientLeft || 0 );
-				},
+				event.pageY = original.clientY + ( doc && doc.scrollTop  || body && body.scrollTop  || 0 ) - ( doc && doc.clientTop  || body && body.clientTop  || 0 );
+			}
-			set: function( value ) {
-				Object.defineProperty( this, name, {
+			// Add which for click: 1 === left; 2 === middle; 3 === right
+			// Note: button is not normalized, so don't use it
+			if ( !event.which && button !== undefined ) {
+				event.which = ( button & 1 ? 1 : ( button & 2 ? 3 : ( button & 4 ? 2 : 0 ) ) );
+			}
+			return event;
-					enumerable: true,
+		}
+	},
+	fix: function( event ) {
+		if ( event[ jQuery.expando ] ) {
+			return event;
+		}
+		// Create a writable copy of the event object and normalize some properties
+		var i, prop, copy,
+			type = event.type,
-					configurable: true,
+			originalEvent = event,
+			fixHook = this.fixHooks[ type ];
+		if ( !fixHook ) {
+			this.fixHooks[ type ] = fixHook =
+				rmouseEvent.test( type ) ? this.mouseHooks :
+				rkeyEvent.test( type ) ? this.keyHooks :
+				{};
+		}
+		copy = fixHook.props ? this.props.concat( fixHook.props ) : this.props;
+		event = new jQuery.Event( originalEvent );
+		i = copy.length;
+		while ( i-- ) {
+			prop = copy[ i ];
+			event[ prop ] = originalEvent[ prop ];
+		}
+		// Support: Cordova 2.5 (WebKit) (#13255)
+		// All events should have a target; Cordova deviceready doesn't
-					writable: true,
+		if ( !event.target ) {
-					value: value
+			event.target = document;
 				} );
-			}
 		} );
-	},
+		// Support: Safari 6.0+, Chrome<28
 		// Target should not be a text node (#504, #13143)
-	fix: function( originalEvent ) {
+		if ( event.target.nodeType === 3 ) {
-		return originalEvent[ jQuery.expando ] ?
-			originalEvent :
+			event.target = event.target.parentNode;
 			new jQuery.Event( originalEvent );
 	},
 		return fixHook.filter ? fixHook.filter( event, originalEvent ) : event;
-	special: {
+	},
+				}
 			},
 			delegateType: "focusout"
 		},
 		click: {
 			// For checkbox, fire native event so checked state will be right
 			trigger: function() {
 				if ( this.type === "checkbox" && this.click && jQuery.nodeName( this, "input" ) ) {
 					this.click();
 					return false;
 				if ( event.result !== undefined && event.originalEvent ) {
 					event.originalEvent.returnValue = event.result;
+				}
+			}
+		}
+	},
+	simulate: function( type, elem, event, bubble ) {
+		// Piggyback on a donor event to simulate a different one.
+		// Fake originalEvent to avoid donor's stopPropagation, but if the
+		// simulated event prevents default then we do the same on the donor.
+		var e = jQuery.extend(
+			new jQuery.Event(),
+			event,
+			{
+				type: type,
+				isSimulated: true,
+				originalEvent: {}
+			}
+		);
+		if ( bubble ) {
+			jQuery.event.trigger( e, null, elem );
+		} else {
+			jQuery.event.dispatch.call( elem, e );
+		}
+		if ( e.isDefaultPrevented() ) {
+			event.preventDefault();
+		}
+	}
 };
-jQuery.removeEvent = function( elem, type, handle ) {
-	// This "if" is needed for plain objects
+jQuery.removeEvent = function( elem, type, handle ) {
 	if ( elem.removeEventListener ) {
-		elem.removeEventListener( type, handle );
+		elem.removeEventListener( type, handle, false );
+	}
 };
 jQuery.Event = function( src, props ) {
+jQuery.Event = function( src, props ) {
 	// Allow instantiation without the 'new' keyword
-	if ( !( this instanceof jQuery.Event ) ) {
+	if ( !(this instanceof jQuery.Event) ) {
 		return new jQuery.Event( src, props );
+	}
 		// 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.defaultPrevented === undefined &&
+				src.defaultPrevented === undefined &&
-				// Support: Android <=2.3 only
+				// Support: Android<4.0
 				src.returnValue === false ?
 			returnTrue :
-			returnFalse;
-		// Create target properties
-		// Support: Safari <=6 - 7 only
-		// Target should not be a text node (#504, #13143)
-		this.target = ( src.target && src.target.nodeType === 3 ) ?
-			src.target.parentNode :
-			src.target;
-		this.currentTarget = src.currentTarget;
-		this.relatedTarget = src.relatedTarget;
+			returnFalse;
 	// Event type
 	} else {
 	// Mark it as fixed
 	this[ jQuery.expando ] = true;
 };
 // jQuery.Event is based on DOM3 Events as specified by the ECMAScript Language Binding
-// https://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
+// http://www.w3.org/TR/2003/WD-DOM-Level-3-Events-20030331/ecma-script-binding.html
-jQuery.Event.prototype = {
-	constructor: jQuery.Event,
+jQuery.Event.prototype = {
 	isDefaultPrevented: returnFalse,
 	isPropagationStopped: returnFalse,
-	isImmediatePropagationStopped: returnFalse,
-	isSimulated: false,
+	isImmediatePropagationStopped: returnFalse,
 	preventDefault: function() {
 		var e = this.originalEvent;
 		this.isDefaultPrevented = returnTrue;
-		if ( e && !this.isSimulated ) {
+		if ( e && e.preventDefault ) {
 			e.preventDefault();
+		}
 	},
 	stopPropagation: function() {
 		var e = this.originalEvent;
 		this.isPropagationStopped = returnTrue;
-		if ( e && !this.isSimulated ) {
+		if ( e && e.stopPropagation ) {
 			e.stopPropagation();
+		}
 	},
 	stopImmediatePropagation: function() {
 		var e = this.originalEvent;
-		this.isImmediatePropagationStopped = returnTrue;
-		if ( e && !this.isSimulated ) {
-			e.stopImmediatePropagation();
-		}
-		this.stopPropagation();
-	}
-};
-// Includes all common event props including KeyEvent and MouseEvent specific props
-jQuery.each( {
-	altKey: true,
-	bubbles: true,
-	cancelable: true,
-	changedTouches: true,
-	ctrlKey: true,
-	detail: true,
-	eventPhase: true,
-	metaKey: true,
-	pageX: true,
-	pageY: true,
-	shiftKey: true,
-	view: true,
-	"char": true,
-	charCode: true,
-	key: true,
-	keyCode: true,
-	button: true,
-	buttons: true,
-	clientX: true,
-	clientY: true,
-	offsetX: true,
-	offsetY: true,
-	pointerId: true,
-	pointerType: true,
-	screenX: true,
-	screenY: true,
-	targetTouches: true,
-	toElement: true,
-	touches: true,
-	which: function( event ) {
-		var button = event.button;
-		// Add which for key events
-		if ( event.which == null && rkeyEvent.test( event.type ) ) {
-			return event.charCode != null ? event.charCode : event.keyCode;
-		}
-		// Add which for click: 1 === left; 2 === middle; 3 === right
-		if ( !event.which && button !== undefined && rmouseEvent.test( event.type ) ) {
-			if ( button & 1 ) {
-				return 1;
-			}
-			if ( button & 2 ) {
-				return 3;
-			}
-			if ( button & 4 ) {
-				return 2;
+		this.isImmediatePropagationStopped = returnTrue;
-			}
-			return 0;
-		}
-		return event.which;
-	}
-}, jQuery.event.addProp );
+		if ( e && e.stopImmediatePropagation ) {
 			e.stopImmediatePropagation();
 // Create mouseenter/leave events using mouseover/out and event-time checks
 // so that event delegation works in jQuery.
-// Do the same for pointerenter/pointerleave and pointerover/pointerout
+		this.stopPropagation();
 //
 			var ret,
 				target = this,
 				related = event.relatedTarget,
 				handleObj = event.handleObj;
-			// For mouseenter/leave call the handler if related is outside the target.
+			// For mousenter/leave call the handler if related is outside the target.
 			// NB: No relatedTarget if the mouse left/entered the browser window
-			if ( !related || ( related !== target && !jQuery.contains( target, related ) ) ) {
+			if ( !related || (related !== target && !jQuery.contains( target, related )) ) {
 				event.type = handleObj.origType;
 				ret = handleObj.handler.apply( this, arguments );
 				event.type = fix;
+			}
 			return ret;
+		}
 	};
+});
+// Support: Firefox, Chrome, Safari
+// Create "bubbling" focus and blur events
+if ( !support.focusinBubbles ) {
+	jQuery.each({ focus: "focusin", blur: "focusout" }, function( orig, fix ) {
+		// Attach a single capturing handler on the document while someone wants focusin/focusout
+		var handler = function( event ) {
+				jQuery.event.simulate( fix, event.target, jQuery.event.fix( event ), true );
+			};
+		jQuery.event.special[ fix ] = {
+			setup: function() {
+				var doc = this.ownerDocument || this,
+					attaches = data_priv.access( doc, fix );
+				if ( !attaches ) {
+					doc.addEventListener( orig, handler, true );
+				}
+				data_priv.access( doc, fix, ( attaches || 0 ) + 1 );
+			},
+			teardown: function() {
+				var doc = this.ownerDocument || this,
+					attaches = data_priv.access( doc, fix ) - 1;
+				if ( !attaches ) {
+					doc.removeEventListener( orig, handler, true );
+					data_priv.remove( doc, fix );
+				} else {
+					data_priv.access( doc, fix, attaches );
+				}
+			}
+		};
+	});
+}
+jQuery.fn.extend({
+	on: function( types, selector, data, fn, /*INTERNAL*/ one ) {
+		var origFn, type;
+		// Types can be a map of types/handlers
+		if ( typeof types === "object" ) {
+			// ( types-Object, selector, data )
+			if ( typeof selector !== "string" ) {
+				// ( types-Object, data )
+				data = data || selector;
+				selector = undefined;
+			}
+			for ( type in types ) {
+				this.on( type, selector, data, types[ type ], one );
+			}
+			return this;
+		}
+		if ( data == null && fn == null ) {
+			// ( types, fn )
+			fn = selector;
+			data = selector = undefined;
+		} else if ( fn == null ) {
+			if ( typeof selector === "string" ) {
+				// ( types, selector, fn )
+				fn = data;
+				data = undefined;
+			} else {
+				// ( types, data, fn )
+				fn = data;
+				data = selector;
+				selector = undefined;
+			}
+		}
-} );
+		if ( fn === false ) {
+			fn = returnFalse;
+		} else if ( !fn ) {
+			return this;
+		}
+		if ( one === 1 ) {
+			origFn = fn;
+			fn = function( event ) {
+				// Can use an empty set, since event contains the info
+				jQuery().off( event );
+				return origFn.apply( this, arguments );
+			};
+			// Use same guid so caller can remove using origFn
-jQuery.fn.extend( {
+			fn.guid = origFn.guid || ( origFn.guid = jQuery.guid++ );
+		}
 		return this.each( function() {
-	on: function( types, selector, data, fn ) {
+			jQuery.event.add( this, types, fn, data, selector );
-		return on( this, types, selector, data, fn );
+		});
 	},
 	one: function( types, selector, data, fn ) {
-		return on( this, types, selector, data, fn, 1 );
+		return this.on( types, selector, data, fn, 1 );
 	},
-	off: function( types, selector, fn ) {
-		var handleObj, type;
+	off: function( types, selector, fn ) {
-		if ( types && types.preventDefault && types.handleObj ) {
+		var handleObj, type;
 		if ( types && types.preventDefault && types.handleObj ) {
-			// ( event )  dispatched jQuery.Event
-			handleObj = types.handleObj;
+			// ( event )  dispatched jQuery.Event
-			jQuery( types.delegateTarget ).off(
-				handleObj.namespace ?
+			handleObj = types.handleObj;
-					handleObj.origType + "." + handleObj.namespace :
+			jQuery( types.delegateTarget ).off(
-					handleObj.origType,
+				handleObj.namespace ? handleObj.origType + "." + handleObj.namespace : handleObj.origType,
 				handleObj.selector,
 				handleObj.handler
 			);
-			return this;
 			return this;
 		if ( typeof types === "object" ) {
 		if ( typeof types === "object" ) {
 			// ( types-object [, selector] )
 			for ( type in types ) {
 				this.off( type, selector, types[ type ] );
+			}
-			return this;
 			return this;
 		if ( selector === false || typeof selector === "function" ) {
 		if ( selector === false || typeof selector === "function" ) {
 			// ( types [, fn] )
 			fn = selector;
 			selector = undefined;
+		}
 		if ( fn === false ) {
 			fn = returnFalse;
 		}
+		return this.each(function() {
+			jQuery.event.remove( this, types, fn, selector );
+		});
+	},
+	trigger: function( type, data ) {
+		return this.each(function() {
+			jQuery.event.trigger( type, data, this );
+		});
+	},
+	triggerHandler: function( type, data ) {
+		var elem = this[0];
-		return this.each( function() {
+		if ( elem ) {
-			jQuery.event.remove( this, types, fn, selector );
+			return jQuery.event.trigger( type, data, elem, true );
 		} );
 	}