archive-gh-me/simpread
1
0
Fork 0
mirror of https://github.com/Kenshin/simpread.git synced 2026-02-01 15:41:29 +00:00
Code Issues Projects Releases Wiki Activity

Fix keyboard event not event.key bug.

Browse Source
This commit is contained in:
Kenshin 2017-01-05 12:47:13 +08:00
parent d1bfb9b420
commit 5279d3cc70
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/option/focus.jsx
View File

@ -56,13 +56,14 @@ export default class FocusOpt extends React.Component {
console.log( "this.props.option.opacity = ", this.props.option.opacity )
}
changeShortcuts() {
changeShortcuts( event ) {
if ( event.type === "keydown" ) {
keyword = event.key.toLowerCase().trim() == "control" ? "ctrl" : event.key.toLowerCase().trim();
const key = fixKey( event );
keyword = key == "control" ? "ctrl" : key;
if ( verifyShortkey( keyword )) {
prevShortcuts = updateShortcuts();
} else if ( keyword.length == 0 || !/^[0-9a-z]{1}$/ig.test( keyword )) {
new Notify().Render( 2, `当前输入【 ${keyword} 】不合法，快捷键只能包括：【ctrl】【shift】【alt】【数字】与【字母】。` );
new Notify().Render( 2, `当前输入不合法，快捷键只能包括：【ctrl, shift, alt, 数字, 字母。】` );
}
} else {
console.log( "prevShortcuts, keyword = ", prevShortcuts, keyword )
@ -118,7 +119,7 @@ export default class FocusOpt extends React.Component {
<sr-opt-gp>
<sr-opt-label>快捷键：</sr-opt-label>
<sr-opt-item sr-type="shortcuts">
<input ref="shortcuts" type="text" onKeyDown={ ()=> this.changeShortcuts() } onChange={ ()=>this.changeShortcuts() } />
<input ref="shortcuts" type="text" onKeyDown={ (event)=> this.changeShortcuts(event) } onChange={ (event)=>this.changeShortcuts(event) } />
</sr-opt-item>
</sr-opt-gp>
<sr-opt-gp>
@ -224,6 +225,21 @@ function getExclude( htmls ) {
return list;
}
/**
* Fix keyboard event key undefinde
*
* @param {event} keyboard event
* @return {string} valid key, include 0~9 a~z ctrl shift alt
*/
function fixKey( event ) {
const keycode = event.keyCode;
if ( [ 16, 17, 18 ].includes( keycode ) ) {
return event.key.toLowerCase().trim();
} else if ( keycode >= 49 || keycode <= 90 ) {
return event.nativeEvent.code.toLowerCase().trim().replace( /(digit|key)/ig, "" );
}
}
/**
* Verify html
*
@ -269,6 +285,11 @@ function updateShortcuts() {
return shortcuts;
}
/**
* Set background style
*
* @param {string} background color
*/
function setBgThemeStyle( bgcolor ) {
const $themes = $( "sr-opt-themes" ).children(),
newcolor = getColor( bgcolor );