From 63d1b25480877c2f9a0cd0ac7edbb1132f474842 Mon Sep 17 00:00:00 2001 From: Chasen Le Hara Date: Wed, 20 Dec 2017 11:21:12 -0800 Subject: [PATCH 1/3] Revert "Only set up custom events with jQuery if $ is defined" This reverts commit b708d797f745ddd9975d4aab872ca7137d74dbc7. --- can-jquery.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/can-jquery.js b/can-jquery.js index 5361038..67d5eae 100644 --- a/can-jquery.js +++ b/can-jquery.js @@ -16,6 +16,7 @@ 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'); +addEventJQuery($, domEnter); 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. From ed63cdb7ee66ec838e00dbc35c20cbde0f0cc426 Mon Sep 17 00:00:00 2001 From: Chasen Le Hara Date: Wed, 20 Dec 2017 11:21:19 -0800 Subject: [PATCH 2/3] Revert "Fix custom event delegation added to can-util" This reverts commit bff0afc85844fc736e5918387fc73fe9570f7bd9. --- can-jquery.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/can-jquery.js b/can-jquery.js index 67d5eae..44094a4 100644 --- a/can-jquery.js +++ b/can-jquery.js @@ -14,9 +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'); -addEventJQuery($, domEnter); +var addEnterEvent = require('can-event-dom-enter/compat'); +addEnterEvent(domEvents); + module.exports = ns.$ = $; From 32c389f9de3d2f315aa0d84a5c300c4da9beea7a Mon Sep 17 00:00:00 2001 From: Chasen Le Hara Date: Tue, 26 Dec 2017 13:20:55 -0800 Subject: [PATCH 3/3] Add support for the custom event delegation added to can-util This makes can-jquery compatible with the custom event delegation added to can-util 3.10.17: https://github.com/canjs/can-util/releases/tag/v3.10.17 --- can-jquery.js | 1 + 1 file changed, 1 insertion(+) diff --git a/can-jquery.js b/can-jquery.js index 44094a4..b9cf811 100644 --- a/can-jquery.js +++ b/can-jquery.js @@ -137,6 +137,7 @@ if ($) { var delegateEventType = function delegateEventType(type) { var typeMap = { focus: 'focusin', + enter: 'keyup', blur: 'focusout' }; return typeMap[type] || type;