feat(keymap): Keymap abbr should be only number or ASCII char (#360)

ert78gb · mondalaci · commit 3db019812aae · 2017-07-17T00:48:31.000+02:00
* feat(keymap): Keymap abbr should be only number or ASCII char close #341 * fix(keymap): Allow '1' when generate keymap abbreviation
diff --git a/shared/src/components/keymap/header/keymap-header.component.ts b/shared/src/components/keymap/header/keymap-header.component.ts
@@ -72,7 +72,9 @@ export class KeymapHeaderComponent implements OnChanges {
     }
 
     editKeymapAbbr(newAbbr: string) {
-        if (newAbbr.length !== 3) {
+        const regexp = new RegExp(/^[a-zA-Z\d]+$/g);
+
+        if (newAbbr.length < 1 || newAbbr.length > 3 || !regexp.test(newAbbr)) {
             this.renderer.setElementProperty(this.keymapAbbr.nativeElement, 'value', this.keymap.abbreviation);
             return;
         }
diff --git a/shared/src/store/reducers/user-configuration.ts b/shared/src/store/reducers/user-configuration.ts
@@ -274,7 +274,7 @@ export function getMacro(id: number) {
 }
 
 function generateAbbr(keymaps: Keymap[], abbr: string): string {
-    const chars: string[] = '23456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
+    const chars: string[] = '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');
     let position = 0;
 
     while (keymaps.some((keymap: Keymap) => keymap.abbreviation === abbr)) {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,9 @@ export class KeymapHeaderComponent implements OnChanges {`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`editKeymapAbbr(newAbbr: string) {`
`75`		`- if (newAbbr.length !== 3) {`
	`75`	`+ const regexp = new RegExp(/^[a-zA-Z\d]+$/g);`
	`76`	`+`
	`77`	`+ if (newAbbr.length < 1 \|\| newAbbr.length > 3 \|\| !regexp.test(newAbbr)) {`
`76`	`78`	`this.renderer.setElementProperty(this.keymapAbbr.nativeElement, 'value', this.keymap.abbreviation);`
`77`	`79`	`return;`
`78`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -274,7 +274,7 @@ export function getMacro(id: number) {`
`274`	`274`	`}`
`275`	`275`
`276`	`276`	`function generateAbbr(keymaps: Keymap[], abbr: string): string {`
`277`		`- const chars: string[] = '23456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');`
	`277`	`+ const chars: string[] = '123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ'.split('');`
`278`	`278`	`let position = 0;`
`279`	`279`
`280`	`280`	`while (keymaps.some((keymap: Keymap) => keymap.abbreviation === abbr)) {`