From 5c15395fc51379fe07c8277c376ad1afa7cfb665 Mon Sep 17 00:00:00 2001 From: jaywcjlove <398188662@qq.com> Date: Sun, 25 Mar 2018 01:22:47 +0800 Subject: [PATCH] Add ESLint. --- .eslintrc | 65 ++++++++++ dist/hotkeys.common.js | 269 +++++++++++++++++++++++------------------ dist/hotkeys.esm.js | 269 +++++++++++++++++++++++------------------ dist/hotkeys.js | 269 +++++++++++++++++++++++------------------ package.json | 9 ++ src/main.js | 101 +++++++++------- src/utils.js | 30 +++-- src/var.js | 73 +++++++---- 8 files changed, 655 insertions(+), 430 deletions(-) create mode 100644 .eslintrc diff --git a/.eslintrc b/.eslintrc new file mode 100644 index 0000000..6ac5099 --- /dev/null +++ b/.eslintrc @@ -0,0 +1,65 @@ +{ + "parser": "babel-eslint", + "extends": "airbnb", + "env": { + "browser": true, + "node": true, + "es6": true, + "mocha": true, + "jest": true, + "jasmine": true + }, + "rules": { + "linebreak-style": 0, + "arrow-body-style": 0, + "max-len": 0, + "consistent-return": 0, + "generator-star-spacing": 0, + "global-require": 1, + "import/extensions": 0, + "import/no-extraneous-dependencies": 0, + "import/no-unresolved": 0, + "import/prefer-default-export": 0, + "jsx-a11y/no-static-element-interactions": 0, + "no-bitwise": 0, + "no-cond-assign": 0, + "no-else-return": 0, + "no-param-reassign": 0, + "no-nested-ternary": 0, + "no-restricted-syntax": 0, + "no-use-before-define": 0, + "react/forbid-prop-types": 0, + "react/jsx-filename-extension": [ + 1, + { + "extensions": [ + ".js" + ] + } + ], + "react/jsx-no-bind": 0, + "react/prefer-stateless-function": 0, + "react/prop-types": 0, + "require-yield": 1, + "no-console": [ + "error", + { + "allow": [ + "log" + ] + } + ], + "class-methods-use-this": 0, + "no-confusing-arrow": 0, + "react/sort-comp": 0, + "no-unused-expressions": 0, + "no-underscore-dangle": 0, + "no-plusplus": 0, + "react/no-did-mount-set-state": 0 + }, + "parserOptions": { + "ecmaFeatures": { + "experimentalObjectRestSpread": true + } + } +} diff --git a/dist/hotkeys.common.js b/dist/hotkeys.common.js index 1395bee..79de44a 100644 --- a/dist/hotkeys.common.js +++ b/dist/hotkeys.common.js @@ -1,44 +1,30 @@ -/*! - * hotkeys-js v3.0.1 - * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies. - * - * Copyright (c) 2018 kenny wong - * - * - * Licensed under the MIT license. - */ - 'use strict'; -var isff = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase().indexOf('firefox') > 0 : false; +const isff = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase().indexOf('firefox') > 0 : false; // 绑定事件 function addEvent(object, event, method) { if (object.addEventListener) { object.addEventListener(event, method, false); } else if (object.attachEvent) { - object.attachEvent('on' + event, function () { - method(window.event); - }); + object.attachEvent(`on${event}`, () => { method(window.event); }); } } // 修饰键转换成对应的键码 function getMods(modifier, key) { - var mods = key.slice(0, key.length - 1); - for (var i = 0; i < mods.length; i++) { - mods[i] = modifier[mods[i].toLowerCase()]; - }return mods; + const mods = key.slice(0, key.length - 1); + for (let i = 0; i < mods.length; i++) mods[i] = modifier[mods[i].toLowerCase()]; + return mods; } // 处理传的key字符串转换成数组 function getKeys(key) { if (!key) key = ''; - var keys, index; key = key.replace(/\s/g, ''); // 匹配任何空白字符,包括空格、制表符、换页符等等 - keys = key.split(','); // 同时设置多个快捷键,以','分割 - index = keys.lastIndexOf(''); + const keys = key.split(','); // 同时设置多个快捷键,以','分割 + let index = keys.lastIndexOf(''); // 快捷键可能包含',',需特殊处理 for (; index >= 0;) { @@ -50,105 +36,128 @@ function getKeys(key) { return keys; } -//比较修饰键的数组 +// 比较修饰键的数组 function compareArray(a1, a2) { - var arr1 = a1.length >= a2.length ? a1 : a2; - var arr2 = a1.length >= a2.length ? a2 : a1; + const arr1 = a1.length >= a2.length ? a1 : a2; + const arr2 = a1.length >= a2.length ? a2 : a1; + let isIndex = true; - for (var i = 0; i < arr1.length; i++) { - if (arr2.indexOf(arr1[i]) === -1) return false; + for (let i = 0; i < arr1.length; i++) { + if (arr2.indexOf(arr1[i]) === -1) isIndex = false; } - - return true; + return isIndex; } -var _keyMap = { // 特殊键 - backspace: 8, tab: 9, clear: 12, - enter: 13, 'return': 13, - esc: 27, escape: 27, space: 32, - left: 37, up: 38, right: 39, down: 40, - del: 46, 'delete': 46, - ins: 45, 'insert': 45, - home: 36, end: 35, - pageup: 33, pagedown: 34, '⇪': 20, 'capslock': 20, - ',': 188, '.': 190, '/': 191, - '`': 192, '-': isff ? 173 : 189, '=': isff ? 61 : 187, - ';': isff ? 59 : 186, '\'': 222, - '[': 219, ']': 221, '\\': 220 +const _keyMap = { // 特殊键 + backspace: 8, + tab: 9, + clear: 12, + enter: 13, + return: 13, + esc: 27, + escape: 27, + space: 32, + left: 37, + up: 38, + right: 39, + down: 40, + del: 46, + delete: 46, + ins: 45, + insert: 45, + home: 36, + end: 35, + pageup: 33, + pagedown: 34, + capslock: 20, + '⇪': 20, + ',': 188, + '.': 190, + '/': 191, + '`': 192, + '-': isff ? 173 : 189, + '=': isff ? 61 : 187, + ';': isff ? 59 : 186, + '\'': 222, + '[': 219, + ']': 221, + '\\': 220, }; -var _modifier = { //修饰键 - '⇧': 16, shift: 16, - '⌥': 18, alt: 18, option: 18, - '⌃': 17, ctrl: 17, control: 17, - '⌘': isff ? 224 : 91, cmd: isff ? 224 : 91, command: isff ? 224 : 91 +const _modifier = { // 修饰键 + '⇧': 16, + shift: 16, + '⌥': 18, + alt: 18, + option: 18, + '⌃': 17, + ctrl: 17, + control: 17, + '⌘': isff ? 224 : 91, + cmd: isff ? 224 : 91, + command: isff ? 224 : 91, }; -var _downKeys = []; // 记录摁下的绑定键 -var modifierMap = { +const _downKeys = []; // 记录摁下的绑定键 +const modifierMap = { 16: 'shiftKey', 18: 'altKey', - 17: 'ctrlKey' + 17: 'ctrlKey', }; -var _mods = { 16: false, 18: false, 17: false }; -var _handlers = {}; +const _mods = { 16: false, 18: false, 17: false }; +const _handlers = {}; // F1~F12 特殊键 -for (var k = 1; k < 20; k++) { - _keyMap['f' + k] = 111 + k; +for (let k = 1; k < 20; k++) { + _keyMap[`f${k}`] = 111 + k; } // 兼容Firefox处理 modifierMap[isff ? 224 : 91] = 'metaKey'; _mods[isff ? 224 : 91] = false; -var _scope = 'all'; //默认热键范围 +let _scope = 'all'; // 默认热键范围 // 返回键码 -var code = function code(x) { - return _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); -}; +const code = x => _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); // 设置获取当前范围(默认为'所有') -function setScope(scope) { - _scope = scope || 'all'; -} +function setScope(scope) { _scope = scope || 'all'; } // 获取当前范围 -function getScope() { - return _scope || 'all'; -} +function getScope() { return _scope || 'all'; } // 获取摁下绑定键的键值 -function getPressedKeyCodes() { - return _downKeys.slice(0); -} +function getPressedKeyCodes() { return _downKeys.slice(0); } // 表单控件控件判断 返回 Boolean function filter(event) { - var tagName = (event.target || event.srcElement).tagName; + const tagName = event.target.tagName || event.srcElement.tagName; // 忽略这些标签情况下快捷键无效 return !(tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA'); } // 判断摁下的键是否为某个键,返回true或者false function isPressed(keyCode) { - if (typeof keyCode === 'string') { + if (typeof (keyCode) === 'string') { keyCode = code(keyCode); // 转换成键码 } return _downKeys.indexOf(keyCode) !== -1; } + // 循环删除handlers中的所有 scope(范围) function deleteScope(scope, newScope) { - var handlers = void 0; - var i = void 0; + let handlers; + let i; // 没有指定scope,获取scope if (!scope) scope = getScope(); - for (var key in _handlers) { - handlers = _handlers[key]; - - for (i = 0; i < handlers.length;) { - if (handlers[i].scope === scope) handlers.splice(i, 1);else i++; + for (const key in _handlers) { + if (Object.prototype.hasOwnProperty.call(_handlers, key)) { + handlers = _handlers[key]; + for (i = 0; i < handlers.length;) { + if (handlers[i].scope === scope) handlers.splice(i, 1); + else i++; + } } } @@ -158,8 +167,8 @@ function deleteScope(scope, newScope) { // 清除修饰键 function clearModifier(event) { - var key = event.keyCode || event.which || event.charCode; - var i = _downKeys.indexOf(key); + const i = _downKeys.indexOf(key); + let key = event.keyCode || event.which || event.charCode; // 从列表中清除按压过的键 if (i >= 0) _downKeys.splice(i, 1); @@ -170,20 +179,18 @@ function clearModifier(event) { _mods[key] = false; // 将修饰键重置为false - for (var k in _modifier) { - if (_modifier[k] === key) hotkeys[k] = false; - } + for (const k in _modifier) if (_modifier[k] === key) hotkeys[k] = false; } } // 解除绑定某个范围的快捷键 function unbind(key, scope) { - var multipleKeys = getKeys(key), - keys = void 0, - mods = [], - obj = void 0; + const multipleKeys = getKeys(key); + let keys; + let mods = []; + let obj; - for (var i = 0; i < multipleKeys.length; i++) { + for (let i = 0; i < multipleKeys.length; i++) { // 将组合快捷键拆分为数组 keys = multipleKeys[i].split('+'); @@ -202,10 +209,13 @@ function unbind(key, scope) { // 清空 handlers 中数据, // 让触发快捷键键之后没有事件执行到达解除快捷键绑定的目的 - for (var r = 0; r < _handlers[key].length; r++) { + for (let r = 0; r < _handlers[key].length; r++) { obj = _handlers[key][r]; // 判断是否在范围内并且键值相同 - if (obj.scope === scope && compareArray(obj.mods, mods)) { + if ( + obj.scope === scope && + compareArray(obj.mods, mods) + ) { _handlers[key][r] = {}; } } @@ -214,21 +224,31 @@ function unbind(key, scope) { // 对监听对应快捷键的回调函数进行处理 function eventHandler(event, handler, scope) { - var modifiersMatch = void 0; + let modifiersMatch; // 看它是否在当前范围 if (handler.scope === scope || handler.scope === 'all') { - //检查是否匹配修饰符(如果有返回true) + // 检查是否匹配修饰符(如果有返回true) modifiersMatch = handler.mods.length > 0; - for (var y in _mods) { - if (!_mods[y] && handler.mods.indexOf(+y) > -1 || _mods[y] && handler.mods.indexOf(+y) === -1) modifiersMatch = false; + for (const y in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, y)) { + if ( + (!_mods[y] && handler.mods.indexOf(+y) > -1) || + (_mods[y] && handler.mods.indexOf(+y) === -1) + ) modifiersMatch = false; + } } // 调用处理程序,如果是修饰键不做处理 - if (handler.mods.length === 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91] || modifiersMatch || handler.shortcut === '*') { + if ( + (handler.mods.length === 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || + modifiersMatch || + handler.shortcut === '*' + ) { if (handler.method(event, handler) === false) { - if (event.preventDefault) event.preventDefault();else event.returnValue = false; + if (event.preventDefault) event.preventDefault(); + else event.returnValue = false; if (event.stopPropagation) event.stopPropagation(); if (event.cancelBubble) event.cancelBubble = true; } @@ -236,11 +256,11 @@ function eventHandler(event, handler, scope) { } } + // 处理keydown事件 function dispatch(event) { - var key = event.keyCode || event.which || event.charCode, - scope, - asterisk = _handlers['*']; + const asterisk = _handlers['*']; + let key = event.keyCode || event.which || event.charCode; // 搜集绑定的键 if (_downKeys.indexOf(key) === -1) _downKeys.push(key); @@ -253,7 +273,7 @@ function dispatch(event) { _mods[key] = true; // 将特殊字符的key注册到 hotkeys 上 - for (var k in _modifier) { + for (const k in _modifier) { if (_modifier[k] === key) hotkeys[k] = true; } @@ -261,19 +281,21 @@ function dispatch(event) { } // 将modifierMap里面的修饰键绑定到event中 - for (var e in _mods) { - _mods[e] = event[modifierMap[e]]; + for (const e in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, e)) { + _mods[e] = event[modifierMap[e]]; + } } // 表单控件过滤 默认表单控件不触发快捷键 if (!hotkeys.filter.call(this, event)) return; // 获取范围 默认为all - scope = getScope(); + const scope = getScope(); // 对任何快捷键都需要做的处理 if (asterisk) { - for (i = 0; i < asterisk.length; i++) { + for (let i = 0; i < asterisk.length; i++) { if (asterisk[i].scope === scope) eventHandler(event, asterisk[i], scope); } } @@ -281,16 +303,17 @@ function dispatch(event) { // key 不在_handlers中返回 if (!(key in _handlers)) return; - for (var i = 0; i < _handlers[key].length; i++) { + for (let i = 0; i < _handlers[key].length; i++) { // 找到处理内容 eventHandler(event, _handlers[key][i], scope); } } function hotkeys(key, scope, method) { - var keys = getKeys(key); // 需要处理的快捷键列表 - var mods = []; - var i = 0; + const keys = getKeys(key); // 需要处理的快捷键列表 + let mods = []; + let i = 0; + // 对为设定范围的判断 if (method === undefined) { @@ -314,30 +337,44 @@ function hotkeys(key, scope, method) { if (!(key in _handlers)) _handlers[key] = []; _handlers[key].push({ - scope: scope, mods: mods, + scope, + mods, shortcut: keys[i], - method: method, - key: keys[i] + method, + key: keys[i], }); } } + // 在全局document上设置快捷键 if (typeof document !== 'undefined') { - addEvent(document, "keydown", function (e) { + addEvent(document, 'keydown', (e) => { dispatch(e); }); - addEvent(document, "keyup", function (e) { + addEvent(document, 'keyup', (e) => { clearModifier(e); }); } -var _api = { setScope: setScope, getScope: getScope, deleteScope: deleteScope, getPressedKeyCodes: getPressedKeyCodes, isPressed: isPressed, filter: filter, unbind: unbind }; -for (var a in _api) { - hotkeys[a] = _api[a]; -}if (typeof window !== 'undefined') { - var _hotkeys = window.hotkeys; - hotkeys.noConflict = function (deep) { +const _api = { + setScope, + getScope, + deleteScope, + getPressedKeyCodes, + isPressed, + filter, + unbind, +}; +for (const a in _api) { + if (Object.prototype.hasOwnProperty.call(_api, a)) { + hotkeys[a] = _api[a]; + } +} + +if (typeof window !== 'undefined') { + const _hotkeys = window.hotkeys; + hotkeys.noConflict = (deep) => { if (deep && window.hotkeys === hotkeys) { window.hotkeys = _hotkeys; } diff --git a/dist/hotkeys.esm.js b/dist/hotkeys.esm.js index fd65a3d..b8e0ad5 100644 --- a/dist/hotkeys.esm.js +++ b/dist/hotkeys.esm.js @@ -1,42 +1,28 @@ -/*! - * hotkeys-js v3.0.1 - * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies. - * - * Copyright (c) 2018 kenny wong - * - * - * Licensed under the MIT license. - */ - -var isff = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase().indexOf('firefox') > 0 : false; +const isff = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase().indexOf('firefox') > 0 : false; // 绑定事件 function addEvent(object, event, method) { if (object.addEventListener) { object.addEventListener(event, method, false); } else if (object.attachEvent) { - object.attachEvent('on' + event, function () { - method(window.event); - }); + object.attachEvent(`on${event}`, () => { method(window.event); }); } } // 修饰键转换成对应的键码 function getMods(modifier, key) { - var mods = key.slice(0, key.length - 1); - for (var i = 0; i < mods.length; i++) { - mods[i] = modifier[mods[i].toLowerCase()]; - }return mods; + const mods = key.slice(0, key.length - 1); + for (let i = 0; i < mods.length; i++) mods[i] = modifier[mods[i].toLowerCase()]; + return mods; } // 处理传的key字符串转换成数组 function getKeys(key) { if (!key) key = ''; - var keys, index; key = key.replace(/\s/g, ''); // 匹配任何空白字符,包括空格、制表符、换页符等等 - keys = key.split(','); // 同时设置多个快捷键,以','分割 - index = keys.lastIndexOf(''); + const keys = key.split(','); // 同时设置多个快捷键,以','分割 + let index = keys.lastIndexOf(''); // 快捷键可能包含',',需特殊处理 for (; index >= 0;) { @@ -48,105 +34,128 @@ function getKeys(key) { return keys; } -//比较修饰键的数组 +// 比较修饰键的数组 function compareArray(a1, a2) { - var arr1 = a1.length >= a2.length ? a1 : a2; - var arr2 = a1.length >= a2.length ? a2 : a1; + const arr1 = a1.length >= a2.length ? a1 : a2; + const arr2 = a1.length >= a2.length ? a2 : a1; + let isIndex = true; - for (var i = 0; i < arr1.length; i++) { - if (arr2.indexOf(arr1[i]) === -1) return false; + for (let i = 0; i < arr1.length; i++) { + if (arr2.indexOf(arr1[i]) === -1) isIndex = false; } - - return true; + return isIndex; } -var _keyMap = { // 特殊键 - backspace: 8, tab: 9, clear: 12, - enter: 13, 'return': 13, - esc: 27, escape: 27, space: 32, - left: 37, up: 38, right: 39, down: 40, - del: 46, 'delete': 46, - ins: 45, 'insert': 45, - home: 36, end: 35, - pageup: 33, pagedown: 34, '⇪': 20, 'capslock': 20, - ',': 188, '.': 190, '/': 191, - '`': 192, '-': isff ? 173 : 189, '=': isff ? 61 : 187, - ';': isff ? 59 : 186, '\'': 222, - '[': 219, ']': 221, '\\': 220 +const _keyMap = { // 特殊键 + backspace: 8, + tab: 9, + clear: 12, + enter: 13, + return: 13, + esc: 27, + escape: 27, + space: 32, + left: 37, + up: 38, + right: 39, + down: 40, + del: 46, + delete: 46, + ins: 45, + insert: 45, + home: 36, + end: 35, + pageup: 33, + pagedown: 34, + capslock: 20, + '⇪': 20, + ',': 188, + '.': 190, + '/': 191, + '`': 192, + '-': isff ? 173 : 189, + '=': isff ? 61 : 187, + ';': isff ? 59 : 186, + '\'': 222, + '[': 219, + ']': 221, + '\\': 220, }; -var _modifier = { //修饰键 - '⇧': 16, shift: 16, - '⌥': 18, alt: 18, option: 18, - '⌃': 17, ctrl: 17, control: 17, - '⌘': isff ? 224 : 91, cmd: isff ? 224 : 91, command: isff ? 224 : 91 +const _modifier = { // 修饰键 + '⇧': 16, + shift: 16, + '⌥': 18, + alt: 18, + option: 18, + '⌃': 17, + ctrl: 17, + control: 17, + '⌘': isff ? 224 : 91, + cmd: isff ? 224 : 91, + command: isff ? 224 : 91, }; -var _downKeys = []; // 记录摁下的绑定键 -var modifierMap = { +const _downKeys = []; // 记录摁下的绑定键 +const modifierMap = { 16: 'shiftKey', 18: 'altKey', - 17: 'ctrlKey' + 17: 'ctrlKey', }; -var _mods = { 16: false, 18: false, 17: false }; -var _handlers = {}; +const _mods = { 16: false, 18: false, 17: false }; +const _handlers = {}; // F1~F12 特殊键 -for (var k = 1; k < 20; k++) { - _keyMap['f' + k] = 111 + k; +for (let k = 1; k < 20; k++) { + _keyMap[`f${k}`] = 111 + k; } // 兼容Firefox处理 modifierMap[isff ? 224 : 91] = 'metaKey'; _mods[isff ? 224 : 91] = false; -var _scope = 'all'; //默认热键范围 +let _scope = 'all'; // 默认热键范围 // 返回键码 -var code = function code(x) { - return _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); -}; +const code = x => _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); // 设置获取当前范围(默认为'所有') -function setScope(scope) { - _scope = scope || 'all'; -} +function setScope(scope) { _scope = scope || 'all'; } // 获取当前范围 -function getScope() { - return _scope || 'all'; -} +function getScope() { return _scope || 'all'; } // 获取摁下绑定键的键值 -function getPressedKeyCodes() { - return _downKeys.slice(0); -} +function getPressedKeyCodes() { return _downKeys.slice(0); } // 表单控件控件判断 返回 Boolean function filter(event) { - var tagName = (event.target || event.srcElement).tagName; + const tagName = event.target.tagName || event.srcElement.tagName; // 忽略这些标签情况下快捷键无效 return !(tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA'); } // 判断摁下的键是否为某个键,返回true或者false function isPressed(keyCode) { - if (typeof keyCode === 'string') { + if (typeof (keyCode) === 'string') { keyCode = code(keyCode); // 转换成键码 } return _downKeys.indexOf(keyCode) !== -1; } + // 循环删除handlers中的所有 scope(范围) function deleteScope(scope, newScope) { - var handlers = void 0; - var i = void 0; + let handlers; + let i; // 没有指定scope,获取scope if (!scope) scope = getScope(); - for (var key in _handlers) { - handlers = _handlers[key]; - - for (i = 0; i < handlers.length;) { - if (handlers[i].scope === scope) handlers.splice(i, 1);else i++; + for (const key in _handlers) { + if (Object.prototype.hasOwnProperty.call(_handlers, key)) { + handlers = _handlers[key]; + for (i = 0; i < handlers.length;) { + if (handlers[i].scope === scope) handlers.splice(i, 1); + else i++; + } } } @@ -156,8 +165,8 @@ function deleteScope(scope, newScope) { // 清除修饰键 function clearModifier(event) { - var key = event.keyCode || event.which || event.charCode; - var i = _downKeys.indexOf(key); + const i = _downKeys.indexOf(key); + let key = event.keyCode || event.which || event.charCode; // 从列表中清除按压过的键 if (i >= 0) _downKeys.splice(i, 1); @@ -168,20 +177,18 @@ function clearModifier(event) { _mods[key] = false; // 将修饰键重置为false - for (var k in _modifier) { - if (_modifier[k] === key) hotkeys[k] = false; - } + for (const k in _modifier) if (_modifier[k] === key) hotkeys[k] = false; } } // 解除绑定某个范围的快捷键 function unbind(key, scope) { - var multipleKeys = getKeys(key), - keys = void 0, - mods = [], - obj = void 0; + const multipleKeys = getKeys(key); + let keys; + let mods = []; + let obj; - for (var i = 0; i < multipleKeys.length; i++) { + for (let i = 0; i < multipleKeys.length; i++) { // 将组合快捷键拆分为数组 keys = multipleKeys[i].split('+'); @@ -200,10 +207,13 @@ function unbind(key, scope) { // 清空 handlers 中数据, // 让触发快捷键键之后没有事件执行到达解除快捷键绑定的目的 - for (var r = 0; r < _handlers[key].length; r++) { + for (let r = 0; r < _handlers[key].length; r++) { obj = _handlers[key][r]; // 判断是否在范围内并且键值相同 - if (obj.scope === scope && compareArray(obj.mods, mods)) { + if ( + obj.scope === scope && + compareArray(obj.mods, mods) + ) { _handlers[key][r] = {}; } } @@ -212,21 +222,31 @@ function unbind(key, scope) { // 对监听对应快捷键的回调函数进行处理 function eventHandler(event, handler, scope) { - var modifiersMatch = void 0; + let modifiersMatch; // 看它是否在当前范围 if (handler.scope === scope || handler.scope === 'all') { - //检查是否匹配修饰符(如果有返回true) + // 检查是否匹配修饰符(如果有返回true) modifiersMatch = handler.mods.length > 0; - for (var y in _mods) { - if (!_mods[y] && handler.mods.indexOf(+y) > -1 || _mods[y] && handler.mods.indexOf(+y) === -1) modifiersMatch = false; + for (const y in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, y)) { + if ( + (!_mods[y] && handler.mods.indexOf(+y) > -1) || + (_mods[y] && handler.mods.indexOf(+y) === -1) + ) modifiersMatch = false; + } } // 调用处理程序,如果是修饰键不做处理 - if (handler.mods.length === 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91] || modifiersMatch || handler.shortcut === '*') { + if ( + (handler.mods.length === 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || + modifiersMatch || + handler.shortcut === '*' + ) { if (handler.method(event, handler) === false) { - if (event.preventDefault) event.preventDefault();else event.returnValue = false; + if (event.preventDefault) event.preventDefault(); + else event.returnValue = false; if (event.stopPropagation) event.stopPropagation(); if (event.cancelBubble) event.cancelBubble = true; } @@ -234,11 +254,11 @@ function eventHandler(event, handler, scope) { } } + // 处理keydown事件 function dispatch(event) { - var key = event.keyCode || event.which || event.charCode, - scope, - asterisk = _handlers['*']; + const asterisk = _handlers['*']; + let key = event.keyCode || event.which || event.charCode; // 搜集绑定的键 if (_downKeys.indexOf(key) === -1) _downKeys.push(key); @@ -251,7 +271,7 @@ function dispatch(event) { _mods[key] = true; // 将特殊字符的key注册到 hotkeys 上 - for (var k in _modifier) { + for (const k in _modifier) { if (_modifier[k] === key) hotkeys[k] = true; } @@ -259,19 +279,21 @@ function dispatch(event) { } // 将modifierMap里面的修饰键绑定到event中 - for (var e in _mods) { - _mods[e] = event[modifierMap[e]]; + for (const e in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, e)) { + _mods[e] = event[modifierMap[e]]; + } } // 表单控件过滤 默认表单控件不触发快捷键 if (!hotkeys.filter.call(this, event)) return; // 获取范围 默认为all - scope = getScope(); + const scope = getScope(); // 对任何快捷键都需要做的处理 if (asterisk) { - for (i = 0; i < asterisk.length; i++) { + for (let i = 0; i < asterisk.length; i++) { if (asterisk[i].scope === scope) eventHandler(event, asterisk[i], scope); } } @@ -279,16 +301,17 @@ function dispatch(event) { // key 不在_handlers中返回 if (!(key in _handlers)) return; - for (var i = 0; i < _handlers[key].length; i++) { + for (let i = 0; i < _handlers[key].length; i++) { // 找到处理内容 eventHandler(event, _handlers[key][i], scope); } } function hotkeys(key, scope, method) { - var keys = getKeys(key); // 需要处理的快捷键列表 - var mods = []; - var i = 0; + const keys = getKeys(key); // 需要处理的快捷键列表 + let mods = []; + let i = 0; + // 对为设定范围的判断 if (method === undefined) { @@ -312,30 +335,44 @@ function hotkeys(key, scope, method) { if (!(key in _handlers)) _handlers[key] = []; _handlers[key].push({ - scope: scope, mods: mods, + scope, + mods, shortcut: keys[i], - method: method, - key: keys[i] + method, + key: keys[i], }); } } + // 在全局document上设置快捷键 if (typeof document !== 'undefined') { - addEvent(document, "keydown", function (e) { + addEvent(document, 'keydown', (e) => { dispatch(e); }); - addEvent(document, "keyup", function (e) { + addEvent(document, 'keyup', (e) => { clearModifier(e); }); } -var _api = { setScope: setScope, getScope: getScope, deleteScope: deleteScope, getPressedKeyCodes: getPressedKeyCodes, isPressed: isPressed, filter: filter, unbind: unbind }; -for (var a in _api) { - hotkeys[a] = _api[a]; -}if (typeof window !== 'undefined') { - var _hotkeys = window.hotkeys; - hotkeys.noConflict = function (deep) { +const _api = { + setScope, + getScope, + deleteScope, + getPressedKeyCodes, + isPressed, + filter, + unbind, +}; +for (const a in _api) { + if (Object.prototype.hasOwnProperty.call(_api, a)) { + hotkeys[a] = _api[a]; + } +} + +if (typeof window !== 'undefined') { + const _hotkeys = window.hotkeys; + hotkeys.noConflict = (deep) => { if (deep && window.hotkeys === hotkeys) { window.hotkeys = _hotkeys; } diff --git a/dist/hotkeys.js b/dist/hotkeys.js index 576854f..d726b9a 100644 --- a/dist/hotkeys.js +++ b/dist/hotkeys.js @@ -1,48 +1,34 @@ -/*! - * hotkeys-js v3.0.1 - * A simple micro-library for defining and dispatching keyboard shortcuts. It has no dependencies. - * - * Copyright (c) 2018 kenny wong - * - * - * Licensed under the MIT license. - */ - (function (global, factory) { typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() : typeof define === 'function' && define.amd ? define(factory) : (global.hotkeys = factory()); }(this, (function () { 'use strict'; -var isff = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase().indexOf('firefox') > 0 : false; +const isff = typeof navigator !== 'undefined' ? navigator.userAgent.toLowerCase().indexOf('firefox') > 0 : false; // 绑定事件 function addEvent(object, event, method) { if (object.addEventListener) { object.addEventListener(event, method, false); } else if (object.attachEvent) { - object.attachEvent('on' + event, function () { - method(window.event); - }); + object.attachEvent(`on${event}`, () => { method(window.event); }); } } // 修饰键转换成对应的键码 function getMods(modifier, key) { - var mods = key.slice(0, key.length - 1); - for (var i = 0; i < mods.length; i++) { - mods[i] = modifier[mods[i].toLowerCase()]; - }return mods; + const mods = key.slice(0, key.length - 1); + for (let i = 0; i < mods.length; i++) mods[i] = modifier[mods[i].toLowerCase()]; + return mods; } // 处理传的key字符串转换成数组 function getKeys(key) { if (!key) key = ''; - var keys, index; key = key.replace(/\s/g, ''); // 匹配任何空白字符,包括空格、制表符、换页符等等 - keys = key.split(','); // 同时设置多个快捷键,以','分割 - index = keys.lastIndexOf(''); + const keys = key.split(','); // 同时设置多个快捷键,以','分割 + let index = keys.lastIndexOf(''); // 快捷键可能包含',',需特殊处理 for (; index >= 0;) { @@ -54,105 +40,128 @@ function getKeys(key) { return keys; } -//比较修饰键的数组 +// 比较修饰键的数组 function compareArray(a1, a2) { - var arr1 = a1.length >= a2.length ? a1 : a2; - var arr2 = a1.length >= a2.length ? a2 : a1; + const arr1 = a1.length >= a2.length ? a1 : a2; + const arr2 = a1.length >= a2.length ? a2 : a1; + let isIndex = true; - for (var i = 0; i < arr1.length; i++) { - if (arr2.indexOf(arr1[i]) === -1) return false; + for (let i = 0; i < arr1.length; i++) { + if (arr2.indexOf(arr1[i]) === -1) isIndex = false; } - - return true; + return isIndex; } -var _keyMap = { // 特殊键 - backspace: 8, tab: 9, clear: 12, - enter: 13, 'return': 13, - esc: 27, escape: 27, space: 32, - left: 37, up: 38, right: 39, down: 40, - del: 46, 'delete': 46, - ins: 45, 'insert': 45, - home: 36, end: 35, - pageup: 33, pagedown: 34, '⇪': 20, 'capslock': 20, - ',': 188, '.': 190, '/': 191, - '`': 192, '-': isff ? 173 : 189, '=': isff ? 61 : 187, - ';': isff ? 59 : 186, '\'': 222, - '[': 219, ']': 221, '\\': 220 +const _keyMap = { // 特殊键 + backspace: 8, + tab: 9, + clear: 12, + enter: 13, + return: 13, + esc: 27, + escape: 27, + space: 32, + left: 37, + up: 38, + right: 39, + down: 40, + del: 46, + delete: 46, + ins: 45, + insert: 45, + home: 36, + end: 35, + pageup: 33, + pagedown: 34, + capslock: 20, + '⇪': 20, + ',': 188, + '.': 190, + '/': 191, + '`': 192, + '-': isff ? 173 : 189, + '=': isff ? 61 : 187, + ';': isff ? 59 : 186, + '\'': 222, + '[': 219, + ']': 221, + '\\': 220, }; -var _modifier = { //修饰键 - '⇧': 16, shift: 16, - '⌥': 18, alt: 18, option: 18, - '⌃': 17, ctrl: 17, control: 17, - '⌘': isff ? 224 : 91, cmd: isff ? 224 : 91, command: isff ? 224 : 91 +const _modifier = { // 修饰键 + '⇧': 16, + shift: 16, + '⌥': 18, + alt: 18, + option: 18, + '⌃': 17, + ctrl: 17, + control: 17, + '⌘': isff ? 224 : 91, + cmd: isff ? 224 : 91, + command: isff ? 224 : 91, }; -var _downKeys = []; // 记录摁下的绑定键 -var modifierMap = { +const _downKeys = []; // 记录摁下的绑定键 +const modifierMap = { 16: 'shiftKey', 18: 'altKey', - 17: 'ctrlKey' + 17: 'ctrlKey', }; -var _mods = { 16: false, 18: false, 17: false }; -var _handlers = {}; +const _mods = { 16: false, 18: false, 17: false }; +const _handlers = {}; // F1~F12 特殊键 -for (var k = 1; k < 20; k++) { - _keyMap['f' + k] = 111 + k; +for (let k = 1; k < 20; k++) { + _keyMap[`f${k}`] = 111 + k; } // 兼容Firefox处理 modifierMap[isff ? 224 : 91] = 'metaKey'; _mods[isff ? 224 : 91] = false; -var _scope = 'all'; //默认热键范围 +let _scope = 'all'; // 默认热键范围 // 返回键码 -var code = function code(x) { - return _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); -}; +const code = x => _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); // 设置获取当前范围(默认为'所有') -function setScope(scope) { - _scope = scope || 'all'; -} +function setScope(scope) { _scope = scope || 'all'; } // 获取当前范围 -function getScope() { - return _scope || 'all'; -} +function getScope() { return _scope || 'all'; } // 获取摁下绑定键的键值 -function getPressedKeyCodes() { - return _downKeys.slice(0); -} +function getPressedKeyCodes() { return _downKeys.slice(0); } // 表单控件控件判断 返回 Boolean function filter(event) { - var tagName = (event.target || event.srcElement).tagName; + const tagName = event.target.tagName || event.srcElement.tagName; // 忽略这些标签情况下快捷键无效 return !(tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA'); } // 判断摁下的键是否为某个键,返回true或者false function isPressed(keyCode) { - if (typeof keyCode === 'string') { + if (typeof (keyCode) === 'string') { keyCode = code(keyCode); // 转换成键码 } return _downKeys.indexOf(keyCode) !== -1; } + // 循环删除handlers中的所有 scope(范围) function deleteScope(scope, newScope) { - var handlers = void 0; - var i = void 0; + let handlers; + let i; // 没有指定scope,获取scope if (!scope) scope = getScope(); - for (var key in _handlers) { - handlers = _handlers[key]; - - for (i = 0; i < handlers.length;) { - if (handlers[i].scope === scope) handlers.splice(i, 1);else i++; + for (const key in _handlers) { + if (Object.prototype.hasOwnProperty.call(_handlers, key)) { + handlers = _handlers[key]; + for (i = 0; i < handlers.length;) { + if (handlers[i].scope === scope) handlers.splice(i, 1); + else i++; + } } } @@ -162,8 +171,8 @@ function deleteScope(scope, newScope) { // 清除修饰键 function clearModifier(event) { - var key = event.keyCode || event.which || event.charCode; - var i = _downKeys.indexOf(key); + const i = _downKeys.indexOf(key); + let key = event.keyCode || event.which || event.charCode; // 从列表中清除按压过的键 if (i >= 0) _downKeys.splice(i, 1); @@ -174,20 +183,18 @@ function clearModifier(event) { _mods[key] = false; // 将修饰键重置为false - for (var k in _modifier) { - if (_modifier[k] === key) hotkeys[k] = false; - } + for (const k in _modifier) if (_modifier[k] === key) hotkeys[k] = false; } } // 解除绑定某个范围的快捷键 function unbind(key, scope) { - var multipleKeys = getKeys(key), - keys = void 0, - mods = [], - obj = void 0; + const multipleKeys = getKeys(key); + let keys; + let mods = []; + let obj; - for (var i = 0; i < multipleKeys.length; i++) { + for (let i = 0; i < multipleKeys.length; i++) { // 将组合快捷键拆分为数组 keys = multipleKeys[i].split('+'); @@ -206,10 +213,13 @@ function unbind(key, scope) { // 清空 handlers 中数据, // 让触发快捷键键之后没有事件执行到达解除快捷键绑定的目的 - for (var r = 0; r < _handlers[key].length; r++) { + for (let r = 0; r < _handlers[key].length; r++) { obj = _handlers[key][r]; // 判断是否在范围内并且键值相同 - if (obj.scope === scope && compareArray(obj.mods, mods)) { + if ( + obj.scope === scope && + compareArray(obj.mods, mods) + ) { _handlers[key][r] = {}; } } @@ -218,21 +228,31 @@ function unbind(key, scope) { // 对监听对应快捷键的回调函数进行处理 function eventHandler(event, handler, scope) { - var modifiersMatch = void 0; + let modifiersMatch; // 看它是否在当前范围 if (handler.scope === scope || handler.scope === 'all') { - //检查是否匹配修饰符(如果有返回true) + // 检查是否匹配修饰符(如果有返回true) modifiersMatch = handler.mods.length > 0; - for (var y in _mods) { - if (!_mods[y] && handler.mods.indexOf(+y) > -1 || _mods[y] && handler.mods.indexOf(+y) === -1) modifiersMatch = false; + for (const y in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, y)) { + if ( + (!_mods[y] && handler.mods.indexOf(+y) > -1) || + (_mods[y] && handler.mods.indexOf(+y) === -1) + ) modifiersMatch = false; + } } // 调用处理程序,如果是修饰键不做处理 - if (handler.mods.length === 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91] || modifiersMatch || handler.shortcut === '*') { + if ( + (handler.mods.length === 0 && !_mods[16] && !_mods[18] && !_mods[17] && !_mods[91]) || + modifiersMatch || + handler.shortcut === '*' + ) { if (handler.method(event, handler) === false) { - if (event.preventDefault) event.preventDefault();else event.returnValue = false; + if (event.preventDefault) event.preventDefault(); + else event.returnValue = false; if (event.stopPropagation) event.stopPropagation(); if (event.cancelBubble) event.cancelBubble = true; } @@ -240,11 +260,11 @@ function eventHandler(event, handler, scope) { } } + // 处理keydown事件 function dispatch(event) { - var key = event.keyCode || event.which || event.charCode, - scope, - asterisk = _handlers['*']; + const asterisk = _handlers['*']; + let key = event.keyCode || event.which || event.charCode; // 搜集绑定的键 if (_downKeys.indexOf(key) === -1) _downKeys.push(key); @@ -257,7 +277,7 @@ function dispatch(event) { _mods[key] = true; // 将特殊字符的key注册到 hotkeys 上 - for (var k in _modifier) { + for (const k in _modifier) { if (_modifier[k] === key) hotkeys[k] = true; } @@ -265,19 +285,21 @@ function dispatch(event) { } // 将modifierMap里面的修饰键绑定到event中 - for (var e in _mods) { - _mods[e] = event[modifierMap[e]]; + for (const e in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, e)) { + _mods[e] = event[modifierMap[e]]; + } } // 表单控件过滤 默认表单控件不触发快捷键 if (!hotkeys.filter.call(this, event)) return; // 获取范围 默认为all - scope = getScope(); + const scope = getScope(); // 对任何快捷键都需要做的处理 if (asterisk) { - for (i = 0; i < asterisk.length; i++) { + for (let i = 0; i < asterisk.length; i++) { if (asterisk[i].scope === scope) eventHandler(event, asterisk[i], scope); } } @@ -285,16 +307,17 @@ function dispatch(event) { // key 不在_handlers中返回 if (!(key in _handlers)) return; - for (var i = 0; i < _handlers[key].length; i++) { + for (let i = 0; i < _handlers[key].length; i++) { // 找到处理内容 eventHandler(event, _handlers[key][i], scope); } } function hotkeys(key, scope, method) { - var keys = getKeys(key); // 需要处理的快捷键列表 - var mods = []; - var i = 0; + const keys = getKeys(key); // 需要处理的快捷键列表 + let mods = []; + let i = 0; + // 对为设定范围的判断 if (method === undefined) { @@ -318,30 +341,44 @@ function hotkeys(key, scope, method) { if (!(key in _handlers)) _handlers[key] = []; _handlers[key].push({ - scope: scope, mods: mods, + scope, + mods, shortcut: keys[i], - method: method, - key: keys[i] + method, + key: keys[i], }); } } + // 在全局document上设置快捷键 if (typeof document !== 'undefined') { - addEvent(document, "keydown", function (e) { + addEvent(document, 'keydown', (e) => { dispatch(e); }); - addEvent(document, "keyup", function (e) { + addEvent(document, 'keyup', (e) => { clearModifier(e); }); } -var _api = { setScope: setScope, getScope: getScope, deleteScope: deleteScope, getPressedKeyCodes: getPressedKeyCodes, isPressed: isPressed, filter: filter, unbind: unbind }; -for (var a in _api) { - hotkeys[a] = _api[a]; -}if (typeof window !== 'undefined') { - var _hotkeys = window.hotkeys; - hotkeys.noConflict = function (deep) { +const _api = { + setScope, + getScope, + deleteScope, + getPressedKeyCodes, + isPressed, + filter, + unbind, +}; +for (const a in _api) { + if (Object.prototype.hasOwnProperty.call(_api, a)) { + hotkeys[a] = _api[a]; + } +} + +if (typeof window !== 'undefined') { + const _hotkeys = window.hotkeys; + hotkeys.noConflict = (deep) => { if (deep && window.hotkeys === hotkeys) { window.hotkeys = _hotkeys; } diff --git a/package.json b/package.json index 59342b0..935d14f 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,8 @@ "version": "3.0.1", "main": "index.js", "scripts": { + "lint": "eslint --ext .js src", + "precommit": "npm run lint", "deploy": "gh-pages -d build", "build": "node scripts/build.js", "watch": "node scripts/watch.js", @@ -34,14 +36,21 @@ "devDependencies": { "autoprefixer": "^8.1.0", "babel-core": "^6.26.0", + "babel-eslint": "^8.2.2", "babel-plugin-external-helpers": "^6.22.0", "babel-preset-env": "^1.6.1", "babel-preset-react": "^6.24.1", "bannerjs": "^1.0.5", "classnames": "^2.2.5", "colors-cli": "^1.0.13", + "eslint": "^4.19.1", + "eslint-config-airbnb": "^16.1.0", + "eslint-plugin-import": "^2.9.0", + "eslint-plugin-jsx-a11y": "^6.0.3", + "eslint-plugin-react": "^7.7.0", "gh-pages": "^1.1.0", "highlight.js": "^9.12.0", + "husky": "^0.14.3", "jest": "^22.4.2", "less": "^3.0.1", "parcel-bundler": "^1.6.2", diff --git a/src/main.js b/src/main.js index 99681a3..129ed9f 100644 --- a/src/main.js +++ b/src/main.js @@ -1,10 +1,10 @@ -import { addEvent, getMods, getKeys, compareArray} from './utils'; +import { addEvent, getMods, getKeys, compareArray } from './utils'; import { _keyMap, _modifier, _downKeys, modifierMap, _mods, _handlers } from './var'; -let _scope = 'all'; //默认热键范围 +let _scope = 'all'; // 默认热键范围 // 返回键码 -const code = (x) => _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); +const code = x => _keyMap[x.toLowerCase()] || x.toUpperCase().charCodeAt(0); // 设置获取当前范围(默认为'所有') function setScope(scope) { _scope = scope || 'all'; } @@ -15,7 +15,7 @@ function getPressedKeyCodes() { return _downKeys.slice(0); } // 表单控件控件判断 返回 Boolean function filter(event) { - var tagName = (event.target || event.srcElement).tagName; + const tagName = event.target.tagName || event.srcElement.tagName; // 忽略这些标签情况下快捷键无效 return !(tagName === 'INPUT' || tagName === 'SELECT' || tagName === 'TEXTAREA'); } @@ -38,12 +38,13 @@ function deleteScope(scope, newScope) { // 没有指定scope,获取scope if (!scope) scope = getScope(); - for (let key in _handlers) { - handlers = _handlers[key]; - - for (i = 0; i < handlers.length;) { - if (handlers[i].scope === scope) handlers.splice(i, 1); - else i++; + for (const key in _handlers) { + if (Object.prototype.hasOwnProperty.call(_handlers, key)) { + handlers = _handlers[key]; + for (i = 0; i < handlers.length;) { + if (handlers[i].scope === scope) handlers.splice(i, 1); + else i++; + } } } @@ -53,8 +54,8 @@ function deleteScope(scope, newScope) { // 清除修饰键 function clearModifier(event) { + const i = _downKeys.indexOf(key); let key = event.keyCode || event.which || event.charCode; - let i = _downKeys.indexOf(key); // 从列表中清除按压过的键 if (i >= 0) _downKeys.splice(i, 1); @@ -65,17 +66,16 @@ function clearModifier(event) { _mods[key] = false; // 将修饰键重置为false - for (var k in _modifier) if (_modifier[k] === key) hotkeys[k] = false; + for (const k in _modifier) if (_modifier[k] === key) hotkeys[k] = false; } } - // 解除绑定某个范围的快捷键 function unbind(key, scope) { - let multipleKeys = getKeys(key), - keys, - mods = [], - obj; + const multipleKeys = getKeys(key); + let keys; + let mods = []; + let obj; for (let i = 0; i < multipleKeys.length; i++) { // 将组合快捷键拆分为数组 @@ -109,21 +109,22 @@ function unbind(key, scope) { } } - // 对监听对应快捷键的回调函数进行处理 function eventHandler(event, handler, scope) { let modifiersMatch; // 看它是否在当前范围 if (handler.scope === scope || handler.scope === 'all') { - //检查是否匹配修饰符(如果有返回true) + // 检查是否匹配修饰符(如果有返回true) modifiersMatch = handler.mods.length > 0; - for (let y in _mods) { - if ( - (!_mods[y] && handler.mods.indexOf(+y) > -1) || - (_mods[y] && handler.mods.indexOf(+y) === -1) - ) modifiersMatch = false; + for (const y in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, y)) { + if ( + (!_mods[y] && handler.mods.indexOf(+y) > -1) || + (_mods[y] && handler.mods.indexOf(+y) === -1) + ) modifiersMatch = false; + } } // 调用处理程序,如果是修饰键不做处理 @@ -145,9 +146,8 @@ function eventHandler(event, handler, scope) { // 处理keydown事件 function dispatch(event) { - var key = event.keyCode || event.which || event.charCode, - scope, - asterisk = _handlers['*']; + const asterisk = _handlers['*']; + let key = event.keyCode || event.which || event.charCode; // 搜集绑定的键 if (_downKeys.indexOf(key) === -1) _downKeys.push(key); @@ -160,7 +160,7 @@ function dispatch(event) { _mods[key] = true; // 将特殊字符的key注册到 hotkeys 上 - for (var k in _modifier) { + for (const k in _modifier) { if (_modifier[k] === key) hotkeys[k] = true; } @@ -168,19 +168,21 @@ function dispatch(event) { } // 将modifierMap里面的修饰键绑定到event中 - for (var e in _mods) { - _mods[e] = event[modifierMap[e]]; + for (const e in _mods) { + if (Object.prototype.hasOwnProperty.call(_mods, e)) { + _mods[e] = event[modifierMap[e]]; + } } // 表单控件过滤 默认表单控件不触发快捷键 if (!hotkeys.filter.call(this, event)) return; // 获取范围 默认为all - scope = getScope(); + const scope = getScope(); // 对任何快捷键都需要做的处理 if (asterisk) { - for (i = 0; i < asterisk.length; i++) { + for (let i = 0; i < asterisk.length; i++) { if (asterisk[i].scope === scope) eventHandler(event, asterisk[i], scope); } } @@ -188,16 +190,16 @@ function dispatch(event) { // key 不在_handlers中返回 if (!(key in _handlers)) return; - for (var i = 0; i < _handlers[key].length; i++) { + for (let i = 0; i < _handlers[key].length; i++) { // 找到处理内容 eventHandler(event, _handlers[key][i], scope); } } function hotkeys(key, scope, method) { - let keys = getKeys(key); // 需要处理的快捷键列表 - let mods = []; - let i = 0; + const keys = getKeys(key); // 需要处理的快捷键列表 + let mods = []; + let i = 0; // 对为设定范围的判断 @@ -222,9 +224,10 @@ function hotkeys(key, scope, method) { if (!(key in _handlers)) _handlers[key] = []; _handlers[key].push({ - scope, mods, + scope, + mods, shortcut: keys[i], - method: method, + method, key: keys[i], }); } @@ -233,19 +236,31 @@ function hotkeys(key, scope, method) { // 在全局document上设置快捷键 if (typeof document !== 'undefined') { - addEvent(document, "keydown", (e) => { + addEvent(document, 'keydown', (e) => { dispatch(e); }); - addEvent(document, "keyup", (e) => { + addEvent(document, 'keyup', (e) => { clearModifier(e); }); } -const _api = { setScope, getScope, deleteScope, getPressedKeyCodes, isPressed, filter, unbind }; -for (var a in _api) hotkeys[a] = _api[a]; +const _api = { + setScope, + getScope, + deleteScope, + getPressedKeyCodes, + isPressed, + filter, + unbind, +}; +for (const a in _api) { + if (Object.prototype.hasOwnProperty.call(_api, a)) { + hotkeys[a] = _api[a]; + } +} if (typeof window !== 'undefined') { - var _hotkeys = window.hotkeys; + const _hotkeys = window.hotkeys; hotkeys.noConflict = (deep) => { if (deep && window.hotkeys === hotkeys) { window.hotkeys = _hotkeys; diff --git a/src/utils.js b/src/utils.js index 667090d..3b9d087 100644 --- a/src/utils.js +++ b/src/utils.js @@ -5,26 +5,24 @@ function addEvent(object, event, method) { if (object.addEventListener) { object.addEventListener(event, method, false); } else if (object.attachEvent) { - object.attachEvent('on' + event, function () { method(window.event); }); + object.attachEvent(`on${event}`, () => { method(window.event); }); } } // 修饰键转换成对应的键码 function getMods(modifier, key) { - var mods = key.slice(0, key.length - 1); - for (var i = 0; i < mods.length; i++) mods[i] = modifier[mods[i].toLowerCase()]; + const mods = key.slice(0, key.length - 1); + for (let i = 0; i < mods.length; i++) mods[i] = modifier[mods[i].toLowerCase()]; return mods; } - // 处理传的key字符串转换成数组 function getKeys(key) { if (!key) key = ''; - var keys, index; key = key.replace(/\s/g, ''); // 匹配任何空白字符,包括空格、制表符、换页符等等 - keys = key.split(','); // 同时设置多个快捷键,以','分割 - index = keys.lastIndexOf(''); + const keys = key.split(','); // 同时设置多个快捷键,以','分割 + let index = keys.lastIndexOf(''); // 快捷键可能包含',',需特殊处理 for (; index >= 0;) { @@ -36,16 +34,16 @@ function getKeys(key) { return keys; } -//比较修饰键的数组 +// 比较修饰键的数组 function compareArray(a1, a2) { - var arr1 = a1.length >= a2.length ? a1 : a2; - var arr2 = a1.length >= a2.length ? a2 : a1; + const arr1 = a1.length >= a2.length ? a1 : a2; + const arr2 = a1.length >= a2.length ? a2 : a1; + let isIndex = true; - for (var i = 0; i < arr1.length; i++) { - if (arr2.indexOf(arr1[i]) === -1) return false; + for (let i = 0; i < arr1.length; i++) { + if (arr2.indexOf(arr1[i]) === -1) isIndex = false; } - - return true; + return isIndex; } export { @@ -53,5 +51,5 @@ export { getMods, getKeys, addEvent, - compareArray -} \ No newline at end of file + compareArray, +}; diff --git a/src/var.js b/src/var.js index 577ecca..6645aa9 100644 --- a/src/var.js +++ b/src/var.js @@ -1,39 +1,66 @@ import { isff } from './utils'; const _keyMap = { // 特殊键 - backspace: 8, tab: 9, clear: 12, - enter: 13, 'return': 13, - esc: 27, escape: 27, space: 32, - left: 37, up: 38, right: 39, down: 40, - del: 46, 'delete': 46, - ins: 45, 'insert': 45, - home: 36, end: 35, - pageup: 33, pagedown: 34, '⇪': 20, 'capslock': 20, - ',': 188, '.': 190, '/': 191, - '`': 192, '-': isff ? 173 : 189, '=': isff ? 61 : 187, - ';': isff ? 59 : 186, '\'': 222, - '[': 219, ']': 221, '\\': 220 -} + backspace: 8, + tab: 9, + clear: 12, + enter: 13, + return: 13, + esc: 27, + escape: 27, + space: 32, + left: 37, + up: 38, + right: 39, + down: 40, + del: 46, + delete: 46, + ins: 45, + insert: 45, + home: 36, + end: 35, + pageup: 33, + pagedown: 34, + capslock: 20, + '⇪': 20, + ',': 188, + '.': 190, + '/': 191, + '`': 192, + '-': isff ? 173 : 189, + '=': isff ? 61 : 187, + ';': isff ? 59 : 186, + '\'': 222, + '[': 219, + ']': 221, + '\\': 220, +}; -const _modifier = { //修饰键 - '⇧': 16, shift: 16, - '⌥': 18, alt: 18, option: 18, - '⌃': 17, ctrl: 17, control: 17, - '⌘': isff ? 224 : 91, cmd: isff ? 224 : 91, command: isff ? 224 : 91 +const _modifier = { // 修饰键 + '⇧': 16, + shift: 16, + '⌥': 18, + alt: 18, + option: 18, + '⌃': 17, + ctrl: 17, + control: 17, + '⌘': isff ? 224 : 91, + cmd: isff ? 224 : 91, + command: isff ? 224 : 91, }; const _downKeys = []; // 记录摁下的绑定键 const modifierMap = { 16: 'shiftKey', 18: 'altKey', - 17: 'ctrlKey' + 17: 'ctrlKey', }; const _mods = { 16: false, 18: false, 17: false }; const _handlers = {}; - // F1~F12 特殊键 -for (var k = 1; k < 20; k++) { - _keyMap['f' + k] = 111 + k; +for (let k = 1; k < 20; k++) { + _keyMap[`f${k}`] = 111 + k; } // 兼容Firefox处理 @@ -47,4 +74,4 @@ export { modifierMap, _mods, _handlers, -} \ No newline at end of file +};