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

background: Don't override synchronous load() with an async version

Browse Source 
Instead, override the asynchronous version to avoid conflicting with
the parent signature.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2040>
This commit is contained in:
Evan Welsh 2021-10-30 15:11:10 -07:00 committed by Florian Müllner
parent 2d6f4aabf9
commit 828da18b72
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
js/ui/background.js
View File

@ -177,7 +177,7 @@ var BackgroundCache = class BackgroundCache {
animation = new Animation({ file: params.file }); animation = new Animation({ file: params.file });
animation.load(() => { animation.load_async(null, () => {
this._animations[params.settingsSchema] = animation; this._animations[params.settingsSchema] = animation;
if (params.onLoaded) { if (params.onLoaded) {
@ -634,11 +634,12 @@ class Animation extends GnomeDesktop.BGSlideShow {
this.loaded = false; this.loaded = false;
} }
load(callback) { // eslint-disable-next-line camelcase
this.load_async(null, () => { load_async(cancellable, callback) {
super.load_async(cancellable, () => {
this.loaded = true; this.loaded = true;
if (callback)
callback(); callback?.();
}); });
} }