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

params: Fix regression

Browse Source 
The first parameter to Object.assign() is the same target object that
will be returned. That is, since commit 46874eed0 Params.parse() modifies
the @defaults object. Usually we pass that parameter as an object literal
and this isn't an issue, but the change breaks spectacularly in the few
cases where we use a re-usable variable.

Restore the previous behavior by copying the object first.

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/615
This commit is contained in:
Florian Müllner 2019-07-05 18:10:56 +02:00
parent 1778adae0d
commit 8a5de327bb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/misc/params.js
View File

@ -1,5 +1,7 @@
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*- // -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
const Lang = imports.lang;
// parse: // parse:
// @params: caller-provided parameter object, or %null // @params: caller-provided parameter object, or %null
// @defaults-provided defaults object // @defaults-provided defaults object
@ -21,5 +23,7 @@ function parse(params = {}, defaults, allowExtras) {
throw new Error(`Unrecognized parameter "${prop}"`); throw new Error(`Unrecognized parameter "${prop}"`);
} }
return Object.assign(defaults, params); let defaultsCopy = {};
Lang.copyProperties(defaults, defaultsCopy);
return Object.assign(defaultsCopy, params);
} }