diff --git a/src/lib/components/Keyboard.js b/src/lib/components/Keyboard.js index 658b61b6..f5e2e72b 100644 --- a/src/lib/components/Keyboard.js +++ b/src/lib/components/Keyboard.js @@ -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 diff --git a/src/lib/services/Utilities.js b/src/lib/services/Utilities.js index 05d4792f..d3ea71c2 100644 --- a/src/lib/services/Utilities.js +++ b/src/lib/services/Utilities.js @@ -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;