From 5d64f4e8db72700973b4c21e57ad2d6e4c1c4869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= Date: Thu, 19 Nov 2020 11:20:03 +0100 Subject: [PATCH] Update code for Gnome Shell coding rules --- extension.js | 673 ++++++++++++++++++++++++++------------------------- 1 file changed, 337 insertions(+), 336 deletions(-) diff --git a/extension.js b/extension.js index f5e969e..29ab522 100644 --- a/extension.js +++ b/extension.js @@ -42,340 +42,341 @@ const GObject = imports.gi.GObject; const Pixbuf = imports.gi.GdkPixbuf; const Cogl = imports.gi.Cogl; -function hash_get(hash, key, default_value) { - if (hash.hasOwnProperty(key)) - return hash[key]; - return default_value; +function hashGet(hash, key, defaultValue) { + if (hash.hasOwnProperty(key)) + return hash[key]; + + return defaultValue; } function log(message) { global.log('[GenericMontior]', message); } + var MyPopupMenuItem = GObject.registerClass({ - GTypeName: "MyPopupMenuItem" + GTypeName: "MyPopupMenuItem" }, class MyPopupMenuItem extends PopupMenu.PopupBaseMenuItem { _init(widgets, params) { - super._init(params); + super._init(params); - this.box = new St.BoxLayout({ style_class: 'popup-combobox-item' }); - this.box.set_vertical(true); + this.box = new St.BoxLayout({ style_class: 'popup-combobox-item' }); + this.box.set_vertical(true); - for (let widgetIndex in widgets) - this.box.add(widgets[widgetIndex]); - - this.add_child(this.box); + for (let widgetIndex in widgets) + this.box.add(widgets[widgetIndex]); + + this.add_child(this.box); } }); var MonitorWidget = GObject.registerClass({ - GTypeName: "MonitorWidget" + GTypeName: "MonitorWidget" }, class MonitorWidget extends PanelMenu.Button { - - _init(item, group, dbus, position) { - super._init(0.0); - + _init(item, group, dbus, position) { + super._init(0.0); + this.name = item['name']; this.group = group; - this.fullname = this.name + '@' + this.group; - this.dbus = dbus; - this.signals = {} + this.fullname = this.name + '@' + this.group; + this.dbus = dbus; + this.signals = {} if (item.hasOwnProperty('icon')) - { - if (typeof(item['icon']) === "string") - this.icon = this._createIconOld(item); - else - this.icon = this._createIcon(item['icon']); - if (this.icon !== null) { - this._connectWidgetSignals(this.icon); - this.add_child(this.icon); - } - } - else - this.icon = null; - + { + if (typeof(item['icon']) === "string") + this.icon = this._createIconOld(item); + else + this.icon = this._createIcon(item['icon']); + if (this.icon !== null) { + this._connectWidgetSignals(this.icon); + this.add_child(this.icon); + } + } + else + this.icon = null; + if (item.hasOwnProperty('text')) - { - if (typeof(item['text']) === "string") - this.widget = this._createTextOld(item); - else - this.widget = this._createText(item['text']); + { + if (typeof(item['text']) === "string") + this.widget = this._createTextOld(item); + else + this.widget = this._createText(item['text']); - if (this.widget !== null) { - this._connectWidgetSignals(this.widget); - this.add_child(this.widget); - } - } - else - this.widget = null; - + if (this.widget !== null) { + this._connectWidgetSignals(this.widget); + this.add_child(this.widget); + } + } + else + this.widget = null; + if (item.hasOwnProperty('popup')) this._createPopup(item['popup']); - this.onClick = hash_get(item, 'on-click', ''); - this.onDblClick = hash_get(item, 'on-dblclick', ''); - this.onRightClick = hash_get(item, 'on-rightclick', ''); - this.onRightDblClick = hash_get(item, 'on-rightdblclick', ''); - this.onEnter = hash_get(item, 'on-enter', ''); - this.onLeave = hash_get(item, 'on-leave', ''); - this.onScroll = hash_get(item, 'on-scroll', ''); + this.onClick = hashGet(item, 'on-click', ''); + this.onDblClick = hashGet(item, 'on-dblclick', ''); + this.onRightClick = hashGet(item, 'on-rightclick', ''); + this.onRightDblClick = hashGet(item, 'on-rightdblclick', ''); + this.onEnter = hashGet(item, 'on-enter', ''); + this.onLeave = hashGet(item, 'on-leave', ''); + this.onScroll = hashGet(item, 'on-scroll', ''); - let box = hash_get(item, 'box', 'center'); + let box = hashGet(item, 'box', 'center'); - if (box === 'right' && position == -1) - position = 0; - - this.connect('style-changed', this._onStyleChanged.bind(this)); + if (box === 'right' && position == -1) + position = 0; + + this.connect('style-changed', this._onStyleChanged.bind(this)); - // Disable click event at PanelMenu.button level - this.setSensitive(false); - - this.nbClicks = 0; - this.button = -1; + // Disable click event at PanelMenu.button level + this.setSensitive(false); + + this.nbClicks = 0; + this.button = -1; - Main.panel.addToStatusArea(this.fullname, this, position, box); + Main.panel.addToStatusArea(this.fullname, this, position, box); } - _onStyleChanged(actor) { - // Force these values to avoid big spaces between each widgets + _onStyleChanged() { + // Force these values to avoid big spaces between each widgets this._minHPadding = 1; this._natHPadding = 1; } _connectWidgetSignals(widget) { - this.signals[widget] = []; - let id; - id = widget.connect('enter-event', this._onEnter.bind(this)); - this.signals[widget].push(id); - id = widget.connect('leave-event', this._onLeave.bind(this)); - this.signals[widget].push(id); - id = widget.connect('scroll-event', this._onScroll.bind(this)); - this.signals[widget].push(id); - widget.set_reactive(true); - id = widget.connect('button-release-event', Lang.bind(this, this._clicked)); - this.signals[widget].push(id); + this.signals[widget] = []; + let id; + id = widget.connect('enter-event', this._onEnter.bind(this)); + this.signals[widget].push(id); + id = widget.connect('leave-event', this._onLeave.bind(this)); + this.signals[widget].push(id); + id = widget.connect('scroll-event', this._onScroll.bind(this)); + this.signals[widget].push(id); + widget.set_reactive(true); + id = widget.connect('button-release-event', Lang.bind(this, this._clicked)); + this.signals[widget].push(id); } _disconnectWidgetSignals(widget) { - for(let idx in this.signals[widget]) - widget.disconnect(this.signals[widget][idx]); - this.signals[widget] = null; + for(let idx in this.signals[widget]) + widget.disconnect(this.signals[widget][idx]); + this.signals[widget] = null; } _createPopup(item) { if (!item.hasOwnProperty('items')) { - return null; - } + return null; + } - let widgets = []; - for (let itemIndex in item['items']) { - let widget = null; - let widgetDict = item['items'][itemIndex]; + let widgets = []; + for (let itemIndex in item['items']) { + let widget = null; + let widgetDict = item['items'][itemIndex]; - if (widgetDict.hasOwnProperty('text')) - widget = this._createText(widgetDict['text']); - else if (widgetDict.hasOwnProperty('picture')) - widget = this._createPicture(widgetDict['picture']); + if (widgetDict.hasOwnProperty('text')) + widget = this._createText(widgetDict['text']); + else if (widgetDict.hasOwnProperty('picture')) + widget = this._createPicture(widgetDict['picture']); - if (widget !== null) - widgets.push(widget); - } + if (widget !== null) + widgets.push(widget); + } - if (widgets.length > 0) { - this.menuItem = new MyPopupMenuItem(widgets, {}); + if (widgets.length > 0) { + this.menuItem = new MyPopupMenuItem(widgets, {}); this.menu.addMenuItem(this.menuItem); - this.menu.setSensitive(false); - return this.menuItem; - } + this.menu.setSensitive(false); + return this.menuItem; + } - return null; + return null; } _createTextOld(item) { - var item_values = {}; - item_values = {'text':item['text']}; + var itemValues = {}; + itemValues = { 'text':item['text'] }; if (item.hasOwnProperty('style')) - item_values['style'] = item['style']; - return this._createText(item_values); + itemValues['style'] = item['style']; + return this._createText(itemValues); } _createText(item) { if (!item.hasOwnProperty('text')) { - log("Text must have a \'text\' value"); - return null; - } + log("Text must have a 'text' value"); + return null; + } - let style = hash_get(item, 'style', ''); + let style = hashGet(item, 'style', ''); - this.textProperties = item; + this.textProperties = item; - if (item['text'] === '') { + if (item['text'] === '') { return null; } else { let widget = new St.Button({ label: item['text'] }); widget.set_style(style); - return widget; - } + return widget; + } } _createIconOld(item) { - var item_values = {}; - item_values = {'path':item['icon']}; + var itemValues = {}; + itemValues = { 'path':item['icon'] }; if (item.hasOwnProperty('iconStyle')) - item_values['style'] = item['iconStyle']; - return this._createIcon(item_values); + itemValues['style'] = item['iconStyle']; + return this._createIcon(itemValues); } _createIcon(item) { if (!item.hasOwnProperty('path')) { - log("Icon must have a \'path\' value"); - return null; - } + log("Icon must have a 'path' value"); + return null; + } - let style = hash_get(item, 'style', ''); + let style = hashGet(item, 'style', ''); - this.iconProperties = item; + this.iconProperties = item; - if (item['path'] === '') { + if (item['path'] === '') { return null; } else { let gicon = Gio.icon_new_for_string(item['path']); gicon = new St.Icon({ gicon }); gicon.set_style(style); - return gicon; + return gicon; } } _createPicture(item) { if (!item.hasOwnProperty('path')) { - log("Picture must have a \'path\' value"); - return null; - } + log("Picture must have a 'path' value"); + return null; + } - let width = hash_get(item, 'width', -1); - let height = hash_get(item, 'height', -1); + let width = hashGet(item, 'width', -1); + let height = hashGet(item, 'height', -1); - if (typeof(width) === "string") - width = parseInt(width, 10); + if (typeof(width) === "string") + width = parseInt(width, 10); - if (typeof(heigth) === "string") - heigth = parseInt(heigth, 10); + if (typeof(height) === "string") + height = parseInt(height, 10); - let img = new Clutter.Image(); - let initial_pixbuf = Pixbuf.Pixbuf.new_from_file(item['path']); - img.set_data(initial_pixbuf.get_pixels(), - initial_pixbuf.get_has_alpha() ? Cogl.PixelFormat.RGBA_8888 - : Cogl.PixelFormat.RGB_888, - initial_pixbuf.get_width(), - initial_pixbuf.get_height(), - initial_pixbuf.get_rowstride()); - let picture = new Clutter.Actor(); - picture.set_content(img); - picture.set_size((width != -1)?width:initial_pixbuf.get_width(), - (height != -1)?height:initial_pixbuf.get_height()); + let img = new Clutter.Image(); + let initialPixbuf = Pixbuf.Pixbuf.new_from_file(item['path']); + img.set_data(initialPixbuf.get_pixels(), + initialPixbuf.get_has_alpha() ? Cogl.PixelFormat.RGBA_8888 + : Cogl.PixelFormat.RGB_888, + initialPixbuf.get_width(), + initialPixbuf.get_height(), + initialPixbuf.get_rowstride()); + let picture = new Clutter.Actor(); + picture.set_content(img); + picture.set_size((width != -1)?width:initialPixbuf.get_width(), + (height != -1)?height:initialPixbuf.get_height()); - // Pack it in a box to avoid picture resize - let box = new St.BoxLayout({}); - box.add_child(picture); + // Pack it in a box to avoid picture resize + let box = new St.BoxLayout({}); + box.add_child(picture); - return box; + return box; } _manageEventAction(action) { - if (action === 'open-popup') - this.menu.open(true); - else if (action === 'close-popup') - this.menu.close(); - else if (action === 'toggle-popup') - this.menu.toggle(); - else if (action == 'delete') - this.dbus.deleteItem(this, this.group); + if (action === 'open-popup') + this.menu.open(true); + else if (action === 'close-popup') + this.menu.close(); + else if (action === 'toggle-popup') + this.menu.toggle(); + else if (action == 'delete') + this.dbus.deleteItem(this, this.group); - return Clutter.EVENT_PROPAGATE; + return Clutter.EVENT_PROPAGATE; } _manageLeaveEvent() { - this._manageEventAction(this.onLeave); + this._manageEventAction(this.onLeave); } _doClickCallback() { let right = ''; let nbClicks = ''; if (this.button == 3) - right = 'Right'; + right = 'Right'; if (this.nbClicks > 1) - nbClicks = 'Dbl'; + nbClicks = 'Dbl'; let signalName = 'on' + right + nbClicks + 'Click'; - let action = 'signal'; - switch(signalName) { - case 'onClick': action = this.onClick; break; - case 'onDblClick': action = this.onDblClick; break; - case 'onRightClick': action = this.onRightClick; break; - case 'onRightDblClick': action = this.onRightDblClick; break; - } + let action = 'signal'; + switch(signalName) { + case 'onClick': action = this.onClick; break; + case 'onDblClick': action = this.onDblClick; break; + case 'onRightClick': action = this.onRightClick; break; + case 'onRightDblClick': action = this.onRightDblClick; break; + } - if (action === 'signal') - this.dbus.emit_signal(signalName, this.fullname); - else - this._manageEventAction(action); - this.nbClicks = 0; - this.button = -1; + if (action === 'signal') + this.dbus.emitSignal(signalName, this.fullname); + else + this._manageEventAction(action); + this.nbClicks = 0; + this.button = -1; - return false; + return false; } _clicked(actor, event) { - if (event.get_button() == this.button) { - this.nbClicks++; - } else { - this.button = event.get_button(); - this.nbClicks = 1; + if (event.get_button() == this.button) { + this.nbClicks++; + } else { + this.button = event.get_button(); + this.nbClicks = 1; - Mainloop.timeout_add(this.dbus.ClutterSettings['double-click-time'], - Lang.bind(this, this._doClickCallback)); - } + Mainloop.timeout_add(this.dbus.ClutterSettings['double-click-time'], + Lang.bind(this, this._doClickCallback)); + } - return Clutter.EVENT_PROPAGATE; + return Clutter.EVENT_PROPAGATE; } - _onEnter(actor, event) { - if (this.onEnter === 'signal') - this.dbus.emit_signal('onEnter', this.fullname); - else - return this._manageEventAction(this.onEnter); + _onEnter(/*actor, event*/) { + if (this.onEnter === 'signal') + this.dbus.emitSignal('onEnter', this.fullname); + else + return this._manageEventAction(this.onEnter); - return Clutter.EVENT_PROPAGATE; + return Clutter.EVENT_PROPAGATE; } - _onLeave(actor, event) { - if (this.onLeave === 'signal') - this.dbus.emit_signal('onLeave', this.fullname); - else - return this._manageEventAction(this.onEnter); + _onLeave(/*actor, event*/) { + if (this.onLeave === 'signal') + this.dbus.emitSignal('onLeave', this.fullname); + else + return this._manageEventAction(this.onEnter); - return Clutter.EVENT_PROPAGATE; + return Clutter.EVENT_PROPAGATE; } - _onScroll(actor, event) { - if (this.onScroll === 'signal') { - let direction = event.get_scroll_direction (); - if (direction == Clutter.ScrollDirection.UP) - this.dbus.emit_signal('onScrollUp', this.fullname); - else if (direction == Clutter.ScrollDirection.DOWN) - this.dbus.emit_signal('onScrollDown', this.fullname); - } else - return this._manageEventAction(this.onEnter); + _onScroll(/*actor, event*/) { + if (this.onScroll === 'signal') { + let direction = event.get_scroll_direction (); + if (direction == Clutter.ScrollDirection.UP) + this.dbus.emitSignal('onScrollUp', this.fullname); + else if (direction == Clutter.ScrollDirection.DOWN) + this.dbus.emitSignal('onScrollDown', this.fullname); + } else + return this._manageEventAction(this.onEnter); - return Clutter.EVENT_PROPAGATE; + return Clutter.EVENT_PROPAGATE; } update(item) { @@ -383,107 +384,107 @@ class MonitorWidget extends PanelMenu.Button { let prevIcon = this.icon; if (item.hasOwnProperty('text')) - { - let text = ''; - let style = ''; - if (typeof(item['text']) === "string") { - text = hash_get(item, 'text', ''); - style = hash_get(item, 'style', ''); - } else { - let textValues = item['text']; - text = hash_get(textValues, 'text', ''); - style = hash_get(textValues, 'style', ''); - } - + { + let text = ''; + let style = ''; + if (typeof(item['text']) === "string") { + text = hashGet(item, 'text', ''); + style = hashGet(item, 'style', ''); + } else { + let textValues = item['text']; + text = hashGet(textValues, 'text', ''); + style = hashGet(textValues, 'style', ''); + } + if (text !== '') { - if (!this.widget) { - if (typeof(item['text']) === "string") - this.widget = this._createTextOld(item); - else - this.widget = this._createText(item['text']); + if (!this.widget) { + if (typeof(item['text']) === "string") + this.widget = this._createTextOld(item); + else + this.widget = this._createText(item['text']); this.insert_child_above(this.widget, this.icon); - } else { + } else { this.widget.label = text; - } - } + } + } if (style !== '' && this.widget) { - this.widget.set_style(style); + this.widget.set_style(style); } } if (item.hasOwnProperty('icon')) - { - let icon = ''; - let style = ''; - if (typeof(item['icon']) === "string") { - icon = hash_get(item, 'icon', ''); - style = hash_get(item, 'iconStyle', ''); - } else { - let iconValues = item['icon']; - icon = hash_get(iconValues, 'path', ''); - style = hash_get(textValues, 'style', ''); - } - + { + let icon = ''; + let style = ''; + if (typeof(item['icon']) === "string") { + icon = hashGet(item, 'icon', ''); + style = hashGet(item, 'iconStyle', ''); + } else { + let iconValues = item['icon']; + icon = hashGet(iconValues, 'path', ''); + style = hashGet(iconValues, 'style', ''); + } + if (icon !== '') { - if (typeof(item['icon']) === "string") - this.icon = this._createIconOld(item); - else - this.icon = this._createIcon(item['icon']); - } - + if (typeof(item['icon']) === "string") + this.icon = this._createIconOld(item); + else + this.icon = this._createIcon(item['icon']); + } + if (prevIcon) { - this._disconnectWidgetSignals(prevIcon); + this._disconnectWidgetSignals(prevIcon); this.insert_child_above(this.icon, prevIcon); - this.remove_child(prevIcon); - //delete prevIcon; + this.remove_child(prevIcon); + //delete prevIcon; } else this.insert_child_before(this.icon, prevWidget); if (style !== '' && this.icon) { - this.icon.set_style(style); + this.icon.set_style(style); } } if (item.hasOwnProperty('popup')) - { - let menuOpen = this.menu.isOpen; - if (this.menuItem) { - if (menuOpen) - this.menu.close(); - this.menu.removeAll(); - //delete this.menuItem; - } + { + let menuOpen = this.menu.isOpen; + if (this.menuItem) { + if (menuOpen) + this.menu.close(); + this.menu.removeAll(); + //delete this.menuItem; + } - let popup = this._createPopup(item['popup']); - if (popup !== null && menuOpen) - this.menu.open(true); - } + let popup = this._createPopup(item['popup']); + if (popup !== null && menuOpen) + this.menu.open(true); + } - this.onClick = hash_get(item, 'on-click', this.onClick); - this.onDblClick = hash_get(item, 'on-dblclick', this.onDblClick); - this.onRightClick = hash_get(item, 'on-rightclick', this.onRightClick); - this.onRightDblClick = hash_get(item, 'on-rightdblclick', this.onRightDblClick); - this.onEnter = hash_get(item, 'on-enter', this.onEnter); - this.onLeave = hash_get(item, 'on-leave', this.onLeave); - this.onScroll = hash_get(item, 'on-scroll', this.onScroll); + this.onClick = hashGet(item, 'on-click', this.onClick); + this.onDblClick = hashGet(item, 'on-dblclick', this.onDblClick); + this.onRightClick = hashGet(item, 'on-rightclick', this.onRightClick); + this.onRightDblClick = hashGet(item, 'on-rightdblclick', this.onRightDblClick); + this.onEnter = hashGet(item, 'on-enter', this.onEnter); + this.onLeave = hashGet(item, 'on-leave', this.onLeave); + this.onScroll = hashGet(item, 'on-scroll', this.onScroll); } openPopup() { - this.menu.open(true); + this.menu.open(true); } closePopup() { - this.menu.close(); + this.menu.close(); } togglePopup() { - this.menu.toggle(); + this.menu.toggle(); } destroy() { - this.menu.close(); - super.destroy(); + this.menu.close(); + super.destroy(); } }); @@ -523,30 +524,30 @@ class GenericMonitorDBUS { this._dbusImpl.emit_signal('onActivate', null); } - emit_signal(name, value) { + emitSignal(name, value) { this._dbusImpl.emit_signal(name, GLib.Variant.new('(s)',[value])); } _checkParameters(parameters) { if (!parameters.hasOwnProperty('group')) { - log('No group defined'); - return false; - } + log('No group defined'); + return false; + } - if (!parameters.hasOwnProperty('items')) { - log('No items defined'); - return false; - } + if (!parameters.hasOwnProperty('items')) { + log('No items defined'); + return false; + } for (let itemIndex in parameters['items']) { let item = parameters['items'][itemIndex]; if (!item.hasOwnProperty('name')) { - log('No name defined for item'); - return false; - } + log('No name defined for item'); + return false; + } } - return true; + return true; } _getItemFromGroup(group, name) { @@ -560,14 +561,14 @@ class GenericMonitorDBUS { } _getItemFromFullName(fullname) { - let splitName = fullname.split('@'); + let splitName = fullname.split('@'); if (splitName.length !== 2) { - log(`Invalid name ${item}`); - return null; - } - if (!this.monitor_groups.hasOwnProperty(splitName[1])) - return null; - return this._getItemFromGroup(this.monitor_groups[splitName[1]], splitName[0]); + log(`Invalid name ${fullname}`); + return null; + } + if (!this.monitor_groups.hasOwnProperty(splitName[1])) + return null; + return this._getItemFromGroup(this.monitor_groups[splitName[1]], splitName[0]); } _removeFromArray(array, value) { @@ -585,7 +586,7 @@ class GenericMonitorDBUS { notify(str) { let parameters = JSON.parse(str); if (!this._checkParameters(parameters)) - return; + return; let groupName = parameters['group']; let group; @@ -602,21 +603,21 @@ class GenericMonitorDBUS { // New widget if (monitorWidget === null) { - let position = group.length - 1; - // Find real position - if (position != -1) { - let lastWidget = group[position].container; - let childrens = lastWidget.get_parent().get_children(); - for(;position < childrens.length; position++) - { - if (childrens[position] == lastWidget) { - position++; - break; - } - } - if (position >= childrens.length) - position = -1; - } + let position = group.length - 1; + // Find real position + if (position != -1) { + let lastWidget = group[position].container; + let childrens = lastWidget.get_parent().get_children(); + for(;position < childrens.length; position++) + { + if (childrens[position] == lastWidget) { + position++; + break; + } + } + if (position >= childrens.length) + position = -1; + } monitorWidget = new MonitorWidget(item, groupName, this, position); group.push(monitorWidget); } else { @@ -628,7 +629,7 @@ class GenericMonitorDBUS { deleteItem(item, groupName) { let group = this.monitor_groups[groupName]; group = this._removeFromArray(group, item); - item.destroy(); + item.destroy(); if (group.length === 0) delete this.monitor_groups[groupName]; else @@ -639,17 +640,17 @@ class GenericMonitorDBUS { let parameters = JSON.parse(str); if (!parameters.hasOwnProperty('items')) { - log('No items defined'); - return false; - } + log('No items defined'); + return false; + } for (let itemIndex in parameters['items']) { let itemName = parameters['items'][itemIndex]; let splitName = itemName.split('@'); if (splitName.length !== 2) { - log(`Invalid name ${itemName}`); - return false; - } + log(`Invalid name ${itemName}`); + return false; + } itemName = splitName[0]; let groupName = splitName[1]; if (!this.monitor_groups.hasOwnProperty(groupName)) @@ -666,9 +667,9 @@ class GenericMonitorDBUS { let parameters = JSON.parse(str); if (!parameters.hasOwnProperty('groups')) { - log('No groups defined'); - return false; - } + log('No groups defined'); + return false; + } let groupsToDelete = []; for (let groupIndex in parameters['groups']) { @@ -677,7 +678,7 @@ class GenericMonitorDBUS { continue; let group = this.monitor_groups[groupName]; for (let itemIndex in group) - group[itemIndex].destroy(); + group[itemIndex].destroy(); groupsToDelete.push(groupName); } for (let groupDeleteIndex in groupsToDelete) { @@ -690,35 +691,35 @@ class GenericMonitorDBUS { let parameters = JSON.parse(str); if (!parameters.hasOwnProperty('item')) { - log('No item defined'); - return false; - } + log('No item defined'); + return false; + } - let monitorWidget = this._getItemFromFullName(parameters['item']); - if (monitorWidget !== null) - return monitorWidget; - else - log(`Item ${str} not found`); + let monitorWidget = this._getItemFromFullName(parameters['item']); + if (monitorWidget !== null) + return monitorWidget; + else + log(`Item ${str} not found`); - return null; + return null; } openPopup(str) { - let monitorWidget = this._popupFunction(str) - if (monitorWidget !== null) - monitorWidget.openPopup(); + let monitorWidget = this._popupFunction(str) + if (monitorWidget !== null) + monitorWidget.openPopup(); } closePopup(str) { - let monitorWidget = this._popupFunction(str) - if (monitorWidget !== null) - monitorWidget.closePopup(); + let monitorWidget = this._popupFunction(str) + if (monitorWidget !== null) + monitorWidget.closePopup(); } togglePopup(str) { - let monitorWidget = this._popupFunction(str) - if (monitorWidget !== null) - monitorWidget.togglePopup(); + let monitorWidget = this._popupFunction(str) + if (monitorWidget !== null) + monitorWidget.togglePopup(); } destructor() { @@ -726,7 +727,7 @@ class GenericMonitorDBUS { for (let groupIndex in this.monitor_groups) { let group = this.monitor_groups[groupIndex]; for (let itemIndex in group) - group[itemIndex].destroy(); + group[itemIndex].destroy(); } this.monitor_groups = {}; this._dbusImpl.unexport();