Merge pull request #161 from canjs/159-dom-events

Add support for the custom event delegation added to can-util

Author: chasenlehara

can-jquery.js

@@ -14,8 +14,9 @@ var getMutationObserver = require("can-globals/mutation-observer/mutation-observ
 var CIDMap = require("can-util/js/cid-map/cid-map");
 var assign = require("can-util/js/assign/assign");
 
-var addEventJQuery = require('can-dom-events/helpers/add-event-jquery');
-var domEnter = require('can-event-dom-enter');
+var addEnterEvent = require('can-event-dom-enter/compat');
+addEnterEvent(domEvents);
+
 
 module.exports = ns.$ = $;
 
@@ -26,8 +27,6 @@ var slice = Array.prototype.slice;
 var removedEventHandlerMap = new CIDMap();
 
 if ($) {
-	addEventJQuery($, domEnter);
-
 	// Override dispatch to use $.trigger.
 	// This is needed so that extra arguments can be used
 	// when using domEvents.dispatch/domEvents.trigger.
@@ -138,6 +137,7 @@ if ($) {
 	var delegateEventType = function delegateEventType(type) {
 		var typeMap = {
 			focus: 'focusin',
+			enter: 'keyup',
 			blur: 'focusout'
 		};
 		return typeMap[type] || type;