From 7bb0d93566517eebbc9f92ca963207e9aa511e95 Mon Sep 17 00:00:00 2001 From: Iuri Matias Date: Fri, 15 Feb 2019 15:35:37 -0500 Subject: [PATCH] simplify settings tab render method --- src/app/tabs/settings-tab.js | 80 +++++++++++++++++++----------------- 1 file changed, 42 insertions(+), 38 deletions(-) diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js index 3b929841d7..57cee609db 100644 --- a/src/app/tabs/settings-tab.js +++ b/src/app/tabs/settings-tab.js @@ -25,6 +25,10 @@ module.exports = class SettingsTab extends ApiFactory { } } /* eslint-enable */ this.event = new EventManager() + this.initTheme() + } + + initTheme () { const themeStorage = new Storage('style:') this.currentTheme = themeStorage.get('theme') || 'light' } @@ -48,34 +52,34 @@ module.exports = class SettingsTab extends ApiFactory { // Gist settings var gistAccessToken = yo`` - var token = self.config.get('settings/gist-access-token') + var token = this.config.get('settings/gist-access-token') if (token) gistAccessToken.value = token - var gistAddToken = yo` { self.config.set('settings/gist-access-token', gistAccessToken.value); tooltip('Access token saved') }} value="Save" type="button">` - var gistRemoveToken = yo` { gistAccessToken.value = ''; self.config.set('settings/gist-access-token', ''); tooltip('Access token removed') }} value="Remove" type="button">` - self._view.gistToken = yo`
${gistAccessToken}${copyToClipboard(() => self.config.get('settings/gist-access-token'))}${gistAddToken}${gistRemoveToken}
` + var gistAddToken = yo` { this.config.set('settings/gist-access-token', gistAccessToken.value); tooltip('Access token saved') }} value="Save" type="button">` + var gistRemoveToken = yo` { gistAccessToken.value = ''; this.config.set('settings/gist-access-token', ''); tooltip('Access token removed') }} value="Remove" type="button">` + this._view.gistToken = yo`
${gistAccessToken}${copyToClipboard(() => this.config.get('settings/gist-access-token'))}${gistAddToken}${gistRemoveToken}
` // - self._view.optionVM = yo`` - if (self.config.get('settings/always-use-vm')) self._view.optionVM.setAttribute('checked', '') - self._view.personal = yo`` - if (self.config.get('settings/personal-mode')) self._view.personal.setAttribute('checked', '') + this._view.optionVM = yo`` + if (this.config.get('settings/always-use-vm')) this._view.optionVM.setAttribute('checked', '') + this._view.personal = yo`` + if (this.config.get('settings/personal-mode')) this._view.personal.setAttribute('checked', '') var warnText = `Transaction sent over Web3 will use the web3.personal API - be sure the endpoint is opened before enabling it. This mode allows to provide the passphrase in the Remix interface without having to unlock the account. Although this is very convenient, you should completely trust the backend you are connected to (Geth, Parity, ...). It is not recommended (and also most likely not relevant) to use this mode with an injected provider (Mist, Metamask, ...) or with JavaScript VM. Remix never persist any passphrase.`.split('\n').map(s => s.trim()).join(' ') - self._view.warnPersonalMode = yo`` - self._view.generateContractMetadata = yo`` + this._view.warnPersonalMode = yo`` + this._view.generateContractMetadata = yo`` - if (self.config.get('settings/generate-contract-metadata')) self._view.generateContractMetadata.setAttribute('checked', '') + if (this.config.get('settings/generate-contract-metadata')) this._view.generateContractMetadata.setAttribute('checked', '') - self._view.pluginInput = yo`` + this._view.pluginInput = yo`` - self._view.theme.light = yo`` - self._view.theme.dark = yo`` - self._view.theme.clean = yo`` - self._view.theme[self.data.currentTheme].setAttribute('checked', 'checked') + this._view.theme.light = yo`` + this._view.theme.dark = yo`` + this._view.theme.clean = yo`` + this._view.theme[this.data.currentTheme].setAttribute('checked', 'checked') - self._view.config.homePage = yo` + this._view.config.homePage = yo`
Home
@@ -85,72 +89,72 @@ module.exports = class SettingsTab extends ApiFactory {
` - self._view.config.general = yo` + this._view.config.general = yo`
General settings
-
${self._view.generateContractMetadata}
+
${this._view.generateContractMetadata}
-
${self._view.optionVM}
+
${this._view.optionVM}
-
+
-
${self._view.personal}>
- +
${this._view.personal}>
+
` - self._view.gistToken = yo` + this._view.gistToken = yo`
Gist Access Token

Manage the access token used to publish to Gist and retrieve Github contents.

Go to github token page (link below) to create a new token and save it in Remix. Make sure this token has only 'create gist' permission.

https://github.com/settings/tokens

-
${self._view.gistToken}
+
${this._view.gistToken}
` - self._view.config.themes = yo` + this._view.config.themes = yo`
Themes
- ${self._view.theme.light} + ${this._view.theme.light}
- ${self._view.theme.dark} + ${this._view.theme.dark}
- ${self._view.theme.clean} + ${this._view.theme.clean}
` - self._view.el = yo` + this._view.el = yo`
- ${self._view.config.homePage} - ${self._view.config.general} - ${self._view.gistToken} - ${self._view.config.themes} + ${this._view.config.homePage} + ${this._view.config.general} + ${this._view.gistToken} + ${this._view.config.themes}
` function onchangeGenerateContractMetadata (event) { - self.config.set('settings/generate-contract-metadata', !self.config.get('settings/generate-contract-metadata')) + this.config.set('settings/generate-contract-metadata', !this.config.get('settings/generate-contract-metadata')) } function onchangeOption (event) { - self.config.set('settings/always-use-vm', !self.config.get('settings/always-use-vm')) + this.config.set('settings/always-use-vm', !this.config.get('settings/always-use-vm')) } function onswitch2darkTheme (event) { styleGuide.switchTheme('dark') @@ -162,9 +166,9 @@ module.exports = class SettingsTab extends ApiFactory { styleGuide.switchTheme('clean') } function onchangePersonal (event) { - self.config.set('settings/personal-mode', !self.config.get('settings/personal-mode')) + this.config.set('settings/personal-mode', !this.config.get('settings/personal-mode')) } styleGuide.switchTheme() - return self._view.el + return this._view.el } }