From 29b04fcbf20eb067f90ff75932abbe82472f0c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Tue, 29 Jan 2019 02:18:52 +0100 Subject: [PATCH] style: Fix stray/missing semi-colons Spotted by eslint. https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/607 --- js/gdm/loginDialog.js | 2 +- js/gdm/realmd.js | 4 ++-- js/gdm/util.js | 2 +- js/misc/fileUtils.js | 2 +- js/misc/inputMethod.js | 2 +- js/misc/modemManager.js | 2 +- js/misc/permissionStore.js | 2 +- js/misc/util.js | 2 +- js/perf/hwtest.js | 2 +- js/ui/altTab.js | 8 ++++---- js/ui/appDisplay.js | 4 ++-- js/ui/appFavorites.js | 2 +- js/ui/audioDeviceSelection.js | 2 +- js/ui/barLevel.js | 2 +- js/ui/boxpointer.js | 4 ++-- js/ui/closeDialog.js | 6 +++--- js/ui/components/keyring.js | 2 +- js/ui/components/networkAgent.js | 2 +- js/ui/components/polkitAgent.js | 2 +- js/ui/dash.js | 2 +- js/ui/dateMenu.js | 2 +- js/ui/dnd.js | 4 ++-- js/ui/ibusCandidatePopup.js | 2 +- js/ui/iconGrid.js | 6 +++--- js/ui/keyboard.js | 10 +++++----- js/ui/locatePointer.js | 2 +- js/ui/modalDialog.js | 2 +- js/ui/notificationDaemon.js | 2 +- js/ui/overviewControls.js | 2 +- js/ui/padOsd.js | 10 +++++----- js/ui/panel.js | 8 ++++---- js/ui/pointerA11yTimeout.js | 2 +- js/ui/popupMenu.js | 2 +- js/ui/screenShield.js | 2 +- js/ui/screenshot.js | 2 +- js/ui/shellEntry.js | 6 +++--- js/ui/slider.js | 4 ++-- js/ui/status/network.js | 2 +- js/ui/status/power.js | 2 +- js/ui/viewSelector.js | 6 +++--- js/ui/windowAttentionHandler.js | 2 +- js/ui/windowManager.js | 4 ++-- js/ui/workspace.js | 4 ++-- js/ui/workspaceThumbnail.js | 4 ++-- tests/interactive/scroll-view-sizing.js | 2 +- 45 files changed, 75 insertions(+), 75 deletions(-) diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js index 032bac6d6..e6df865cc 100644 --- a/js/gdm/loginDialog.js +++ b/js/gdm/loginDialog.js @@ -401,7 +401,7 @@ var LoginDialog = GObject.registerClass({ this.connect('destroy', this._onDestroy.bind(this)); parentActor.add_child(this); - this._userManager = AccountsService.UserManager.get_default() + this._userManager = AccountsService.UserManager.get_default(); this._gdmClient = new Gdm.Client(); this._settings = new Gio.Settings({ schema_id: GdmUtil.LOGIN_SCREEN_SCHEMA }); diff --git a/js/gdm/realmd.js b/js/gdm/realmd.js index 4ec64edff..f00d3023a 100644 --- a/js/gdm/realmd.js +++ b/js/gdm/realmd.js @@ -19,7 +19,7 @@ var Manager = class { this._aggregateProvider = Provider(Gio.DBus.system, 'org.freedesktop.realmd', '/org/freedesktop/realmd', - this._reloadRealms.bind(this)) + this._reloadRealms.bind(this)); this._realms = {}; this._signalId = this._aggregateProvider.connect('g-properties-changed', @@ -104,4 +104,4 @@ var Manager = class { this._updateLoginFormat(); } }; -Signals.addSignalMethods(Manager.prototype) +Signals.addSignalMethods(Manager.prototype); diff --git a/js/gdm/util.js b/js/gdm/util.js index 95f2e92e5..f5dd7813c 100644 --- a/js/gdm/util.js +++ b/js/gdm/util.js @@ -30,7 +30,7 @@ var LOGO_KEY = 'logo'; var DISABLE_USER_LIST_KEY = 'disable-user-list'; // Give user 48ms to read each character of a PAM message -var USER_READ_TIME = 48 +var USER_READ_TIME = 48; var MessageType = { NONE: 0, diff --git a/js/misc/fileUtils.js b/js/misc/fileUtils.js index 81fdae0e4..8f2b94d95 100644 --- a/js/misc/fileUtils.js +++ b/js/misc/fileUtils.js @@ -86,7 +86,7 @@ function loadInterfaceXML(iface) { try { let [ok, bytes] = f.load_contents(null); if (bytes instanceof Uint8Array) - xml = imports.byteArray.toString(bytes) + xml = imports.byteArray.toString(bytes); else xml = bytes.toString(); } catch (e) { diff --git a/js/misc/inputMethod.js b/js/misc/inputMethod.js index 8d46264e1..3699a21e5 100644 --- a/js/misc/inputMethod.js +++ b/js/misc/inputMethod.js @@ -74,7 +74,7 @@ class InputMethod extends Clutter.InputMethod { this._context = null; this._hints = 0; this._purpose = 0; - this._preeditStr = '' + this._preeditStr = ''; this._preeditPos = 0; this._preeditVisible = false; } diff --git a/js/misc/modemManager.js b/js/misc/modemManager.js index 33088644d..f54b5ed48 100644 --- a/js/misc/modemManager.js +++ b/js/misc/modemManager.js @@ -173,7 +173,7 @@ var ModemCdma = class { } else { let [bandClass, band, sid] = result; - this.operator_name = _findProviderForSid(sid) + this.operator_name = _findProviderForSid(sid); } this.emit('notify::operator-name'); }); diff --git a/js/misc/permissionStore.js b/js/misc/permissionStore.js index 9118d4d3f..61f60c6e9 100644 --- a/js/misc/permissionStore.js +++ b/js/misc/permissionStore.js @@ -12,4 +12,4 @@ function PermissionStore(initCallback, cancellable) { 'org.freedesktop.impl.portal.PermissionStore', '/org/freedesktop/impl/portal/PermissionStore', initCallback, cancellable); -}; +} diff --git a/js/misc/util.js b/js/misc/util.js index 9362f32ea..bfe9cfed8 100644 --- a/js/misc/util.js +++ b/js/misc/util.js @@ -380,7 +380,7 @@ class CloseButton extends St.Button { let themeNode = this.get_theme_node(); let offY = this._computeBoxPointerOffset(); - this.translation_x = themeNode.get_length('-shell-close-overlap-x') + this.translation_x = themeNode.get_length('-shell-close-overlap-x'); this.translation_y = themeNode.get_length('-shell-close-overlap-y') + offY; } diff --git a/js/perf/hwtest.js b/js/perf/hwtest.js index 661f2ef9a..f9fb298b2 100644 --- a/js/perf/hwtest.js +++ b/js/perf/hwtest.js @@ -30,7 +30,7 @@ var METRICS = { geditStartTime: { description: "Time from gedit launch to window drawn", units: "us" }, -} +}; function waitAndDraw(milliseconds) { let cb; diff --git a/js/ui/altTab.js b/js/ui/altTab.js index b5681435e..a75716a04 100644 --- a/js/ui/altTab.js +++ b/js/ui/altTab.js @@ -36,7 +36,7 @@ function _createWindowClone(window, size) { // usual hack for the usual bug in ClutterBinLayout... x_expand: true, y_expand: true }); -}; +} function getWindows(workspace) { // We ignore skip-taskbar windows in switchers, but if they are attached @@ -459,7 +459,7 @@ class CyclerHighlight { _onDestroy() { this.window = null; } -}; +} // We don't show an actual popup, so just provide what SwitcherPopup // expects instead of inheriting from SwitcherList @@ -1036,7 +1036,7 @@ class WindowList extends SwitcherPopup.SwitcherList { this.icons.push(icon); icon._unmanagedSignalId = icon.window.connect('unmanaged', (window) => { - this._removeWindow(window) + this._removeWindow(window); }); } @@ -1072,7 +1072,7 @@ class WindowList extends SwitcherPopup.SwitcherList { childBox.y1 = childBox.y2 - this._label.height; this._label.allocate(childBox, flags); - let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM) + let totalLabelHeight = this._label.height + themeNode.get_padding(St.Side.BOTTOM); childBox.x1 = box.x1; childBox.x2 = box.x2; childBox.y1 = box.y1; diff --git a/js/ui/appDisplay.js b/js/ui/appDisplay.js index b2226d3e3..1c67d9638 100644 --- a/js/ui/appDisplay.js +++ b/js/ui/appDisplay.js @@ -217,7 +217,7 @@ class BaseAppView { Tweener.addTween(this._grid, params); } -}; +} Signals.addSignalMethods(BaseAppView.prototype); var AllView = class AllView extends BaseAppView { @@ -852,7 +852,7 @@ var AppDisplay = class AppDisplay { this._controls.opacity = 0; finalOpacity = 255; } else { - finalOpacity = 0 + finalOpacity = 0; } Tweener.addTween(this._controls, diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js index 657e15965..dd1de1fc9 100644 --- a/js/ui/appFavorites.js +++ b/js/ui/appFavorites.js @@ -187,7 +187,7 @@ class AppFavorites { } }); } -}; +} Signals.addSignalMethods(AppFavorites.prototype); var appFavoritesInstance = null; diff --git a/js/ui/audioDeviceSelection.js b/js/ui/audioDeviceSelection.js index ef7930388..ce45a6577 100644 --- a/js/ui/audioDeviceSelection.js +++ b/js/ui/audioDeviceSelection.js @@ -110,7 +110,7 @@ var AudioDeviceSelectionDialog = GObject.registerClass({ } _openSettings() { - let desktopFile = 'gnome-sound-panel.desktop' + let desktopFile = 'gnome-sound-panel.desktop'; let app = Shell.AppSystem.get_default().lookup_app(desktopFile); if (!app) { diff --git a/js/ui/barLevel.js b/js/ui/barLevel.js index d2f961ce2..3a0a1a4fb 100644 --- a/js/ui/barLevel.js +++ b/js/ui/barLevel.js @@ -14,7 +14,7 @@ var BarLevel = class { this._barLevelWidth = 0; if (params == undefined) - params = {} + params = {}; this.actor = new St.DrawingArea({ styleClass: params['styleClass'] || 'barlevel', can_focus: params['canFocus'] || false, diff --git a/js/ui/boxpointer.js b/js/ui/boxpointer.js index 422ddbf50..fdeea723f 100644 --- a/js/ui/boxpointer.js +++ b/js/ui/boxpointer.js @@ -396,7 +396,7 @@ var BoxPointer = GObject.registerClass({ cr.lineTo(x1 - rise, y1); cr.lineTo(x1 + borderRadius, y1); } else if (skipBottomLeft) { - cr.lineTo(x1 - rise, y2) + cr.lineTo(x1 - rise, y2); cr.lineTo(x1 - rise, y2 - halfBase); } else { cr.lineTo(x1, this._arrowOrigin + halfBase); @@ -437,7 +437,7 @@ var BoxPointer = GObject.registerClass({ this._sourceActorDestroyId = this._sourceActor.connect('destroy', () => { this._sourceActor = null; delete this._sourceActorDestroyId; - }) + }); } } diff --git a/js/ui/closeDialog.js b/js/ui/closeDialog.js index ee2045ec7..0806b2067 100644 --- a/js/ui/closeDialog.js +++ b/js/ui/closeDialog.js @@ -6,8 +6,8 @@ const Dialog = imports.ui.dialog; const Main = imports.ui.main; const Tweener = imports.ui.tweener; -var FROZEN_WINDOW_BRIGHTNESS = -0.3 -var DIALOG_TRANSITION_TIME = 0.15 +var FROZEN_WINDOW_BRIGHTNESS = -0.3; +var DIALOG_TRANSITION_TIME = 0.15; var ALIVE_TIMEOUT = 5000; var CloseDialog = GObject.registerClass({ @@ -165,7 +165,7 @@ var CloseDialog = GObject.registerClass({ GLib.source_remove(this._timeoutId); this._timeoutId = 0; - global.display.disconnect(this._windowFocusChangedId) + global.display.disconnect(this._windowFocusChangedId); this._windowFocusChangedId = 0; global.stage.disconnect(this._keyFocusChangedId); diff --git a/js/ui/components/keyring.js b/js/ui/components/keyring.js index fccadca12..ed39282f7 100644 --- a/js/ui/components/keyring.js +++ b/js/ui/components/keyring.js @@ -172,7 +172,7 @@ class KeyringDialog extends ModalDialog.ModalDialog { log('keyringPrompt: Failed to show modal dialog.' + ' Dismissing prompt request'); - this.prompt.cancel() + this.prompt.cancel(); return false; } diff --git a/js/ui/components/networkAgent.js b/js/ui/components/networkAgent.js index 03dc0f229..efe08137d 100644 --- a/js/ui/components/networkAgent.js +++ b/js/ui/components/networkAgent.js @@ -343,7 +343,7 @@ class NetworkSecretDialog extends ModalDialog.ModalDialog { break; default: log('Invalid connection type: ' + connectionType); - }; + } return content; } diff --git a/js/ui/components/polkitAgent.js b/js/ui/components/polkitAgent.js index c32d52b0f..39a4d8040 100644 --- a/js/ui/components/polkitAgent.js +++ b/js/ui/components/polkitAgent.js @@ -50,7 +50,7 @@ var AuthenticationDialog = GObject.registerClass({ userName = userNames[0]; this._user = AccountsService.UserManager.get_default().get_user(userName); - let userRealName = this._user.get_real_name() + let userRealName = this._user.get_real_name(); this._userLoadedId = this._user.connect('notify::is_loaded', this._onUserChanged.bind(this)); this._userChangedId = this._user.connect('changed', diff --git a/js/ui/dash.js b/js/ui/dash.js index f010a52ae..884b4df27 100644 --- a/js/ui/dash.js +++ b/js/ui/dash.js @@ -81,7 +81,7 @@ class DashItemContainer extends St.Widget { let itemHeight = this.allocation.y2 - this.allocation.y1; let labelHeight = this.label.get_height(); - let yOffset = Math.floor((itemHeight - labelHeight) / 2) + let yOffset = Math.floor((itemHeight - labelHeight) / 2); let y = stageY + yOffset; diff --git a/js/ui/dateMenu.js b/js/ui/dateMenu.js index fad27cfd2..4392b7f10 100644 --- a/js/ui/dateMenu.js +++ b/js/ui/dateMenu.js @@ -47,7 +47,7 @@ var TodayButton = class TodayButton { this._calendar.connect('selected-date-changed', (calendar, date) => { // Make the button reactive only if the selected date is not the // current date. - this.actor.reactive = !_isToday(date) + this.actor.reactive = !_isToday(date); }); } diff --git a/js/ui/dnd.js b/js/ui/dnd.js index 367815dbd..37e48cb41 100644 --- a/js/ui/dnd.js +++ b/js/ui/dnd.js @@ -689,12 +689,12 @@ var _Draggable = class _Draggable { params['onCompleteParams'] = [this._dragActor, eventTime]; // start the animation - Tweener.addTween(this._dragActor, params) + Tweener.addTween(this._dragActor, params); } _finishAnimation() { if (!this._animationInProgress) - return + return; this._animationInProgress = false; if (!this._buttonDown) diff --git a/js/ui/ibusCandidatePopup.js b/js/ui/ibusCandidatePopup.js index f51b78971..2bfb57bfe 100644 --- a/js/ui/ibusCandidatePopup.js +++ b/js/ui/ibusCandidatePopup.js @@ -44,7 +44,7 @@ var CandidateArea = class CandidateArea { case Clutter.ScrollDirection.DOWN: this.emit('cursor-down'); break; - }; + } return Clutter.EVENT_PROPAGATE; }); diff --git a/js/ui/iconGrid.js b/js/ui/iconGrid.js index 22732f9a1..f635836ea 100644 --- a/js/ui/iconGrid.js +++ b/js/ui/iconGrid.js @@ -141,7 +141,7 @@ class BaseIcon extends St.Bin { function clamp(value, min, max) { return Math.max(Math.min(value, max), min); -}; +} function zoomOutActor(actor) { let actorClone = new Clutter.Clone({ source: actor, @@ -385,7 +385,7 @@ var IconGrid = GObject.registerClass({ let childVolume = child.get_transformed_paint_volume(this); if (!childVolume) - return false + return false; paintVolume.union(childVolume); } @@ -887,7 +887,7 @@ var PaginatedIconGrid = GObject.registerClass({ if (!this._nPages) return 0; - let firstPageItem = pageNumber * this._childrenPerPage + let firstPageItem = pageNumber * this._childrenPerPage; let childBox = this._getVisibleChildren()[firstPageItem].get_allocation_box(); return childBox.y1 - this.topPadding; } diff --git a/js/ui/keyboard.js b/js/ui/keyboard.js index 2a096f2c1..e46da2a35 100644 --- a/js/ui/keyboard.js +++ b/js/ui/keyboard.js @@ -297,7 +297,7 @@ var Key = class Key { } _press(key) { - this.emit('activated') + this.emit('activated'); if (key != this.key || this._extended_keys.length == 0) { this.emit('pressed', this._getKeyval(key), key); @@ -680,7 +680,7 @@ var EmojiPager = class EmojiPager { _onPanEnd() { if (Math.abs(this._delta) < this.actor.width * PANEL_SWITCH_RELATIVE_DISTANCE) { - this._onPanCancel() + this._onPanCancel(); } else { let value; if (this._delta > 0) @@ -951,7 +951,7 @@ var EmojiSelection = class EmojiSelection { let section = this._sections[i]; key = new Key(section.label, []); - key.connect('released', () => { this._emojiPager.setCurrentSection(section, 0) }); + key.connect('released', () => { this._emojiPager.setCurrentSection(section, 0); }); row.appendKey(key.actor); section.button = key; @@ -1750,13 +1750,13 @@ var KeyboardController = class { purpose == Clutter.InputContentPurpose.PHONE) keypadVisible = true; - this.emit('emoji-visible', emojiVisible) + this.emit('emoji-visible', emojiVisible); this.emit('keypad-visible', keypadVisible); } getGroups() { let inputSources = this._inputSourceManager.inputSources; - let groups = [] + let groups = []; for (let i in inputSources) { let is = inputSources[i]; diff --git a/js/ui/locatePointer.js b/js/ui/locatePointer.js index 0ab5728cc..cb6efbf72 100644 --- a/js/ui/locatePointer.js +++ b/js/ui/locatePointer.js @@ -5,7 +5,7 @@ const Ripples = imports.ui.ripples; const Main = imports.ui.main; const LOCATE_POINTER_KEY = "locate-pointer"; -const LOCATE_POINTER_SCHEMA = "org.gnome.desktop.interface" +const LOCATE_POINTER_SCHEMA = "org.gnome.desktop.interface"; var LocatePointer = class { constructor() { diff --git a/js/ui/modalDialog.js b/js/ui/modalDialog.js index 5e35a8e6c..8bc4e50d0 100644 --- a/js/ui/modalDialog.js +++ b/js/ui/modalDialog.js @@ -179,7 +179,7 @@ var ModalDialog = GObject.registerClass({ time: OPEN_AND_CLOSE_TIME, transition: 'easeOutQuad', onComplete: this._closeComplete.bind(this) - }) + }); else this._closeComplete(); } diff --git a/js/ui/notificationDaemon.js b/js/ui/notificationDaemon.js index 84147d41a..df5181a7c 100644 --- a/js/ui/notificationDaemon.js +++ b/js/ui/notificationDaemon.js @@ -231,7 +231,7 @@ var FdoNotificationDaemon = class FdoNotificationDaemon { // There's already a pending call to GetConnectionUnixProcessID, // which will see the new notification data when it finishes, // so we don't have to do anything. - return invocation.return_value(GLib.Variant.new('(u)', [id]));; + return invocation.return_value(GLib.Variant.new('(u)', [id])); } this._busProxy.GetConnectionUnixProcessIDRemote(sender, (result, excp) => { diff --git a/js/ui/overviewControls.js b/js/ui/overviewControls.js index a58d63524..223e217d6 100644 --- a/js/ui/overviewControls.js +++ b/js/ui/overviewControls.js @@ -18,7 +18,7 @@ function getRtlSlideDirection(direction, actor) { SlideDirection.RIGHT : SlideDirection.LEFT; return direction; -}; +} var SlideDirection = { LEFT: 0, diff --git a/js/ui/padOsd.js b/js/ui/padOsd.js index 903b967c4..b5067795e 100644 --- a/js/ui/padOsd.js +++ b/js/ui/padOsd.js @@ -121,7 +121,7 @@ var ActionComboBox = class { this.actor.set_child(box); this._label = new St.Label({ style_class: 'combo-box-label' }); - box.add_child(this._label) + box.add_child(this._label); let arrow = new St.Icon({ style_class: 'popup-menu-arrow', icon_name: 'pan-down-symbolic', @@ -457,7 +457,7 @@ var PadDiagram = GObject.registerClass({ // I miss Cairo.Matrix let dimensions = this._handle.get_dimensions(); x = x * this._scale + this._actorWidth / 2 - dimensions.width / 2 * this._scale; - y = y * this._scale + this._actorHeight / 2 - dimensions.height / 2 * this._scale;; + y = y * this._scale + this._actorHeight / 2 - dimensions.height / 2 * this._scale; return [Math.round(x), Math.round(y)]; } @@ -488,7 +488,7 @@ var PadDiagram = GObject.registerClass({ pos.y = this._imageHeight - pos.y; } - let [x, y] = this._transformPoint(pos.x, pos.y) + let [x, y] = this._transformPoint(pos.x, pos.y); return [true, x, y, direction]; } @@ -734,7 +734,7 @@ var PadOsd = class { _updatePadChooser() { if (this._groupPads.length > 1) { if (this._padChooser == null) { - this._padChooser = new PadChooser(this.padDevice, this._groupPads) + this._padChooser = new PadChooser(this.padDevice, this._groupPads); this._padChooser.connect('pad-selected', (chooser, pad) => { this._requestForOtherPad(pad); }); @@ -864,7 +864,7 @@ var PadOsd = class { if (this._followUpActionEdition(str)) return; - this._padDiagram.stopEdition(false, str ? str : _("None")) + this._padDiagram.stopEdition(false, str ? str : _("None")); this._editedAction = null; } diff --git a/js/ui/panel.js b/js/ui/panel.js index fbd65a263..79c71c9f4 100644 --- a/js/ui/panel.js +++ b/js/ui/panel.js @@ -51,7 +51,7 @@ function _premultiply(color) { green: _norm(color.green * color.alpha), blue: _norm(color.blue * color.alpha), alpha: color.alpha }); -}; +} function _unpremultiply(color) { if (color.alpha == 0) @@ -62,7 +62,7 @@ function _unpremultiply(color) { let blue = Math.min((color.blue * 255 + 127) / color.alpha, 255); return new Clutter.Color({ red: red, green: green, blue: blue, alpha: color.alpha }); -}; +} class AppMenu extends PopupMenu.PopupMenu { constructor(sourceActor) { @@ -1189,7 +1189,7 @@ class Panel extends St.Widget { _getDraggableWindowForPosition(stageX) { let workspaceManager = global.workspace_manager; - let workspace = workspaceManager.get_active_workspace() + let workspace = workspaceManager.get_active_workspace(); let allWindowsByStacking = global.display.sort_windows_by_stacking( workspace.list_windows() ).reverse(); @@ -1200,7 +1200,7 @@ class Panel extends St.Widget { metaWindow.showing_on_its_workspace() && metaWindow.get_window_type() != Meta.WindowType.DESKTOP && metaWindow.maximized_vertically && - stageX > rect.x && stageX < rect.x + rect.width + stageX > rect.x && stageX < rect.x + rect.width; }); } }); diff --git a/js/ui/pointerA11yTimeout.js b/js/ui/pointerA11yTimeout.js index 6ec379899..617555eb7 100644 --- a/js/ui/pointerA11yTimeout.js +++ b/js/ui/pointerA11yTimeout.js @@ -67,7 +67,7 @@ class PieTimer extends St.DrawingArea { time: duration / 1000, transition: 'easeOutQuad', onUpdateScope: this, - onUpdate() { this.queue_repaint() }, + onUpdate() { this.queue_repaint(); }, onCompleteScope: this, onComplete() { this.stop(); } }); diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js index d48f1f3c3..5c672d5e2 100644 --- a/js/ui/popupMenu.js +++ b/js/ui/popupMenu.js @@ -261,7 +261,7 @@ class PopupMenuItem extends PopupBaseMenuItem { this.label = new St.Label({ text: text }); this.add_child(this.label); - this.label_actor = this.label + this.label_actor = this.label; } }); diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js index 0c3c00d19..9501bf0c8 100644 --- a/js/ui/screenShield.js +++ b/js/ui/screenShield.js @@ -1288,7 +1288,7 @@ var ScreenShield = class { lock(animate) { if (this._lockSettings.get_boolean(DISABLE_LOCK_KEY)) { - log('Screen lock is locked down, not locking') // lock, lock - who's there? + log('Screen lock is locked down, not locking'); // lock, lock - who's there? return; } diff --git a/js/ui/screenshot.js b/js/ui/screenshot.js index c6896ff9b..d094579ea 100644 --- a/js/ui/screenshot.js +++ b/js/ui/screenshot.js @@ -27,7 +27,7 @@ var ScreenshotService = class { _createScreenshot(invocation, needsDisk=true) { let lockedDown = false; if (needsDisk) - lockedDown = this._lockdownSettings.get_boolean('disable-save-to-disk') + lockedDown = this._lockdownSettings.get_boolean('disable-save-to-disk'); let sender = invocation.get_sender(); if (this._screenShooter.has(sender) || lockedDown) { diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js index 62b42f71b..c3130c526 100644 --- a/js/ui/shellEntry.js +++ b/js/ui/shellEntry.js @@ -118,7 +118,7 @@ function _setMenuAlignment(entry, stageX) { let [success, entryX, entryY] = entry.transform_stage_point(stageX, 0); if (success) entry.menu.setSourceAlignment(entryX / entry.width); -}; +} function _onButtonPressEvent(actor, event, entry) { if (entry.menu.isOpen) { @@ -131,14 +131,14 @@ function _onButtonPressEvent(actor, event, entry) { return Clutter.EVENT_STOP; } return Clutter.EVENT_PROPAGATE; -}; +} function _onPopup(actor, entry) { let [success, textX, textY, lineHeight] = entry.clutter_text.position_to_coords(-1); if (success) entry.menu.setSourceAlignment(textX / entry.width); entry.menu.open(BoxPointer.PopupAnimation.FULL); -}; +} function addContextMenu(entry, params) { if (entry.menu) diff --git a/js/ui/slider.js b/js/ui/slider.js index 4025a11fd..9b77057de 100644 --- a/js/ui/slider.js +++ b/js/ui/slider.js @@ -14,8 +14,8 @@ var Slider = class extends BarLevel.BarLevel { canFocus: true, reactive: true, accessibleRole: Atk.Role.SLIDER, - } - super(value, params) + }; + super(value, params); this.actor.connect('button-press-event', this._startDragging.bind(this)); this.actor.connect('touch-event', this._touchDragging.bind(this)); diff --git a/js/ui/status/network.js b/js/ui/status/network.js index b47b27dc0..b8d8348a3 100644 --- a/js/ui/status/network.js +++ b/js/ui/status/network.js @@ -916,7 +916,7 @@ class NMWirelessDialog extends ModalDialog.ModalDialog { this._device.get_path(), accessPoints[0].get_path()]); } else { let connection = new NM.SimpleConnection(); - this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null) + this._client.add_and_activate_connection_async(connection, this._device, accessPoints[0].get_path(), null, null); } } diff --git a/js/ui/status/power.js b/js/ui/status/power.js index 252b0dc4e..5569210bb 100644 --- a/js/ui/status/power.js +++ b/js/ui/status/power.js @@ -112,7 +112,7 @@ var Indicator = class extends PanelMenu.SystemIndicator { this._item.icon.icon_name = icon; // The icon label - let label + let label; if (this._proxy.State == UPower.DeviceState.FULLY_CHARGED) label = _("%d\u2009%%").format(100); else diff --git a/js/ui/viewSelector.js b/js/ui/viewSelector.js index a46cb4cce..ef2080e96 100644 --- a/js/ui/viewSelector.js +++ b/js/ui/viewSelector.js @@ -314,7 +314,7 @@ var ViewSelector = class { focusCallback: () => { this._a11yFocusPage(page); } - });; + }); page.hide(); this.actor.add_actor(page); return page; @@ -363,7 +363,7 @@ var ViewSelector = class { this._activePage == this._workspacesPage && !Main.overview.animationInProgress) { this.appDisplay.animate(IconGrid.AnimationDirection.OUT, () => { - this._animateIn(oldPage) + this._animateIn(oldPage); }); } else { this._fadePageOut(page); @@ -382,7 +382,7 @@ var ViewSelector = class { this.emit('page-changed'); if (oldPage) - this._animateOut(oldPage) + this._animateOut(oldPage); else this._animateIn(); } diff --git a/js/ui/windowAttentionHandler.js b/js/ui/windowAttentionHandler.js index a9a7111ba..f5aeaf29c 100644 --- a/js/ui/windowAttentionHandler.js +++ b/js/ui/windowAttentionHandler.js @@ -17,7 +17,7 @@ var WindowAttentionHandler = class { _getTitleAndBanner(app, window) { let title = app.get_name(); let banner = _("“%s” is ready").format(window.get_title()); - return [title, banner] + return [title, banner]; } _onWindowDemandsAttention(display, window) { diff --git a/js/ui/windowManager.js b/js/ui/windowManager.js index a25da9964..036a0f396 100644 --- a/js/ui/windowManager.js +++ b/js/ui/windowManager.js @@ -1096,7 +1096,7 @@ var WindowManager = class { let updateUnfullscreenGesture = () => { let currentWindow = global.display.focus_window; topDragAction.enabled = currentWindow && currentWindow.is_fullscreen(); - } + }; global.display.connect('notify::focus-window', updateUnfullscreenGesture); global.display.connect('in-fullscreen-changed', updateUnfullscreenGesture); @@ -1106,7 +1106,7 @@ var WindowManager = class { _showPadOsd(display, device, settings, imagePath, editionMode, monitorIndex) { this._currentPadOsd = new PadOsd.PadOsd(device, settings, imagePath, editionMode, monitorIndex); - this._currentPadOsd.connect('closed', () => { this._currentPadOsd = null }); + this._currentPadOsd.connect('closed', () => { this._currentPadOsd = null; }); return this._currentPadOsd.actor; } diff --git a/js/ui/workspace.js b/js/ui/workspace.js index 16c0e188c..4b7e80082 100644 --- a/js/ui/workspace.js +++ b/js/ui/workspace.js @@ -903,7 +903,7 @@ var LayoutStrategy = class { // keep track how much smaller the grid becomes due to scaling // so it can be centered again - let compensation = 0 + let compensation = 0; let y = 0; for (let i = 0; i < rows.length; i++) { @@ -925,7 +925,7 @@ var LayoutStrategy = class { // height would undo what vertical scaling is trying to achieve. } - row.x = area.x + (Math.max(area.width - (widthWithoutSpacing * row.additionalScale + horizontalSpacing), 0) / 2) + row.x = area.x + (Math.max(area.width - (widthWithoutSpacing * row.additionalScale + horizontalSpacing), 0) / 2); row.y = area.y + (Math.max(area.height - (heightWithoutSpacing + verticalSpacing), 0) / 2) + y; y += row.height * row.additionalScale + this._rowSpacing; } diff --git a/js/ui/workspaceThumbnail.js b/js/ui/workspaceThumbnail.js index 765f80146..e39f139f9 100644 --- a/js/ui/workspaceThumbnail.js +++ b/js/ui/workspaceThumbnail.js @@ -686,7 +686,7 @@ class ThumbnailsBox extends St.Widget { let [r, x, y] = this.transform_stage_point(stageX, stageY); for (let i = 0; i < this._thumbnails.length; i++) { - let thumbnail = this._thumbnails[i] + let thumbnail = this._thumbnails[i]; let [w, h] = thumbnail.actor.get_transformed_size(); if (y >= thumbnail.actor.y && y <= thumbnail.actor.y + h) { thumbnail.activate(time); @@ -789,7 +789,7 @@ class ThumbnailsBox extends St.Widget { break; } else if (y > targetBottom && y <= nextTargetTop) { this._dropWorkspace = i; - break + break; } targetBase = nextTargetBase; diff --git a/tests/interactive/scroll-view-sizing.js b/tests/interactive/scroll-view-sizing.js index f01352188..d94dcee07 100644 --- a/tests/interactive/scroll-view-sizing.js +++ b/tests/interactive/scroll-view-sizing.js @@ -35,7 +35,7 @@ class FlowedBoxes extends St.Widget { for (let i = 0; i < BOX_WIDTHS.length; i++) { let child = new St.Bin({ width: BOX_WIDTHS[i], height: BOX_HEIGHT, - style: 'border: 1px solid #444444; background: #00aa44' }) + style: 'border: 1px solid #444444; background: #00aa44' }); this.add_actor(child); } }