diff --git a/js/gdm/vmware.js b/js/gdm/vmware.js index 20d57e8a2..fb80a78a2 100644 --- a/js/gdm/vmware.js +++ b/js/gdm/vmware.js @@ -10,13 +10,13 @@ const dbusInterface = 'org.vmware.viewagent.Credentials'; var SERVICE_NAME = 'gdm-vmwcred'; -const VmwareCredentialsIface = ' \ - \ - \ - \ - \ - \ -'; +const VmwareCredentialsIface = ` + + + + + +`; const VmwareCredentialsInfo = Gio.DBusInterfaceInfo.new_for_xml(VmwareCredentialsIface); diff --git a/js/ui/components/telepathyClient.js b/js/ui/components/telepathyClient.js index 90c0cbdf4..335f32a9a 100644 --- a/js/ui/components/telepathyClient.js +++ b/js/ui/components/telepathyClient.js @@ -816,7 +816,8 @@ var ChatNotification = HAVE_TP ? GObject.registerClass({ /* Translators: this is the other person changing their old IM name to their new IM name. */ - let message = '' + _("%s is now known as %s").format(oldAlias, newAlias) + ''; + const message = `${ + _('%s is now known as %s').format(oldAlias, newAlias)}`; this._append({ body: message, group: 'meta', diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js index c2645586f..4058ebdc3 100644 --- a/js/ui/notificationDaemon.js +++ b/js/ui/notificationDaemon.js @@ -545,7 +545,7 @@ const FdoApplicationIface = loadInterfaceXML('org.freedesktop.Application'); const FdoApplicationProxy = Gio.DBusProxy.makeProxyWrapper(FdoApplicationIface); function objectPathFromAppId(appId) { - return '/' + appId.replace(/\./g, '/').replace(/-/g, '_'); + return `/${appId.replace(/\./g, '/').replace(/-/g, '_')}`; } function getPlatformData() { diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js index b58e4eeb4..98a028f66 100644 --- a/js/ui/padOsd.js +++ b/js/ui/padOsd.js @@ -359,9 +359,10 @@ var PadDiagram = GObject.registerClass({ } _wrappingSvgFooter() { - return '' + - '' + - ''; + return '%s%s%s'.format( + '', + ''.format(this._imagePath), + ''); } _cssString() { @@ -885,7 +886,7 @@ var PadOsd = GObject.registerClass({ this._endActionEdition(); this._editedAction = { type, number, dir, mode }; - let settingsPath = this._settings.path + key + '/'; + const settingsPath = `${this._settings.path}${key}/`; this._editedActionSettings = Gio.Settings.new_with_path('org.gnome.desktop.peripherals.tablet.pad-button', settingsPath); this._actionEditor.setSettings(this._editedActionSettings, type); diff --git a/lint/eslintrc-legacy.yml b/lint/eslintrc-legacy.yml index 8441f7c2d..e8a0e2935 100644 --- a/lint/eslintrc-legacy.yml +++ b/lint/eslintrc-legacy.yml @@ -24,5 +24,4 @@ rules: object-curly-newline: - error - consistent: true - prefer-template: off quotes: off