diff --git a/js/ui/components/__init__.js b/js/ui/components/__init__.js index 652f6951c..a6fa4bf50 100644 --- a/js/ui/components/__init__.js +++ b/js/ui/components/__init__.js @@ -37,8 +37,8 @@ var ComponentManager = class { if (component) return component; - if (Main.sessionMode.isLocked) - return null; + if (Main.sessionMode.isLocked) + return null; let constructor = this._importComponent(name); component = new constructor(); @@ -48,7 +48,7 @@ var ComponentManager = class { _enableComponent(name) { let component = this._ensureComponent(name); - if (component) + if (component) component.enable(); } diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js index 4c57e785a..2f1b44653 100644 --- a/js/ui/components/networkAgent.js +++ b/js/ui/components/networkAgent.js @@ -177,14 +177,14 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { let value = secret.value; if (secret.wep_key_type == NM.WepKeyType.KEY) { if (value.length == 10 || value.length == 26) { - for (let i = 0; i < value.length; i++) { + for (let i = 0; i < value.length; i++) { if (!((value[i] >= 'a' && value[i] <= 'f') || (value[i] >= 'A' && value[i] <= 'F') || (value[i] >= '0' && value[i] <= '9'))) return false; - } - } else if (value.length == 5 || value.length == 13) { - for (let i = 0; i < value.length; i++) { + } + } else if (value.length == 5 || value.length == 13) { + for (let i = 0; i < value.length; i++) { if (!((value[i] >= 'a' && value[i] <= 'z') || (value[i] >= 'A' && value[i] <= 'Z'))) return false; @@ -192,10 +192,10 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { } else { return false; } - } else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) { - if (value.length < 0 || value.length > 64) - return false; - } + } else if (secret.wep_key_type == NM.WepKeyType.PASSPHRASE) { + if (value.length < 0 || value.length > 64) + return false; + } return true; } diff --git a/js/ui/focusCaretTracker.js b/js/ui/focusCaretTracker.js index 473ae3e6e..3f8ff93a9 100644 --- a/js/ui/focusCaretTracker.js +++ b/js/ui/focusCaretTracker.js @@ -49,7 +49,7 @@ var FocusCaretTracker = class FocusCaretTracker { this._atspiInited = true; } - return this._atspiInited; + return this._atspiInited; } registerFocusListener() { diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js index 64c992a02..34f41093a 100644 --- a/js/ui/padOsd.js +++ b/js/ui/padOsd.js @@ -358,7 +358,7 @@ var PadDiagram = GObject.registerClass({ for (let i = 0; i < this._activeButtons.length; i++) { let ch = String.fromCharCode('A'.charCodeAt() + this._activeButtons[i]); css += ('.' + ch + ' { ' + - ' stroke: ' + ACTIVE_COLOR + ' !important; ' + + ' stroke: ' + ACTIVE_COLOR + ' !important; ' + ' fill: ' + ACTIVE_COLOR + ' !important; ' + '} '); } diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index c0560a67c..e80e0316d 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -763,15 +763,15 @@ var ScreenShield = class { } _onDragMotion() { - let [origX, origY] = this._dragAction.get_press_coords(0); - let [currentX, currentY] = this._dragAction.get_motion_coords(0); + let [origX, origY] = this._dragAction.get_press_coords(0); + let [currentX, currentY] = this._dragAction.get_motion_coords(0); - let newY = currentY - origY; - newY = clamp(newY, -global.stage.height, 0); + let newY = currentY - origY; + newY = clamp(newY, -global.stage.height, 0); - this._lockScreenGroup.y = newY; + this._lockScreenGroup.y = newY; - return true; + return true; } _onDragEnd(action, actor, eventX, eventY, modifiers) { @@ -779,7 +779,7 @@ var ScreenShield = class { return; if (this._lockScreenGroup.y < -(ARROW_DRAG_THRESHOLD * global.stage.height)) { // Complete motion automatically - let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); + let [velocity, velocityX, velocityY] = this._dragAction.get_velocity(0); this._liftShield(true, -velocityY); } else { // restore the lock screen to its original place diff --git a/js/ui/status/network.js b/js/ui/status/network.js index 47a7c598a..f81cedaf9 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -943,14 +943,14 @@ class NMWirelessDialog extends ModalDialog.ModalDialog { if (rsnFlags != NM80211ApSecurityFlags.NONE) { /* RSN check first so that WPA+WPA2 APs are treated as RSN/WPA2 */ if (rsnFlags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) - type = NMAccessPointSecurity.WPA2_ENT; - else if (rsnFlags & NM80211ApSecurityFlags.KEY_MGMT_PSK) - type = NMAccessPointSecurity.WPA2_PSK; + type = NMAccessPointSecurity.WPA2_ENT; + else if (rsnFlags & NM80211ApSecurityFlags.KEY_MGMT_PSK) + type = NMAccessPointSecurity.WPA2_PSK; } else if (wpaFlags != NM80211ApSecurityFlags.NONE) { if (wpaFlags & NM80211ApSecurityFlags.KEY_MGMT_802_1X) type = NMAccessPointSecurity.WPA_ENT; else if (wpaFlags & NM80211ApSecurityFlags.KEY_MGMT_PSK) - type = NMAccessPointSecurity.WPA_PSK; + type = NMAccessPointSecurity.WPA_PSK; } else { if (flags & NM80211ApFlags.PRIVACY) type = NMAccessPointSecurity.WEP; diff --git a/js/ui/status/thunderbolt.js b/js/ui/status/thunderbolt.js index 728729812..13cdf2ce0 100644 --- a/js/ui/status/thunderbolt.js +++ b/js/ui/status/thunderbolt.js @@ -50,7 +50,7 @@ const BOLT_DBUS_PATH = '/org/freedesktop/bolt'; var Client = class { constructor() { - this._proxy = null; + this._proxy = null; let nodeInfo = Gio.DBusNodeInfo.new_for_xml(BoltClientInterface); Gio.DBusProxy.new(Gio.DBus.system, Gio.DBusProxyFlags.DO_NOT_AUTO_START, @@ -61,40 +61,40 @@ var Client = class { null, this._onProxyReady.bind(this)); - this.probing = false; + this.probing = false; } _onProxyReady(o, res) { try { - this._proxy = Gio.DBusProxy.new_finish(res); + this._proxy = Gio.DBusProxy.new_finish(res); } catch (e) { - log('error creating bolt proxy: %s'.format(e.message)); + log('error creating bolt proxy: %s'.format(e.message)); return; } - this._propsChangedId = this._proxy.connect('g-properties-changed', this._onPropertiesChanged.bind(this)); - this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this)); + this._propsChangedId = this._proxy.connect('g-properties-changed', this._onPropertiesChanged.bind(this)); + this._deviceAddedId = this._proxy.connectSignal('DeviceAdded', this._onDeviceAdded.bind(this)); - this.probing = this._proxy.Probing; - if (this.probing) - this.emit('probing-changed', this.probing); + this.probing = this._proxy.Probing; + if (this.probing) + this.emit('probing-changed', this.probing); } _onPropertiesChanged(proxy, properties) { let unpacked = properties.deep_unpack(); if (!('Probing' in unpacked)) - return; + return; - this.probing = this._proxy.Probing; - this.emit('probing-changed', this.probing); + this.probing = this._proxy.Probing; + this.emit('probing-changed', this.probing); } _onDeviceAdded(proxy, emitter, params) { - let [path] = params; - let device = new BoltDeviceProxy(Gio.DBus.system, - BOLT_DBUS_NAME, - path); - this.emit('device-added', device); + let [path] = params; + let device = new BoltDeviceProxy(Gio.DBus.system, + BOLT_DBUS_NAME, + path); + this.emit('device-added', device); } /* public methods */ @@ -102,26 +102,26 @@ var Client = class { if (!this._proxy) return; - this._proxy.disconnectSignal(this._deviceAddedId); - this._proxy.disconnect(this._propsChangedId); - this._proxy = null; + this._proxy.disconnectSignal(this._deviceAddedId); + this._proxy.disconnect(this._propsChangedId); + this._proxy = null; } enrollDevice(id, policy, callback) { - this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE, + this._proxy.EnrollDeviceRemote(id, policy, AuthCtrl.NONE, (res, error) => { - if (error) { - Gio.DBusError.strip_remote_error(error); - callback(null, error); - return; - } + if (error) { + Gio.DBusError.strip_remote_error(error); + callback(null, error); + return; + } - let [path] = res; - let device = new BoltDeviceProxy(Gio.DBus.system, - BOLT_DBUS_NAME, - path); - callback(device, null); - }); + let [path] = res; + let device = new BoltDeviceProxy(Gio.DBus.system, + BOLT_DBUS_NAME, + path); + callback(device, null); + }); } get authMode () { @@ -133,17 +133,17 @@ Signals.addSignalMethods(Client.prototype); /* helper class to automatically authorize new devices */ var AuthRobot = class { constructor(client) { - this._client = client; + this._client = client; - this._devicesToEnroll = []; - this._enrolling = false; + this._devicesToEnroll = []; + this._enrolling = false; - this._client.connect('device-added', this._onDeviceAdded.bind(this)); + this._client.connect('device-added', this._onDeviceAdded.bind(this)); } close() { - this.disconnectAll(); - this._client = null; + this.disconnectAll(); + this._client = null; } /* the "device-added" signal will be emitted by boltd for every @@ -151,8 +151,8 @@ var AuthRobot = class { * only interested in those devices, because all known devices * will be handled by the user himself */ _onDeviceAdded(cli, dev) { - if (dev.Status !== Status.CONNECTED) - return; + if (dev.Status !== Status.CONNECTED) + return; /* check if authorization is enabled in the daemon. if not * we won't even bother authorizing, because we will only @@ -162,16 +162,16 @@ var AuthRobot = class { if (!cli.authMode.split('|').includes(AuthMode.ENABLED)) return; - /* check if we should enroll the device */ - let res = [false]; - this.emit('enroll-device', dev, res); - if (res[0] !== true) - return; + /* check if we should enroll the device */ + let res = [false]; + this.emit('enroll-device', dev, res); + if (res[0] !== true) + return; - /* ok, we should authorize the device, add it to the back - * of the list */ - this._devicesToEnroll.push(dev); - this._enrollDevices(); + /* ok, we should authorize the device, add it to the back + * of the list */ + this._devicesToEnroll.push(dev); + this._enrollDevices(); } /* The enrollment queue: @@ -181,40 +181,40 @@ var AuthRobot = class { * enrolled. */ _enrollDevices() { - if (this._enrolling) - return; + if (this._enrolling) + return; - this._enrolling = true; - GLib.idle_add(GLib.PRIORITY_DEFAULT, - this._enrollDevicesIdle.bind(this)); + this._enrolling = true; + GLib.idle_add(GLib.PRIORITY_DEFAULT, + this._enrollDevicesIdle.bind(this)); } _onEnrollDone(device, error) { - if (error) - this.emit('enroll-failed', device, error); + if (error) + this.emit('enroll-failed', device, error); - /* TODO: scan the list of devices to be authorized for children - * of this device and remove them (and their children and - * their children and ....) from the device queue - */ - this._enrolling = this._devicesToEnroll.length > 0; + /* TODO: scan the list of devices to be authorized for children + * of this device and remove them (and their children and + * their children and ....) from the device queue + */ + this._enrolling = this._devicesToEnroll.length > 0; - if (this._enrolling) - GLib.idle_add(GLib.PRIORITY_DEFAULT, - this._enrollDevicesIdle.bind(this)); + if (this._enrolling) + GLib.idle_add(GLib.PRIORITY_DEFAULT, + this._enrollDevicesIdle.bind(this)); } _enrollDevicesIdle() { - let devices = this._devicesToEnroll; + let devices = this._devicesToEnroll; - let dev = devices.shift(); - if (dev === undefined) - return GLib.SOURCE_REMOVE; + let dev = devices.shift(); + if (dev === undefined) + return GLib.SOURCE_REMOVE; - this._client.enrollDevice(dev.Uid, - Policy.DEFAULT, - this._onEnrollDone.bind(this)); - return GLib.SOURCE_REMOVE; + this._client.enrollDevice(dev.Uid, + Policy.DEFAULT, + this._onEnrollDone.bind(this)); + return GLib.SOURCE_REMOVE; } }; Signals.addSignalMethods(AuthRobot.prototype); @@ -225,21 +225,21 @@ var Indicator = class extends PanelMenu.SystemIndicator { constructor() { super(); - this._indicator = this._addIndicator(); + this._indicator = this._addIndicator(); this._indicator.icon_name = 'thunderbolt-symbolic'; - this._client = new Client(); - this._client.connect('probing-changed', this._onProbing.bind(this)); + this._client = new Client(); + this._client.connect('probing-changed', this._onProbing.bind(this)); - this._robot = new AuthRobot(this._client); + this._robot = new AuthRobot(this._client); - this._robot.connect('enroll-device', this._onEnrollDevice.bind(this)); - this._robot.connect('enroll-failed', this._onEnrollFailed.bind(this)); + this._robot.connect('enroll-device', this._onEnrollDevice.bind(this)); + this._robot.connect('enroll-failed', this._onEnrollFailed.bind(this)); - Main.sessionMode.connect('updated', this._sync.bind(this)); + Main.sessionMode.connect('updated', this._sync.bind(this)); this._sync(); - this._source = null; + this._source = null; this._perm = null; Polkit.Permission.new('org.freedesktop.bolt.enroll', null, null, (source, res) => { @@ -253,7 +253,7 @@ var Indicator = class extends PanelMenu.SystemIndicator { _onDestroy() { this._robot.close(); - this._client.close(); + this._client.close(); } _ensureSource() { @@ -274,8 +274,8 @@ var Indicator = class extends PanelMenu.SystemIndicator { let source = this._ensureSource(); - this._notification = new MessageTray.Notification(source, title, body); - this._notification.setUrgency(MessageTray.Urgency.HIGH); + this._notification = new MessageTray.Notification(source, title, body); + this._notification.setUrgency(MessageTray.Urgency.HIGH); this._notification.connect('destroy', () => { this._notification = null; }); @@ -290,15 +290,15 @@ var Indicator = class extends PanelMenu.SystemIndicator { /* Session callbacks */ _sync() { let active = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; - this._indicator.visible = active && this._client.probing; + this._indicator.visible = active && this._client.probing; } /* Bolt.Client callbacks */ _onProbing(cli, probing) { - if (probing) - this._indicator.icon_name = 'thunderbolt-acquiring-symbolic'; - else - this._indicator.icon_name = 'thunderbolt-symbolic'; + if (probing) + this._indicator.icon_name = 'thunderbolt-acquiring-symbolic'; + else + this._indicator.icon_name = 'thunderbolt-symbolic'; this._sync(); } @@ -306,32 +306,32 @@ var Indicator = class extends PanelMenu.SystemIndicator { /* AuthRobot callbacks */ _onEnrollDevice(obj, device, policy) { /* only authorize new devices when in an unlocked user session */ - let unlocked = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; + let unlocked = !Main.sessionMode.isLocked && !Main.sessionMode.isGreeter; /* and if we have the permission to do so, otherwise we trigger a PolKit dialog */ let allowed = this._perm && this._perm.allowed; let auth = unlocked && allowed; - policy[0] = auth; + policy[0] = auth; log(`thunderbolt: [${device.Name}] auto enrollment: ${auth ? 'yes' : 'no'} (allowed: ${allowed ? 'yes' : 'no'})`); - if (auth) - return; /* we are done */ + if (auth) + return; /* we are done */ if (!unlocked) { - const title = _("Unknown Thunderbolt device"); - const body = _("New device has been detected while you were away. Please disconnect and reconnect the device to start using it."); - this._notify(title, body); + const title = _("Unknown Thunderbolt device"); + const body = _("New device has been detected while you were away. Please disconnect and reconnect the device to start using it."); + this._notify(title, body); } else { const title = _("Unauthorized Thunderbolt device"); - const body = _("New device has been detected and needs to be authorized by an administrator."); - this._notify(title, body); + const body = _("New device has been detected and needs to be authorized by an administrator."); + this._notify(title, body); } } _onEnrollFailed(obj, device, error) { - const title = _("Thunderbolt authorization error"); - const body = _("Could not authorize the Thunderbolt device: %s").format(error.message); - this._notify(title, body); + const title = _("Thunderbolt authorization error"); + const body = _("Could not authorize the Thunderbolt device: %s").format(error.message); + this._notify(title, body); } }; diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js index 398defd35..2ab7f6add 100644 --- a/js/ui/windowManager.js +++ b/js/ui/windowManager.js @@ -462,7 +462,7 @@ var TouchpadWorkspaceSwitchAction = class { this._dy = 0; this._enabled = true; actor.connect('captured-event', this._handleEvent.bind(this)); - this._touchpadSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.peripherals.touchpad' }); + this._touchpadSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.peripherals.touchpad' }); } get enabled() { @@ -515,10 +515,10 @@ var TouchpadWorkspaceSwitchAction = class { // Scale deltas up a bit to make it feel snappier this._dx += dx * 2; if (!(this._touchpadSettings.get_boolean('natural-scroll'))) - this._dy -= dy * 2; - else - this._dy += dy * 2; - + this._dy -= dy * 2; + else + this._dy += dy * 2; + this.emit('motion', this._dx, this._dy); } else { if ((event.get_gesture_phase() == Clutter.TouchpadGesturePhase.END && ! this._checkActivated()) ||