[gnome-shell-extensions/wip/fmuellner/more-style-changes: 6/7] style: Change indentation style of object literals
- From: Florian Müllner <fmuellner src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-shell-extensions/wip/fmuellner/more-style-changes: 6/7] style: Change indentation style of object literals
- Date: Thu, 28 Feb 2019 22:30:53 +0000 (UTC)
commit db35d7ae7cbfd6bba13ca45cf25841fb098bd102
Author: Florian Müllner <fmuellner gnome org>
Date: Thu Feb 28 19:05:48 2019 +0100
style: Change indentation style of object literals
Instead of keeping the first property on the same line as the opening
brace and aligning the properties, use a four-space indent. This brings
us closer to gjs' coding style, and as a bonus helps keeping lines in
the soft 80 character limit.
https://gitlab.gnome.org/GNOME/gnome-shell-extensions/merge_requests/57
extensions/apps-menu/extension.js | 74 ++++++++++++------
extensions/auto-move-windows/prefs.js | 88 ++++++++++++++--------
extensions/drive-menu/extension.js | 12 ++-
extensions/places-menu/extension.js | 20 +++--
extensions/screenshot-window-sizer/extension.js | 11 +--
extensions/window-list/extension.js | 99 ++++++++++++++++---------
extensions/window-list/prefs.js | 28 ++++---
extensions/windowsNavigator/extension.js | 6 +-
extensions/workspace-indicator/extension.js | 6 +-
extensions/workspace-indicator/prefs.js | 22 ++++--
lint/eslintrc-legacy.json | 1 -
11 files changed, 236 insertions(+), 131 deletions(-)
---
diff --git a/extensions/apps-menu/extension.js b/extensions/apps-menu/extension.js
index 9e78933..fb5d6fd 100644
--- a/extensions/apps-menu/extension.js
+++ b/extensions/apps-menu/extension.js
@@ -1,8 +1,9 @@
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
/* exported init enable disable */
-const { Atk, Clutter, Gio, GLib, GMenu,
- GObject, Gtk, Meta, Shell, St } = imports.gi;
+const {
+ Atk, Clutter, Gio, GLib, GMenu, GObject, Gtk, Meta, Shell, St
+} = imports.gi;
const DND = imports.ui.dnd;
const Main = imports.ui.main;
const PanelMenu = imports.ui.panelMenu;
@@ -44,8 +45,11 @@ class ApplicationMenuItem extends PopupMenu.PopupBaseMenuItem {
this._iconBin = new St.Bin();
this.actor.add_child(this._iconBin);
- let appLabel = new St.Label({ text: app.get_name(), y_expand: true,
- y_align: Clutter.ActorAlign.CENTER });
+ let appLabel = new St.Label({
+ text: app.get_name(),
+ y_expand: true,
+ y_align: Clutter.ActorAlign.CENTER
+ });
this.actor.add_child(appLabel);
this.actor.label_actor = appLabel;
@@ -399,9 +403,11 @@ class ApplicationsButton extends PanelMenu.Button {
let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
- this._label = new St.Label({ text: _("Applications"),
- y_expand: true,
- y_align: Clutter.ActorAlign.CENTER });
+ this._label = new St.Label({
+ text: _("Applications"),
+ y_expand: true,
+ y_align: Clutter.ActorAlign.CENTER
+ });
hbox.add_child(this._label);
hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
@@ -457,8 +463,10 @@ class ApplicationsButton extends PanelMenu.Button {
}
_createVertSeparator() {
- let separator = new St.DrawingArea({ style_class: 'calendar-vertical-separator',
- pseudo_class: 'highlighted' });
+ let separator = new St.DrawingArea({
+ style_class: 'calendar-vertical-separator',
+ pseudo_class: 'highlighted'
+ });
separator.connect('repaint', this._onVertSepRepaint.bind(this));
return separator;
}
@@ -600,9 +608,12 @@ class ApplicationsButton extends PanelMenu.Button {
this.menu.addMenuItem(section);
this.mainBox = new St.BoxLayout({ vertical: false });
this.leftBox = new St.BoxLayout({ vertical: true });
- this.applicationsScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
- y_align: St.Align.START,
- style_class: 'apps-menu vfade' });
+ this.applicationsScrollBox = new St.ScrollView({
+ x_fill: true,
+ y_fill: false,
+ y_align: St.Align.START,
+ style_class: 'apps-menu vfade'
+ });
this.applicationsScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
let vscroll = this.applicationsScrollBox.get_vscroll_bar();
vscroll.connect('scroll-start', () => {
@@ -611,21 +622,30 @@ class ApplicationsButton extends PanelMenu.Button {
vscroll.connect('scroll-stop', () => {
this.menu.passEvents = false;
});
- this.categoriesScrollBox = new St.ScrollView({ x_fill: true, y_fill: false,
- y_align: St.Align.START,
- style_class: 'vfade' });
+ this.categoriesScrollBox = new St.ScrollView({
+ x_fill: true,
+ y_fill: false,
+ y_align: St.Align.START,
+ style_class: 'vfade'
+ });
this.categoriesScrollBox.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
vscroll = this.categoriesScrollBox.get_vscroll_bar();
vscroll.connect('scroll-start', () => this.menu.passEvents = true);
vscroll.connect('scroll-stop', () => this.menu.passEvents = false);
- this.leftBox.add(this.categoriesScrollBox, { expand: true,
- x_fill: true, y_fill: true,
- y_align: St.Align.START });
+ this.leftBox.add(this.categoriesScrollBox, {
+ expand: true,
+ x_fill: true,
+ y_fill: true,
+ y_align: St.Align.START
+ });
let activities = new ActivitiesMenuItem(this);
- this.leftBox.add(activities.actor, { expand: false,
- x_fill: true, y_fill: false,
- y_align: St.Align.START });
+ this.leftBox.add(activities.actor, {
+ expand: false,
+ x_fill: true,
+ y_fill: false,
+ y_align: St.Align.START
+ });
this.applicationsBox = new St.BoxLayout({ vertical: true });
this.applicationsScrollBox.add_actor(this.applicationsBox);
@@ -633,8 +653,16 @@ class ApplicationsButton extends PanelMenu.Button {
this.categoriesScrollBox.add_actor(this.categoriesBox);
this.mainBox.add(this.leftBox);
- this.mainBox.add(this._createVertSeparator(), { expand: false, x_fill: false, y_fill: true });
- this.mainBox.add(this.applicationsScrollBox, { expand: true, x_fill: true, y_fill: true });
+ this.mainBox.add(this._createVertSeparator(), {
+ expand: false,
+ x_fill: false,
+ y_fill: true
+ });
+ this.mainBox.add(this.applicationsScrollBox, {
+ expand: true,
+ x_fill: true,
+ y_fill: true
+ });
section.actor.add_actor(this.mainBox);
}
diff --git a/extensions/auto-move-windows/prefs.js b/extensions/auto-move-windows/prefs.js
index 92c3b05..3b3a70e 100644
--- a/extensions/auto-move-windows/prefs.js
+++ b/extensions/auto-move-windows/prefs.js
@@ -47,12 +47,18 @@ const Widget = GObject.registerClass({
this.add(scrolled);
- this._treeView = new Gtk.TreeView({ model: this._store,
- hexpand: true, vexpand: true });
+ this._treeView = new Gtk.TreeView({
+ model: this._store,
+ hexpand: true,
+ vexpand: true
+ });
this._treeView.get_selection().set_mode(Gtk.SelectionMode.SINGLE);
- let appColumn = new Gtk.TreeViewColumn({ expand: true, sort_column_id: Columns.DISPLAY_NAME,
- title: _("Application") });
+ let appColumn = new Gtk.TreeViewColumn({
+ expand: true,
+ sort_column_id: Columns.DISPLAY_NAME,
+ title: _("Application")
+ });
let iconRenderer = new Gtk.CellRendererPixbuf;
appColumn.pack_start(iconRenderer, false);
appColumn.add_attribute(iconRenderer, "gicon", Columns.ICON);
@@ -61,8 +67,10 @@ const Widget = GObject.registerClass({
appColumn.add_attribute(nameRenderer, "text", Columns.DISPLAY_NAME);
this._treeView.append_column(appColumn);
- let workspaceColumn = new Gtk.TreeViewColumn({ title: _("Workspace"),
- sort_column_id: Columns.WORKSPACE });
+ let workspaceColumn = new Gtk.TreeViewColumn({
+ title: _("Workspace"),
+ sort_column_id: Columns.WORKSPACE
+ });
let workspaceRenderer = new Gtk.CellRendererSpin({ editable: true });
workspaceRenderer.connect('edited', this._workspaceEdited.bind(this));
workspaceColumn.pack_start(workspaceRenderer, true);
@@ -76,13 +84,15 @@ const Widget = GObject.registerClass({
toolbar.get_style_context().add_class(Gtk.STYLE_CLASS_INLINE_TOOLBAR);
this.add(toolbar);
- let newButton = new Gtk.ToolButton({ icon_name: 'bookmark-new-symbolic',
- label: _("Add Rule"),
- is_important: true });
+ let newButton = new Gtk.ToolButton({
+ icon_name: 'bookmark-new-symbolic',
+ label: _("Add Rule"),
+ is_important: true
+ });
newButton.connect('clicked', this._createNew.bind(this));
toolbar.add(newButton);
- let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
+ let delButton = new Gtk.ToolButton({ icon_name: 'edit-delete-symbolic' });
delButton.connect('clicked', this._deleteSelected.bind(this));
toolbar.add(delButton);
@@ -97,17 +107,21 @@ const Widget = GObject.registerClass({
}
_createNew() {
- let dialog = new Gtk.Dialog({ title: _("Create new matching rule"),
- transient_for: this.get_toplevel(),
- use_header_bar: true,
- modal: true });
+ let dialog = new Gtk.Dialog({
+ title: _("Create new matching rule"),
+ transient_for: this.get_toplevel(),
+ use_header_bar: true,
+ modal: true
+ });
dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL);
let addButton = dialog.add_button(_("Add"), Gtk.ResponseType.OK);
dialog.set_default_response(Gtk.ResponseType.OK);
- let grid = new Gtk.Grid({ column_spacing: 10,
- row_spacing: 15,
- margin: 10 });
+ let grid = new Gtk.Grid({
+ column_spacing: 10,
+ row_spacing: 15,
+ margin: 10
+ });
dialog._appChooser = new Gtk.AppChooserWidget({ show_all: true });
dialog._appChooser.connect('application-selected', (w, appInfo) => {
addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
@@ -116,13 +130,19 @@ const Widget = GObject.registerClass({
addButton.sensitive = appInfo && this._checkId(appInfo.get_id());
grid.attach(dialog._appChooser, 0, 0, 2, 1);
- grid.attach(new Gtk.Label({ label: _("Workspace"),
- halign: Gtk.Align.END }), 0, 1, 1, 1);
- let adjustment = new Gtk.Adjustment({ lower: 1,
- upper: WORKSPACE_MAX,
- step_increment: 1 });
- dialog._spin = new Gtk.SpinButton({ adjustment: adjustment,
- snap_to_ticks: true });
+ grid.attach(new Gtk.Label({
+ label: _("Workspace"),
+ halign: Gtk.Align.END
+ }), 0, 1, 1, 1);
+ let adjustment = new Gtk.Adjustment({
+ lower: 1,
+ upper: WORKSPACE_MAX,
+ step_increment: 1
+ });
+ dialog._spin = new Gtk.SpinButton({
+ adjustment: adjustment,
+ snap_to_ticks: true
+ });
dialog._spin.set_value(1);
grid.attach(dialog._spin, 1, 1, 1, 1);
dialog.get_content_area().add(grid);
@@ -145,10 +165,12 @@ const Widget = GObject.registerClass({
this._changedPermitted = true;
let iter = this._store.append();
- let adj = new Gtk.Adjustment({ lower: 1,
- upper: WORKSPACE_MAX,
- step_increment: 1,
- value: index });
+ let adj = new Gtk.Adjustment({
+ lower: 1,
+ upper: WORKSPACE_MAX,
+ step_increment: 1,
+ value: index
+ });
this._store.set(iter,
[Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE,
Columns.ADJUSTMENT],
[appInfo, appInfo.get_icon(), appInfo.get_display_name(), index, adj]);
@@ -202,10 +224,12 @@ const Widget = GObject.registerClass({
validItems.push(currentItems[i]);
let iter = this._store.append();
- let adj = new Gtk.Adjustment({ lower: 1,
- upper: WORKSPACE_MAX,
- step_increment: 1,
- value: index });
+ let adj = new Gtk.Adjustment({
+ lower: 1,
+ upper: WORKSPACE_MAX,
+ step_increment: 1,
+ value: index
+ });
this._store.set(iter,
[Columns.APPINFO, Columns.ICON, Columns.DISPLAY_NAME, Columns.WORKSPACE,
Columns.ADJUSTMENT],
[appInfo, appInfo.get_icon(), appInfo.get_display_name(), parseInt(index), adj]);
diff --git a/extensions/drive-menu/extension.js b/extensions/drive-menu/extension.js
index 4c1fdbf..47537f5 100644
--- a/extensions/drive-menu/extension.js
+++ b/extensions/drive-menu/extension.js
@@ -22,8 +22,10 @@ class MountMenuItem extends PopupMenu.PopupBaseMenuItem {
this.mount = mount;
- let ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
- style_class: 'popup-menu-icon ' });
+ let ejectIcon = new St.Icon({
+ icon_name: 'media-eject-symbolic',
+ style_class: 'popup-menu-icon'
+ });
let ejectButton = new St.Button({ child: ejectIcon });
ejectButton.connect('clicked', this._eject.bind(this));
this.actor.add(ejectButton);
@@ -114,8 +116,10 @@ class DriveMenu extends PanelMenu.Button {
super._init(0.0, _("Removable devices"));
let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
- let icon = new St.Icon({ icon_name: 'media-eject-symbolic',
- style_class: 'system-status-icon' });
+ let icon = new St.Icon({
+ icon_name: 'media-eject-symbolic',
+ style_class: 'system-status-icon'
+ });
hbox.add_child(icon);
hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
diff --git a/extensions/places-menu/extension.js b/extensions/places-menu/extension.js
index b98d385..11090e1 100644
--- a/extensions/places-menu/extension.js
+++ b/extensions/places-menu/extension.js
@@ -22,16 +22,20 @@ class PlaceMenuItem extends PopupMenu.PopupBaseMenuItem {
super();
this._info = info;
- this._icon = new St.Icon({ gicon: info.icon,
- icon_size: PLACE_ICON_SIZE });
+ this._icon = new St.Icon({
+ gicon: info.icon,
+ icon_size: PLACE_ICON_SIZE
+ });
this.actor.add_child(this._icon);
this._label = new St.Label({ text: info.name, x_expand: true });
this.actor.add_child(this._label);
if (info.isRemovable()) {
- this._ejectIcon = new St.Icon({ icon_name: 'media-eject-symbolic',
- style_class: 'popup-menu-icon ' });
+ this._ejectIcon = new St.Icon({
+ icon_name: 'media-eject-symbolic',
+ style_class: 'popup-menu-icon'
+ });
this._ejectButton = new St.Button({ child: this._ejectIcon });
this._ejectButton.connect('clicked', info.eject.bind(info));
this.actor.add_child(this._ejectButton);
@@ -75,9 +79,11 @@ class PlacesMenu extends PanelMenu.Button {
super._init(0.0, _("Places"));
let hbox = new St.BoxLayout({ style_class: 'panel-status-menu-box' });
- let label = new St.Label({ text: _("Places"),
- y_expand: true,
- y_align: Clutter.ActorAlign.CENTER });
+ let label = new St.Label({
+ text: _("Places"),
+ y_expand: true,
+ y_align: Clutter.ActorAlign.CENTER
+ });
hbox.add_child(label);
hbox.add_child(PopupMenu.arrowIcon(St.Side.BOTTOM));
this.add_actor(hbox);
diff --git a/extensions/screenshot-window-sizer/extension.js b/extensions/screenshot-window-sizer/extension.js
index bf31f81..13d29f7 100644
--- a/extensions/screenshot-window-sizer/extension.js
+++ b/extensions/screenshot-window-sizer/extension.js
@@ -50,11 +50,12 @@ function flashMessage(message) {
text.set_position(monitor.x + Math.floor(monitor.width / 2 - text.width / 2),
monitor.y + Math.floor(monitor.height / 2 - text.height / 2));
- Tweener.addTween(text,
- { opacity: 0,
- time: MESSAGE_FADE_TIME,
- transition: 'easeOutQuad',
- onComplete: hideMessage });
+ Tweener.addTween(text, {
+ opacity: 0,
+ time: MESSAGE_FADE_TIME,
+ transition: 'easeOutQuad',
+ onComplete: hideMessage
+ });
}
let SIZES = [
diff --git a/extensions/window-list/extension.js b/extensions/window-list/extension.js
index ff7e774..24cd233 100644
--- a/extensions/window-list/extension.js
+++ b/extensions/window-list/extension.js
@@ -137,8 +137,11 @@ class WindowContextMenu extends PopupMenu.PopupMenu {
class WindowTitle {
constructor(metaWindow) {
this._metaWindow = metaWindow;
- this.actor = new St.BoxLayout({ style_class: 'window-button-box',
- x_expand: true, y_expand: true });
+ this.actor = new St.BoxLayout({
+ style_class: 'window-button-box',
+ x_expand: true,
+ y_expand: true
+ });
this._icon = new St.Bin({ style_class: 'window-button-icon' });
this.actor.add(this._icon);
@@ -188,8 +191,10 @@ class WindowTitle {
if (app)
this._icon.child = app.create_icon_texture(ICON_TEXTURE_SIZE);
else
- this._icon.child = new St.Icon({ icon_name: 'icon-missing',
- icon_size: ICON_TEXTURE_SIZE });
+ this._icon.child = new St.Icon({
+ icon_name: 'icon-missing',
+ icon_size: ICON_TEXTURE_SIZE
+ });
}
_onDestroy() {
@@ -210,12 +215,13 @@ class BaseButton {
this._perMonitor = perMonitor;
this._monitorIndex = monitorIndex;
- this.actor = new St.Button({ style_class: 'window-button',
- x_fill: true,
- y_fill: true,
- can_focus: true,
- button_mask: St.ButtonMask.ONE |
- St.ButtonMask.THREE });
+ this.actor = new St.Button({
+ style_class: 'window-button',
+ x_fill: true,
+ y_fill: true,
+ can_focus: true,
+ button_mask: St.ButtonMask.ONE | St.ButtonMask.THREE
+ });
this.actor._delegate = this;
this.actor.connect('allocation-changed',
@@ -463,21 +469,29 @@ class AppButton extends BaseButton {
let stack = new St.Widget({ layout_manager: new Clutter.BinLayout() });
this.actor.set_child(stack);
- this._singleWindowTitle = new St.Bin({ x_expand: true,
- y_fill: true,
- x_align: St.Align.START });
+ this._singleWindowTitle = new St.Bin({
+ x_expand: true,
+ y_fill: true,
+ x_align: St.Align.START
+ });
stack.add_actor(this._singleWindowTitle);
- this._multiWindowTitle = new St.BoxLayout({ style_class: 'window-button-box',
- x_expand: true });
+ this._multiWindowTitle = new St.BoxLayout({
+ style_class: 'window-button-box',
+ x_expand: true
+ });
stack.add_actor(this._multiWindowTitle);
- this._icon = new St.Bin({ style_class: 'window-button-icon',
- child: app.create_icon_texture(ICON_TEXTURE_SIZE) });
+ this._icon = new St.Bin({
+ style_class: 'window-button-icon',
+ child: app.create_icon_texture(ICON_TEXTURE_SIZE)
+ });
this._multiWindowTitle.add(this._icon);
- let label = new St.Label({ text: app.get_name(),
- y_align: Clutter.ActorAlign.CENTER });
+ let label = new St.Label({
+ text: app.get_name(),
+ y_align: Clutter.ActorAlign.CENTER
+ });
this._multiWindowTitle.add(label);
this._multiWindowTitle.label_actor = label;
@@ -643,16 +657,21 @@ class WorkspaceIndicator extends PanelMenu.Button {
this.add_style_class_name('window-list-workspace-indicator');
this.menu.actor.remove_style_class_name('panel-menu');
- let container = new St.Widget({ layout_manager: new Clutter.BinLayout(),
- x_expand: true, y_expand: true });
+ let container = new St.Widget({
+ layout_manager: new Clutter.BinLayout(),
+ x_expand: true,
+ y_expand: true
+ });
this.add_actor(container);
let workspaceManager = global.workspace_manager;
this._currentWorkspace = workspaceManager.get_active_workspace().index();
- this.statusLabel = new St.Label({ text: this._getStatusText(),
- x_align: Clutter.ActorAlign.CENTER,
- y_align: Clutter.ActorAlign.CENTER });
+ this.statusLabel = new St.Label({
+ text: this._getStatusText(),
+ x_align: Clutter.ActorAlign.CENTER,
+ y_align: Clutter.ActorAlign.CENTER
+ });
container.add_actor(this.statusLabel);
this.workspacesItems = [];
@@ -761,23 +780,27 @@ class WindowList {
this._perMonitor = perMonitor;
this._monitor = monitor;
- this.actor = new St.Widget({ name: 'panel',
- style_class: 'bottom-panel solid',
- reactive: true,
- track_hover: true,
- layout_manager: new Clutter.BinLayout() });
+ this.actor = new St.Widget({
+ name: 'panel',
+ style_class: 'bottom-panel solid',
+ reactive: true,
+ track_hover: true,
+ layout_manager: new Clutter.BinLayout()
+ });
this.actor.connect('destroy', this._onDestroy.bind(this));
let box = new St.BoxLayout({ x_expand: true, y_expand: true });
this.actor.add_actor(box);
let layout = new Clutter.BoxLayout({ homogeneous: true });
- this._windowList = new St.Widget({ style_class: 'window-list',
- reactive: true,
- layout_manager: layout,
- x_align: Clutter.ActorAlign.START,
- x_expand: true,
- y_expand: true });
+ this._windowList = new St.Widget({
+ style_class: 'window-list',
+ reactive: true,
+ layout_manager: layout,
+ x_align: Clutter.ActorAlign.START,
+ x_expand: true,
+ y_expand: true
+ });
box.add(this._windowList, { expand: true });
this._windowList.connect('style-changed', () => {
@@ -805,8 +828,10 @@ class WindowList {
this._menuManager = new PopupMenu.PopupMenuManager(this);
this._menuManager.addMenu(this._workspaceIndicator.menu);
- Main.layoutManager.addChrome(this.actor, { affectsStruts: true,
- trackFullscreen: true });
+ Main.layoutManager.addChrome(this.actor, {
+ affectsStruts: true,
+ trackFullscreen: true
+ });
Main.uiGroup.set_child_above_sibling(this.actor, Main.layoutManager.panelBox);
Main.ctrlAltTabManager.addGroup(this.actor, _("Window List"), 'start-here-symbolic');
diff --git a/extensions/window-list/prefs.js b/extensions/window-list/prefs.js
index 59fd697..3c2960a 100644
--- a/extensions/window-list/prefs.js
+++ b/extensions/window-list/prefs.js
@@ -23,15 +23,19 @@ class WindowListPrefsWidget extends Gtk.Grid {
this.orientation = Gtk.Orientation.VERTICAL;
let groupingLabel = '<b>%s</b>'.format(_("Window Grouping"));
- this.add(new Gtk.Label({ label: groupingLabel, use_markup: true,
- halign: Gtk.Align.START }));
+ this.add(new Gtk.Label({
+ label: groupingLabel, use_markup: true,
+ halign: Gtk.Align.START
+ }));
let align = new Gtk.Alignment({ left_padding: 12 });
this.add(align);
- let grid = new Gtk.Grid({ orientation: Gtk.Orientation.VERTICAL,
- row_spacing: 6,
- column_spacing: 6 });
+ let grid = new Gtk.Grid({
+ orientation: Gtk.Orientation.VERTICAL,
+ row_spacing: 6,
+ column_spacing: 6
+ });
align.add(grid);
this._settings = ExtensionUtils.getSettings();
@@ -54,9 +58,11 @@ class WindowListPrefsWidget extends Gtk.Grid {
continue;
}
- radio = new Gtk.RadioButton({ active: currentMode == mode,
- label: label,
- group: radio });
+ radio = new Gtk.RadioButton({
+ active: currentMode == mode,
+ label: label,
+ group: radio
+ });
grid.add(radio);
radio.connect('toggled', button => {
@@ -65,8 +71,10 @@ class WindowListPrefsWidget extends Gtk.Grid {
});
}
- let check = new Gtk.CheckButton({ label: _("Show on all monitors"),
- margin_top: 6 });
+ let check = new Gtk.CheckButton({
+ label: _("Show on all monitors"),
+ margin_top: 6
+ });
this._settings.bind('show-on-all-monitors', check, 'active', Gio.SettingsBindFlags.DEFAULT);
this.add(check);
}
diff --git a/extensions/windowsNavigator/extension.js b/extensions/windowsNavigator/extension.js
index 13de1bc..7d58ebe 100644
--- a/extensions/windowsNavigator/extension.js
+++ b/extensions/windowsNavigator/extension.js
@@ -229,8 +229,10 @@ function enable() {
workspaceInjections['_init'] = injectToFunction(Workspace.Workspace.prototype, '_init',
function(metaWorkspace) {
if (metaWorkspace && metaWorkspace.index() < 9) {
- createdActors.push(this._tip = new St.Label({ style_class:
'extension-windowsNavigator-window-tooltip',
- visible: false }));
+ createdActors.push(this._tip = new St.Label({
+ style_class: 'extension-windowsNavigator-window-tooltip',
+ visible: false
+ }));
this.actor.add_actor(this._tip);
let signalId = this.actor.connect('notify::scale-x', () => {
diff --git a/extensions/workspace-indicator/extension.js b/extensions/workspace-indicator/extension.js
index 9e1dfd7..38ed870 100644
--- a/extensions/workspace-indicator/extension.js
+++ b/extensions/workspace-indicator/extension.js
@@ -23,8 +23,10 @@ class WorkspaceIndicator extends PanelMenu.Button {
let workspaceManager = global.workspace_manager;
this._currentWorkspace = workspaceManager.get_active_workspace().index();
- this.statusLabel = new St.Label({ y_align: Clutter.ActorAlign.CENTER,
- text: this._labelText() });
+ this.statusLabel = new St.Label({
+ y_align: Clutter.ActorAlign.CENTER,
+ text: this._labelText()
+ });
this.add_actor(this.statusLabel);
diff --git a/extensions/workspace-indicator/prefs.js b/extensions/workspace-indicator/prefs.js
index 64a64fd..ed5c478 100644
--- a/extensions/workspace-indicator/prefs.js
+++ b/extensions/workspace-indicator/prefs.js
@@ -127,20 +127,26 @@ class WorkspaceSettingsWidget extends Gtk.Grid {
this.margin = 12;
this.orientation = Gtk.Orientation.VERTICAL;
- this.add(new Gtk.Label({ label: '<b>%s</b>'.format(_("Workspace Names")),
- use_markup: true, margin_bottom: 6,
- hexpand: true, halign: Gtk.Align.START }));
+ this.add(new Gtk.Label({
+ label: '<b>%s</b>'.format(_("Workspace Names")),
+ use_markup: true,
+ margin_bottom: 6,
+ hexpand: true,
+ halign: Gtk.Align.START
+ }));
let scrolled = new Gtk.ScrolledWindow({ shadow_type: Gtk.ShadowType.IN });
scrolled.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC);
this.add(scrolled);
this._store = new WorkspaceNameModel();
- this._treeView = new Gtk.TreeView({ model: this._store,
- headers_visible: false,
- reorderable: true,
- hexpand: true,
- vexpand: true });
+ this._treeView = new Gtk.TreeView({
+ model: this._store,
+ headers_visible: false,
+ reorderable: true,
+ hexpand: true,
+ vexpand: true
+ });
let column = new Gtk.TreeViewColumn({ title: _("Name") });
let renderer = new Gtk.CellRendererText({ editable: true });
diff --git a/lint/eslintrc-legacy.json b/lint/eslintrc-legacy.json
index 8b71651..1c57f08 100644
--- a/lint/eslintrc-legacy.json
+++ b/lint/eslintrc-legacy.json
@@ -9,7 +9,6 @@
"CallExpression[callee.object.name=GObject][callee.property.name=registerClass] >
ClassExpression:first-child"
],
"CallExpression": { "arguments": "first" },
- "ObjectExpression": "first",
"MemberExpression": "off"
}
],
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
