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

sessionMode: Use property spread to sync mode

Browse Source 
The parameters here come from a fixed set of mode definitions rather
than a function parameter, so the additional check performed by
Params.parse() isn't relevant here.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3196>
This commit is contained in:
Florian Müllner 2019-12-17 20:06:24 +01:00
parent fe1eab1b3c
commit d6651706fe
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
js/ui/sessionMode.js
View File

@ -4,7 +4,6 @@ import GLib from 'gi://GLib';
import * as Signals from '../misc/signals.js'; import * as Signals from '../misc/signals.js';
import * as FileUtils from '../misc/fileUtils.js'; import * as FileUtils from '../misc/fileUtils.js';
import * as Params from '../misc/params.js';
import {LoginDialog} from '../gdm/loginDialog.js'; import {LoginDialog} from '../gdm/loginDialog.js';
import {UnlockDialog} from '../ui/unlockDialog.js'; import {UnlockDialog} from '../ui/unlockDialog.js';
@ -191,16 +190,12 @@ export class SessionMode extends Signals.EventEmitter {
} }
_sync() { _sync() {
let params = _modes[this.currentMode]; const current = _modes[this.currentMode];
let defaults; const parent = current.parentMode
if (params.parentMode) { ? {..._modes[DEFAULT_MODE], ..._modes[current.parentMode]}
defaults = Params.parse( : {..._modes[DEFAULT_MODE]};
_modes[params.parentMode],
_modes[DEFAULT_MODE]); const params = {...parent, ...current};
} else {
defaults = _modes[DEFAULT_MODE];
}
params = Params.parse(params, defaults);
// A simplified version of Lang.copyProperties, handles // A simplified version of Lang.copyProperties, handles
// undefined as a special case for "no change / inherit from previous mode" // undefined as a special case for "no change / inherit from previous mode"