Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

added destroymethod to cleanup listener #428

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
104 changes: 71 additions & 33 deletions mousetrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@
*
* @param {Element|HTMLDocument} object
* @param {string} type
* @param {Function} callback
* @param {EventListenerOrEventListenerObject} callback
* @returns void
*/
function _addEvent(object, type, callback) {
Expand All @@ -181,6 +181,21 @@

object.attachEvent('on' + type, callback);
}
/**
* cross browser remove event method
*
* @param {Element|HTMLDocument} object
* @param {string} type
* @param {EventListenerOrEventListenerObject} callback
* @returns void
*/
function _removeEvent (object, type, callback) {
if (object.removeEventListener) {
object.removeEventListener(type, callback, false);
return;
}
object.detachEvent('on' + type, callback);
}

/**
* takes the event and returns the key character
Expand Down Expand Up @@ -707,35 +722,6 @@
_ignoreNextKeypress = processedSequenceCallback && e.type == 'keydown';
};

/**
* handles a keydown event
*
* @param {Event} e
* @returns void
*/
function _handleKeyEvent(e) {

// normalize e.which for key events
// @see http://stackoverflow.com/questions/4285627/javascript-keycode-vs-charcode-utter-confusion
if (typeof e.which !== 'number') {
e.which = e.keyCode;
}

var character = _characterFromEvent(e);

// no character found then stop
if (!character) {
return;
}

// need to use === for the character check because the character can be 0
if (e.type == 'keyup' && _ignoreNextKeyup === character) {
_ignoreNextKeyup = false;
return;
}

self.handleKey(character, _eventModifiers(e), e);
}

/**
* called to set a 1 second timeout on the specified sequence
Expand Down Expand Up @@ -885,12 +871,64 @@
}
};

/**
* handles a keydown event
*
* @param {Event} e
* @returns void
*/
self._handleKeyEvent = function (e) {

// normalize e.which for key events
// @see http://stackoverflow.com/questions/4285627/javascript-keycode-vs-charcode-utter-confusion
if (typeof e.which !== 'number') {
e.which = e.keyCode;
}

var character = _characterFromEvent(e);

// no character found then stop
if (!character) {
return;
}

// need to use === for the character check because the character can be 0
if (e.type == 'keyup' && _ignoreNextKeyup === character) {
_ignoreNextKeyup = false;
return;
}

self.handleKey(character, _eventModifiers(e), e);
}

// start!
_addEvent(targetElement, 'keypress', _handleKeyEvent);
_addEvent(targetElement, 'keydown', _handleKeyEvent);
_addEvent(targetElement, 'keyup', _handleKeyEvent);
_addEvent(targetElement, 'keypress', self._handleKeyEvent);
_addEvent(targetElement, 'keydown', self._handleKeyEvent);
_addEvent(targetElement, 'keyup', self._handleKeyEvent);
}

/**
* destroy mousetrap object
*
* - call reset on the mousetrap object ( removing all binding )
* - remove all javascript event listener from target element or document
* - remove all reference to target
*
* @return void
*/

Mousetrap.prototype.destroy = function () {
var self = this

self.reset()

_removeEvent(self.target, 'keypress', self._handleKeyEvent);
_removeEvent(self.target, 'keydown', self._handleKeyEvent);
_removeEvent(self.target, 'keyup', self._handleKeyEvent);

self.target = undefined
self._handleKeyEvent = undefined
}
/**
* binds an event to mousetrap
*
Expand Down
12 changes: 1 addition & 11 deletions mousetrap.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.