Skip to content

Commit 181bbc2

Browse files
authored
Merge pull request #160 from canjs/fix-tests
Only set up custom events with jQuery if $ is defined
2 parents 9003519 + b708d79 commit 181bbc2

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

can-jquery.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ var assign = require("can-util/js/assign/assign");
1616

1717
var addEventJQuery = require('can-dom-events/helpers/add-event-jquery');
1818
var domEnter = require('can-event-dom-enter');
19-
addEventJQuery($, domEnter);
2019

2120
module.exports = ns.$ = $;
2221

@@ -27,6 +26,8 @@ var slice = Array.prototype.slice;
2726
var removedEventHandlerMap = new CIDMap();
2827

2928
if ($) {
29+
addEventJQuery($, domEnter);
30+
3031
// Override dispatch to use $.trigger.
3132
// This is needed so that extra arguments can be used
3233
// when using domEvents.dispatch/domEvents.trigger.

0 commit comments

Comments
 (0)