From 2fcc5d96491aec7fbd01a72feb92c739faecd08a Mon Sep 17 00:00:00 2001 From: Zhongyi Tong Date: Mon, 3 Jul 2017 02:01:49 +0800 Subject: [PATCH] Fix linting errors. --- .../js/pages/preference/general-section.js | 23 +++++----- app/renderer/js/pages/preference/nav.js | 12 +++--- .../js/pages/preference/new-server-form.js | 27 ++++++------ .../js/pages/preference/preference.js | 9 ++-- .../js/pages/preference/server-info-form.js | 27 ++++++------ .../js/pages/preference/servers-section.js | 42 +++++++++---------- app/renderer/js/tray.js | 16 ++++--- app/renderer/js/utils/config-util.js | 4 +- 8 files changed, 80 insertions(+), 80 deletions(-) diff --git a/app/renderer/js/pages/preference/general-section.js b/app/renderer/js/pages/preference/general-section.js index 4a1ba56f..6701a291 100644 --- a/app/renderer/js/pages/preference/general-section.js +++ b/app/renderer/js/pages/preference/general-section.js @@ -1,17 +1,18 @@ 'use strict'; const {ipcRenderer} = require('electron'); + const BaseComponent = require(__dirname + '/../../components/base.js'); const ConfigUtil = require(__dirname + '/../../utils/config-util.js'); -class GeneralSection extends BaseComponent{ +class GeneralSection extends BaseComponent { constructor(props) { super(); this.props = props; } - template() { - return ` + template() { + return `
Tray Options
@@ -21,8 +22,8 @@ class GeneralSection extends BaseComponent{
- `; - } + `; + } trayOptionTemplate(trayOption) { if (trayOption) { @@ -41,29 +42,29 @@ class GeneralSection extends BaseComponent{ } init() { - this.props.$root.innerHTML = this.template(); + this.props.$root.innerHTML = this.template(); this.initTrayOption(); } initTrayOption() { this.$trayOptionSettings = document.querySelector('#tray-option-settings .setting-control'); this.$trayOptionSettings.innerHTML = ''; - + const trayOption = ConfigUtil.getConfigItem('trayIcon', true); const $trayOption = this.generateNodeFromTemplate(this.trayOptionTemplate(trayOption)); this.$trayOptionSettings.appendChild($trayOption); - $trayOption.addEventListener('click', event=> { + $trayOption.addEventListener('click', () => { const newValue = !ConfigUtil.getConfigItem('trayIcon'); ConfigUtil.setConfigItem('trayIcon', newValue); ipcRenderer.send('forward', 'toggletray'); this.initTrayOption(); - }) + }); } - handleServerInfoChange(index) { + handleServerInfoChange() { ipcRenderer.send('reload-main'); } } -module.exports = GeneralSection; \ No newline at end of file +module.exports = GeneralSection; diff --git a/app/renderer/js/pages/preference/nav.js b/app/renderer/js/pages/preference/nav.js index a88dd792..0dbc2d5c 100644 --- a/app/renderer/js/pages/preference/nav.js +++ b/app/renderer/js/pages/preference/nav.js @@ -15,7 +15,7 @@ class PreferenceNav extends BaseComponent { template() { let navItemsTemplate = ''; - for (let navItem of this.navItems) { + for (const navItem of this.navItems) { navItemsTemplate += ``; } @@ -35,16 +35,16 @@ class PreferenceNav extends BaseComponent { } registerListeners() { - for (let navItem of this.navItems) { + for (const navItem of this.navItems) { const $item = document.getElementById(`nav-${navItem}`); - $item.addEventListener('click', event => { + $item.addEventListener('click', () => { this.props.onItemSelected(navItem); }); } } select(navItemToSelect) { - for (let navItem of this.navItems) { + for (const navItem of this.navItems) { if (navItem === navItemToSelect) { this.activate(navItem); } else { @@ -53,12 +53,12 @@ class PreferenceNav extends BaseComponent { } } - activate(navItem) { + activate(navItem) { const $item = document.getElementById(`nav-${navItem}`); $item.classList.add('active'); } - deactivate(navItem) { + deactivate(navItem) { const $item = document.getElementById(`nav-${navItem}`); $item.classList.remove('active'); } diff --git a/app/renderer/js/pages/preference/new-server-form.js b/app/renderer/js/pages/preference/new-server-form.js index b0819c25..86e914f2 100644 --- a/app/renderer/js/pages/preference/new-server-form.js +++ b/app/renderer/js/pages/preference/new-server-form.js @@ -1,20 +1,17 @@ 'use strict'; -const {ipcRenderer} = require('electron'); const BaseComponent = require(__dirname + '/../../components/base.js'); - const DomainUtil = require(__dirname + '/../../utils/domain-util.js'); -const Nav = require(__dirname + '/nav.js'); -class NewServerForm extends BaseComponent{ +class NewServerForm extends BaseComponent { constructor(props) { - super(); + super(); this.props = props; } - template() { - return ` -
+ template() { + return ` +
@@ -40,8 +37,8 @@ class NewServerForm extends BaseComponent{
- `; - } + `; + } init() { this.initForm(); @@ -50,14 +47,14 @@ class NewServerForm extends BaseComponent{ initForm() { this.$newServerForm = this.generateNodeFromTemplate(this.template()); - this.$saveServerButton = this.$newServerForm.getElementsByClassName('server-save-action')[0]; - this.props.$root.innerHTML = ''; + this.$saveServerButton = this.$newServerForm.getElementsByClassName('server-save-action')[0]; + this.props.$root.innerHTML = ''; this.props.$root.appendChild(this.$newServerForm); this.$newServerAlias = this.$newServerForm.querySelectorAll('input.server-info-value')[0]; this.$newServerUrl = this.$newServerForm.querySelectorAll('input.server-info-value')[1]; this.$newServerIcon = this.$newServerForm.querySelectorAll('input.server-info-value')[2]; - } + } initActions() { this.$saveServerButton.addEventListener('click', () => { @@ -69,7 +66,7 @@ class NewServerForm extends BaseComponent{ }; DomainUtil.addDomain(server); - this.props.onChange(this.props.index); + this.props.onChange(this.props.index); }, errorMessage => { alert(errorMessage); }); @@ -77,4 +74,4 @@ class NewServerForm extends BaseComponent{ } } -module.exports = NewServerForm; \ No newline at end of file +module.exports = NewServerForm; diff --git a/app/renderer/js/pages/preference/preference.js b/app/renderer/js/pages/preference/preference.js index fd493eca..5b89a8bd 100644 --- a/app/renderer/js/pages/preference/preference.js +++ b/app/renderer/js/pages/preference/preference.js @@ -1,15 +1,15 @@ 'use strict'; -const {ipcRenderer} = require('electron'); const BaseComponent = require(__dirname + '/js/components/base.js'); - const Nav = require(__dirname + '/js/pages/preference/nav.js'); const ServersSection = require(__dirname + '/js/pages/preference/servers-section.js'); const GeneralSection = require(__dirname + '/js/pages/preference/general-section.js'); -class PreferenceView { +class PreferenceView extends BaseComponent { constructor() { + super(); + this.$sidebarContainer = document.getElementById('sidebar'); this.$settingsContainer = document.getElementById('settings-container'); } @@ -37,8 +37,9 @@ class PreferenceView { }); break; } + default: break; } - this.section.init(); + this.section.init(); } } diff --git a/app/renderer/js/pages/preference/server-info-form.js b/app/renderer/js/pages/preference/server-info-form.js index 90fb3935..930319ec 100644 --- a/app/renderer/js/pages/preference/server-info-form.js +++ b/app/renderer/js/pages/preference/server-info-form.js @@ -1,20 +1,17 @@ 'use strict'; -const {ipcRenderer} = require('electron'); const BaseComponent = require(__dirname + '/../../components/base.js'); - const DomainUtil = require(__dirname + '/../../utils/domain-util.js'); -const Nav = require(__dirname + '/nav.js'); -class ServerInfoForm extends BaseComponent{ +class ServerInfoForm extends BaseComponent { constructor(props) { - super(); + super(); this.props = props; } - template() { - return ` -
+ template() { + return ` +
@@ -40,8 +37,8 @@ class ServerInfoForm extends BaseComponent{
- `; - } + `; + } init() { this.initForm(); @@ -50,16 +47,16 @@ class ServerInfoForm extends BaseComponent{ initForm() { this.$serverInfoForm = this.generateNodeFromTemplate(this.template()); - this.$deleteServerButton = this.$serverInfoForm.getElementsByClassName('server-delete-action')[0]; - this.props.$root.appendChild(this.$serverInfoForm); - } + this.$deleteServerButton = this.$serverInfoForm.getElementsByClassName('server-delete-action')[0]; + this.props.$root.appendChild(this.$serverInfoForm); + } initActions() { this.$deleteServerButton.addEventListener('click', () => { DomainUtil.removeDomain(this.props.index); - this.props.onChange(this.props.index); + this.props.onChange(this.props.index); }); } } -module.exports = ServerInfoForm; \ No newline at end of file +module.exports = ServerInfoForm; diff --git a/app/renderer/js/pages/preference/servers-section.js b/app/renderer/js/pages/preference/servers-section.js index 8a552a17..6030f48c 100644 --- a/app/renderer/js/pages/preference/servers-section.js +++ b/app/renderer/js/pages/preference/servers-section.js @@ -1,34 +1,34 @@ 'use strict'; const {ipcRenderer} = require('electron'); -const BaseComponent = require(__dirname + '/../../components/base.js'); +const BaseComponent = require(__dirname + '/../../components/base.js'); const DomainUtil = require(__dirname + '/../../utils/domain-util.js'); -const Nav = require(__dirname + '/nav.js'); const ServerInfoForm = require(__dirname + '/server-info-form.js'); const NewServerForm = require(__dirname + '/new-server-form.js'); -class ServersSection { +class ServersSection extends BaseComponent { constructor(props) { + super(); this.props = props; } - template() { - return ` -
-
Manage Servers
-
-
- add_box - New Server -
+ template() { + return ` +
+
Manage Servers
+
+
+ add_box + New Server +
- -
Existing Servers
-
-
- `; - } + +
Existing Servers
+
+
+ `; + } init() { this.initServers(); @@ -43,7 +43,7 @@ class ServersSection { this.$serverInfoContainer = document.getElementById('server-info-container'); this.$newServerContainer = document.getElementById('new-server-container'); this.$newServerButton = document.getElementById('new-server-action'); - + this.$serverInfoContainer.innerHTML = servers.length ? '' : 'Add your first server to get started!'; this.initNewServerForm(); @@ -73,9 +73,9 @@ class ServersSection { }); } - handleServerInfoChange(index) { + handleServerInfoChange() { ipcRenderer.send('reload-main'); } } -module.exports = ServersSection; \ No newline at end of file +module.exports = ServersSection; diff --git a/app/renderer/js/tray.js b/app/renderer/js/tray.js index b9a0b532..f595bf2b 100644 --- a/app/renderer/js/tray.js +++ b/app/renderer/js/tray.js @@ -47,7 +47,8 @@ const config = { const renderCanvas = function (arg) { config.unreadCount = arg; - return new Promise((resolve, reject) => { + + return new Promise(resolve => { const SIZE = config.size * config.pixelRatio; const PADDING = SIZE * 0.05; const CENTER = SIZE / 2; @@ -161,7 +162,9 @@ const createTray = function () { }; ipcRenderer.on('destroytray', event => { - if (!window.tray) return; + if (!window.tray) { + return; + } window.tray.destroy(); if (window.tray.isDestroyed()) { @@ -174,7 +177,9 @@ ipcRenderer.on('destroytray', event => { }); ipcRenderer.on('tray', (event, arg) => { - if (!window.tray) return; + if (!window.tray) { + return; + } if (arg === 0) { unread = arg; @@ -191,7 +196,6 @@ ipcRenderer.on('tray', (event, arg) => { }); function toggleTray() { - console.log(window.tray); if (window.tray) { window.tray.destroy(); if (window.tray.isDestroyed()) { @@ -202,7 +206,7 @@ function toggleTray() { createTray(); renderNativeImage(unread).then(image => { window.tray.setImage(image); - window.tray.setToolTip(arg + ' unread messages'); + window.tray.setToolTip(unread + ' unread messages'); }); ConfigUtil.setConfigItem('trayIcon', true); } @@ -212,4 +216,4 @@ ipcRenderer.on('toggletray', toggleTray); if (ConfigUtil.getConfigItem('trayIcon', true)) { createTray(); -} \ No newline at end of file +} diff --git a/app/renderer/js/utils/config-util.js b/app/renderer/js/utils/config-util.js index edfa72be..7f5e352e 100644 --- a/app/renderer/js/utils/config-util.js +++ b/app/renderer/js/utils/config-util.js @@ -17,8 +17,8 @@ class ConfigUtil { return instance; } - getConfigItem(key, defaultValue=null) { - let value = this.db.getData('/')[key]; + getConfigItem(key, defaultValue = null) { + const value = this.db.getData('/')[key]; if (value === undefined) { this.setConfigItem(key, value); return defaultValue;