Skip to content

Commit 68c402c

Browse files
committed
remo jQuery from src/lib/events.js
1 parent 2c51844 commit 68c402c

File tree

1 file changed

+4
-33
lines changed

1 file changed

+4
-33
lines changed

src/lib/events.js

+4-33
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
'use strict';
22

3-
/* global jQuery:false */
4-
53
var EventEmitter = require('events').EventEmitter;
64

75
var Events = {
@@ -56,17 +54,7 @@ var Events = {
5654
plotObj._removeInternalListener = internalEv.removeListener.bind(internalEv);
5755
plotObj._removeAllInternalListeners = internalEv.removeAllListeners.bind(internalEv);
5856

59-
/*
60-
* We must wrap emit to continue to support JQuery events. The idea
61-
* is to check to see if the user is using JQuery events, if they are
62-
* we emit JQuery events to trigger user handlers as well as the EventEmitter
63-
* events.
64-
*/
6557
plotObj.emit = function(event, data) {
66-
if(typeof jQuery !== 'undefined') {
67-
jQuery(plotObj).trigger(event, data);
68-
}
69-
7058
ev.emit(event, data);
7159
internalEv.emit(event, data);
7260
};
@@ -77,29 +65,19 @@ var Events = {
7765
/*
7866
* This function behaves like jQuery's triggerHandler. It calls
7967
* all handlers for a particular event and returns the return value
80-
* of the LAST handler. This function also triggers jQuery's
81-
* triggerHandler for backwards compatibility.
68+
* of the LAST handler.
8269
*/
8370
triggerHandler: function(plotObj, event, data) {
84-
var jQueryHandlerValue;
8571
var nodeEventHandlerValue;
8672

87-
/*
88-
* If jQuery exists run all its handlers for this event and
89-
* collect the return value of the LAST handler function
90-
*/
91-
if(typeof jQuery !== 'undefined') {
92-
jQueryHandlerValue = jQuery(plotObj).triggerHandler(event, data);
93-
}
94-
9573
/*
9674
* Now run all the node style event handlers
9775
*/
9876
var ev = plotObj._ev;
99-
if(!ev) return jQueryHandlerValue;
77+
if(!ev) return;
10078

10179
var handlers = ev._events[event];
102-
if(!handlers) return jQueryHandlerValue;
80+
if(!handlers) return;
10381

10482
// making sure 'this' is the EventEmitter instance
10583
function apply(handler) {
@@ -129,14 +107,7 @@ var Events = {
129107
// now call the final handler and collect its value
130108
nodeEventHandlerValue = apply(handlers[i]);
131109

132-
/*
133-
* Return either the jQuery handler value if it exists or the
134-
* nodeEventHandler value. jQuery event value supersedes nodejs
135-
* events for backwards compatibility reasons.
136-
*/
137-
return jQueryHandlerValue !== undefined ?
138-
jQueryHandlerValue :
139-
nodeEventHandlerValue;
110+
return nodeEventHandlerValue;
140111
},
141112

142113
purge: function(plotObj) {

0 commit comments

Comments
 (0)