jgaunt/CyberChef
2
0
Fork 0
mirror of https://github.com/gchq/CyberChef synced 2025-12-10 21:33:36 +00:00
Code Issues Releases Wiki Activity

Merge conflict

Browse Source
This commit is contained in:
n1474335
2017-05-02 23:03:28 +01:00
parent d1d394eec7 d41d56e670
commit 80cdf0c014
76 changed files with 1504 additions and 809 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/web/Manager.js
View File

@@ -19,7 +19,7 @@ import SeasonalWaiter from "./SeasonalWaiter.js";
* @constructor
* @param {App} app - The main view object for CyberChef.
*/
var Manager = function(app) {
const Manager = function(app) {
this.app = app;
// Define custom events
@@ -196,8 +196,8 @@ Manager.prototype.addListeners = function(selector, eventType, callback, scope)
* this.addMultiEventListener("search", "keyup paste search", this.search, this);
*/
Manager.prototype.addMultiEventListener = function(selector, eventTypes, callback, scope) {
var evs = eventTypes.split(" ");
for (var i = 0; i < evs.length; i++) {
const evs = eventTypes.split(" ");
for (let i = 0; i < evs.length; i++) {
document.querySelector(selector).addEventListener(evs[i], callback.bind(scope));
}
};
@@ -217,8 +217,8 @@ Manager.prototype.addMultiEventListener = function(selector, eventTypes, callbac
* this.addMultiEventListener(".saveable", "keyup paste", this.save, this);
*/
Manager.prototype.addMultiEventListeners = function(selector, eventTypes, callback, scope) {
var evs = eventTypes.split(" ");
for (var i = 0; i < evs.length; i++) {
const evs = eventTypes.split(" ");
for (let i = 0; i < evs.length; i++) {
this.addListeners(selector, evs[i], callback, scope);
}
};
@@ -239,7 +239,7 @@ Manager.prototype.addMultiEventListeners = function(selector, eventTypes, callba
* this.addDynamicListener("button", "click", alert, this);
*/
Manager.prototype.addDynamicListener = function(selector, eventType, callback, scope) {
var eventConfig = {
const eventConfig = {
selector: selector,
callback: callback.bind(scope || this)
};
@@ -262,14 +262,14 @@ Manager.prototype.addDynamicListener = function(selector, eventType, callback, s
* @param {Event} e - The event to be handled
*/
Manager.prototype.dynamicListenerHandler = function(e) {
var handlers = this.dynamicHandlers[e.type],
let handlers = this.dynamicHandlers[e.type],
matches = e.target.matches ||
e.target.webkitMatchesSelector ||
e.target.mozMatchesSelector ||
e.target.msMatchesSelector ||
e.target.oMatchesSelector;
for (var i = 0; i < handlers.length; i++) {
for (let i = 0; i < handlers.length; i++) {
if (matches && e.target[matches.name](handlers[i].selector)) {
handlers[i].callback(e);
}