From a8c5ffd401cd3307c43cb9da926b76fb75ec0556 Mon Sep 17 00:00:00 2001 From: Francisco Hodge Date: Fri, 2 Mar 2018 14:48:57 -0500 Subject: [PATCH] Fix layout class display, license adjustment --- LICENCE | 24 ------------------------ package.json | 2 +- src/lib/components/Keyboard.js | 5 +++-- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 LICENCE diff --git a/LICENCE b/LICENCE deleted file mode 100644 index a944d29a..00000000 --- a/LICENCE +++ /dev/null @@ -1,24 +0,0 @@ - MIT Licence - - Copyright (c) 2016-present, Udilia Inc. - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. diff --git a/package.json b/package.json index 7bda9e89..3ff357dd 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "simple-keyboard", - "version": "1.0.4", + "version": "1.0.5", "description": "React.js Virtual Keyboard", "main": "build/index.js", "scripts": { diff --git a/src/lib/components/Keyboard.js b/src/lib/components/Keyboard.js index f09bd251..fa81df60 100644 --- a/src/lib/components/Keyboard.js +++ b/src/lib/components/Keyboard.js @@ -67,10 +67,11 @@ class App extends Component { render() { let layoutName = this.props.layoutName || "default"; let layout = this.props.layout || KeyboardLayout.getLayout(layoutName); - let themeClass = this.props.theme || `hg-theme-default`; + let themeClass = this.props.theme || "hg-theme-default"; + let layoutClass = this.props.layout ? "hg-layout-custom" : `hg-layout-${layoutName}`; return ( -
+
{layout[layoutName].map((row, index) => { let rowArray = row.split(' ');