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

cleanup: Prefer template strings

Browse Source 
Template strings are much nicer than string concatenation, so use
them where possible; this excludes translatable strings and any
strings containing '/' (until we can depend on gettext >= 0.20[0]).

[0] https://savannah.gnu.org/bugs/?50920

https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/612
This commit is contained in:
Florian Müllner
2019-01-30 01:18:24 +01:00
committed by Florian Müllner
parent 46874eed05
commit 0d035a4e53
51 changed files with 188 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
js/ui/scripting.js
View File

@ -150,7 +150,7 @@ function destroyTestWindows() {
* within a performance automation script
*/
function defineScriptEvent(name, description) {
Shell.PerfLog.get_default().define_event("script." + name,
Shell.PerfLog.get_default().define_event(`script.${name}`,
description,
"");
}
@ -163,7 +163,7 @@ function defineScriptEvent(name, description) {
* previously defined with defineScriptEvent
*/
function scriptEvent(name) {
Shell.PerfLog.get_default().event("script." + name);
Shell.PerfLog.get_default().event(`script.${name}`);
}
/**
@ -181,7 +181,7 @@ function _collect(scriptModule, outputFile) {
for (let f in scriptModule) {
let m = /([A-Za-z]+)_([A-Za-z]+)/.exec(f);
if (m)
eventHandlers[m[1] + "." + m[2]] = scriptModule[f];
eventHandlers[`${m[1]}.${m[2]}`] = scriptModule[f];
}
Shell.PerfLog.get_default().replay(
@ -224,15 +224,15 @@ function _collect(scriptModule, outputFile) {
// Extra checks here because JSON.stringify generates
// invalid JSON for undefined values
if (metric.description == null) {
log("Error: No description found for metric " + name);
log(`Error: No description found for metric ${name}`);
continue;
}
if (metric.units == null) {
log("Error: No units found for metric " + name);
log(`Error: No units found for metric ${name}`);
continue;
}
if (metric.value == null) {
log("Error: No value found for metric " + name);
log(`Error: No value found for metric ${name}`);
continue;
}
@ -241,10 +241,10 @@ function _collect(scriptModule, outputFile) {
first = false;
Shell.write_string_to_stream(out,
'{ "name": ' + JSON.stringify(name) + ',\n' +
' "description": ' + JSON.stringify(metric.description) + ',\n' +
' "units": ' + JSON.stringify(metric.units) + ',\n' +
' "value": ' + JSON.stringify(metric.value) + ' }');
`{ "name": ${JSON.stringify(name)},\n` +
` "description": ${JSON.stringify(metric.description)},\n` +
` "units": ${JSON.stringify(metric.units)},\n` +
` "value": ${JSON.stringify(metric.value)} }`);
}
Shell.write_string_to_stream(out, ' ]');
@ -263,8 +263,8 @@ function _collect(scriptModule, outputFile) {
print ('------------------------------------------------------------');
for (let i = 0; i < metrics.length; i++) {
let metric = metrics[i];
print ('# ' + scriptModule.METRICS[metric].description);
print (metric + ': ' + scriptModule.METRICS[metric].value + scriptModule.METRICS[metric].units);
print (`# ${scriptModule.METRICS[metric].description}`);
print (`${metric}: ${scriptModule.METRICS[metric].value}${scriptModule.METRICS[metric].units}`);
}
print ('------------------------------------------------------------');
}