erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-10 02:45:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1629 from keymanapp/web-toolbar-minification-fix

Browse source 
[Web] Toolbar UI minification fix
This commit is contained in:
Joshua Horton 2019-02-26 08:49:52 +07:00 • committed by GitHub
commit d94c84dc4b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
web/history.md
View file

@ -1,5 +1,8 @@
# KeymanWeb Version History
## 2019-02-26 11.0.221 stable
* Fixes bug with the Toolbar UI (#1629)
## 2019-02-25 11.0.220 stable
* 11.0 Stable release

4
web/source/kmwuitoolbar.ts
View file

@ -337,7 +337,7 @@ if(!window['keyman']['ui']['name']) {
if(Keyboards[j]['RegionCode'] != i) continue; // Not this region
// Get JUST the language code for this section. BCP-47 codes can include more!
var bcpSubtags: string[] = keymanweb['util'].getLanguageCodes(Keyboards[j]['LanguageCode']);
var bcpSubtags: string[] = keymanweb['util']['getLanguageCodes'](Keyboards[j]['LanguageCode']);
if(bcpSubtags[0] == languageCode) continue; // Same language as previous keyboard
languageCode = bcpSubtags[0];
@ -351,7 +351,7 @@ if(!window['keyman']['ui']['name']) {
{
if(Keyboards[j]['RegionCode'] != i) continue; // Not this region
var bcpSubtags: string[] = keymanweb['util'].getLanguageCodes(Keyboards[j]['LanguageCode']);
var bcpSubtags: string[] = keymanweb['util']['getLanguageCodes'](Keyboards[j]['LanguageCode']);
if(bcpSubtags[0] == languageCode) { // Same language as previous keyboard, so add it to that entry
var x = ui.languages[languageCode].keyboards;