isa/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleanup: Replace non-standard ByteArray module

Browse Source 
gjs landed support for TextDecoder/TextEncoder. Use those instead
of gjs' own ByteArray module.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/1946>
This commit is contained in:
Florian Müllner
2021-08-12 16:38:57 +02:00
committed by Marge Bot
parent b21b43e318
commit ef70364e81
11 changed files with 19 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
js/ui/keyboard.js
View File

@ -2,7 +2,6 @@
/* exported KeyboardManager */
const { Clutter, Gio, GLib, GObject, Graphene, Meta, Shell, St } = imports.gi;
const ByteArray = imports.byteArray;
const Signals = imports.signals;
const EdgeDragAction = imports.ui.edgeDragAction;
@ -536,9 +535,9 @@ var KeyboardModel = class {
_loadModel(groupName) {
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/osk-layouts/%s.json'.format(groupName));
let [success_, contents] = file.load_contents(null);
contents = ByteArray.toString(contents);
return JSON.parse(contents);
const decoder = new TextDecoder();
return JSON.parse(decoder.decode(contents));
}
getLevels() {
@ -1039,9 +1038,7 @@ var EmojiSelection = GObject.registerClass({
let file = Gio.File.new_for_uri('resource:///org/gnome/shell/osk-layouts/emoji.json');
let [success_, contents] = file.load_contents(null);
if (contents instanceof Uint8Array)
contents = imports.byteArray.toString(contents);
let emoji = JSON.parse(contents);
let emoji = JSON.parse(new TextDecoder().decode(contents));
let variants = [];
let currentKey = 0;