IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

DEV: Update Mousetrap to 1.6.3

Browse Source
This commit is contained in:
Penar Musaraj 2019-03-25 10:01:55 -04:00
parent 8d098df289
commit 4452332077
3 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -9,8 +9,8 @@
"@fortawesome/fontawesome-free": "5.7.2", "@fortawesome/fontawesome-free": "5.7.2",
"ace-builds": "1.4.2", "ace-builds": "1.4.2",
"bootbox": "3.2.0", "bootbox": "3.2.0",
"chart.js": "2.7.3",
"bootstrap": "v3.4.1", "bootstrap": "v3.4.1",
"chart.js": "2.7.3",
"favcount": "https://github.com/chrishunt/favcount", "favcount": "https://github.com/chrishunt/favcount",
"handlebars": "4.0.12", "handlebars": "4.0.12",
"highlight.js": "https://github.com/highlightjs/highlight.js", "highlight.js": "https://github.com/highlightjs/highlight.js",

16
vendor/assets/javascripts/mousetrap.js vendored
View File

@ -17,7 +17,7 @@
* Mousetrap is a simple keyboard shortcut library for Javascript with * Mousetrap is a simple keyboard shortcut library for Javascript with
* no external dependencies * no external dependencies
* *
* @version 1.6.2 * @version 1.6.3
* @url craig.is/killing/mice * @url craig.is/killing/mice
*/ */
(function(window, document, undefined) { (function(window, document, undefined) {
@ -982,6 +982,20 @@
return false; return false;
} }
// Events originating from a shadow DOM are re-targetted and `e.target` is the shadow host,
// not the initial event target in the shadow tree. Note that not all events cross the
// shadow boundary.
// For shadow trees with `mode: 'open'`, the initial event target is the first element in
// the event’s composed path. For shadow trees with `mode: 'closed'`, the initial event
// target cannot be obtained.
if ('composedPath' in e && typeof e.composedPath === 'function') {
// For open shadow trees, update `element` so that the following check works.
var initialEventTarget = e.composedPath()[0];
if (initialEventTarget !== e.target) {
element = initialEventTarget;
}
}
// stop for input, select, and textarea // stop for input, select, and textarea
return element.tagName == 'INPUT' || element.tagName == 'SELECT' || element.tagName == 'TEXTAREA' || element.isContentEditable; return element.tagName == 'INPUT' || element.tagName == 'SELECT' || element.tagName == 'TEXTAREA' || element.isContentEditable;
}; };

4
yarn.lock
View File

@ -1646,8 +1646,8 @@ moment@2.x, moment@^2.10.2:
integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg== integrity sha512-bV7f+6l2QigeBBZSM/6yTNq4P2fNpSWj/0e7jQcy87A8e7o2nAfP/34/2ky5Vw4B9S446EtIhodAzkFCcR4dQg==
"mousetrap@https://github.com/discourse/mousetrap#firefox-alt-key": "mousetrap@https://github.com/discourse/mousetrap#firefox-alt-key":
version "1.6.2" version "1.6.3"
resolved "https://github.com/discourse/mousetrap#51613787a7cb8be79435f039ba2ba3a43efe797d" resolved "https://github.com/discourse/mousetrap#0d41aa7b173abfb83a6bec3ad39a6a708bc49108"
ms@2.0.0: ms@2.0.0:
version "2.0.0" version "2.0.0"