[gnome-shell/gnome-3-34] keyboard: Fix fallback layout when using variants
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell/gnome-3-34] keyboard: Fix fallback layout when using variants
- Date: Mon, 23 Mar 2020 15:28:24 +0000 (UTC)
commit 3d7ee7856f1c3231925cce770d1fe0b3b3bb932d
Author: Florian Müllner <fmuellner gnome org>
Date: Mon Mar 23 15:14:47 2020 +0000
keyboard: Fix fallback layout when using variants
Commit c1ec7b2ff meant to fall back to the base layout in case
a variant like `fr+oss` is set up, but as we are checking for
'+' on the array rather than the layout name, the fallback only
"works" for a layout that is literally called '+', whoops.
https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2471
(cherry picked from commit d29e5765badbca21a6ef8b40087a8e3587b15dd4)
js/ui/keyboard.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js
index b4406d7246..6703d11b14 100644
--- a/js/ui/keyboard.js
+++ b/js/ui/keyboard.js
@@ -467,7 +467,7 @@ Signals.addSignalMethods(Key.prototype);
var KeyboardModel = class {
constructor(groupName) {
let names = [groupName];
- if (names.includes('+'))
+ if (groupName.includes('+'))
names.push(groupName.replace(/\+.*/, ''));
names.push('us');
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]