github/simple-keyboard
github/simple-keyboard
3
0
Fork 0
mirror of https://github.com/hodgef/simple-keyboard.git synced 2024-10-06 07:42:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Adding utilities as instance

Browse Source
This commit is contained in:
Francisco Hodge 2018-10-06 02:16:12 -04:00
parent 0dffe921ff
commit e95ebc1b9e
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/lib/components/Keyboard.js
View File

@ -13,6 +13,11 @@ class SimpleKeyboard {
if(!options)
options = {};
/**
* Initializing Utilities
*/
this.utilities = new Utilities(this);
/**
* Processing options
*/
@ -41,7 +46,7 @@ class SimpleKeyboard {
if(!window['SimpleKeyboardInstances'])
window['SimpleKeyboardInstances'] = {};
window['SimpleKeyboardInstances'][Utilities.camelCase(this.keyboardDOMClass)] = this;
window['SimpleKeyboardInstances'][this.utilities.camelCase(this.keyboardDOMClass)] = this;
/**
* Physical Keyboard support
@ -221,10 +226,9 @@ class SimpleKeyboard {
/**
* Iterating through each button in row
*/
rowArray.forEach((button) => {
let fctBtnClass = Utilities.getButtonClass(button);
let fctBtnClass = this.utilities.getButtonClass(button);
let buttonThemeClass = buttonThemesParsed[button];
let buttonDisplayName = Utilities.getButtonDisplayName(button, this.options.display, this.options.mergeDisplay);
let buttonDisplayName = this.utilities.getButtonDisplayName(button, this.options.display, this.options.mergeDisplay);
/**
* Creating button

6
src/lib/services/Utilities.js
View File

@ -48,7 +48,7 @@ class Utilities {
let buttonNormalized =
buttonTypeClass === "standardBtn" ?
Utilities.normalizeString(buttonWithoutBraces) : ` hg-button-${buttonWithoutBraces}`;
this.normalizeString(buttonWithoutBraces) : ` hg-button-${buttonWithoutBraces}`;
return `hg-${buttonTypeClass}${buttonNormalized}`;
}
@ -119,9 +119,9 @@ class Utilities {
static getButtonDisplayName = (button, display, mergeDisplay) => {
if(mergeDisplay){
display = Object.assign({}, Utilities.getDefaultDiplay(), display);
display = Object.assign({}, this.getDefaultDiplay(), display);
} else {
display = display || Utilities.getDefaultDiplay();
display = display || this.getDefaultDiplay();
}
return display[button] || button;