From a8b446cbb259004268d6adba0741869e65300337 Mon Sep 17 00:00:00 2001 From: Rob Stupay Date: Tue, 16 Apr 2019 10:55:23 +0200 Subject: [PATCH] update to fa5 - no shims --- index.html | 2 +- src/app/components/vertical-icons-component.js | 2 +- src/app/debugger/debuggerUI/ButtonNavigator.js | 16 ++++++++-------- .../debuggerUI/vmDebugger/DropdownPanel.js | 14 +++++++------- src/app/editor/contextView.js | 6 +++--- src/app/execution/confirmDialog.js | 2 +- src/app/execution/txLogger.js | 16 ++++++++-------- src/app/files/file-explorer.js | 10 +++++----- src/app/files/remixd-handle.js | 2 +- src/app/panels/terminal.js | 6 +++--- src/app/tabs/compile-tab.js | 10 +++++----- src/app/tabs/compileTab/compilerContainer.js | 4 ++-- src/app/tabs/run-tab.js | 2 +- src/app/tabs/runTab/contractDropdown.js | 4 ++-- src/app/tabs/runTab/recorder.js | 4 ++-- src/app/tabs/runTab/settings.js | 8 ++++---- src/app/tabs/settings-tab.js | 2 +- src/app/ui/TreeView.js | 6 +++--- src/app/ui/card.js | 2 +- src/app/ui/copy-to-clipboard.js | 2 +- src/app/ui/draggableContent.js | 6 +++--- src/app/ui/dropdown.js | 2 +- src/app/ui/modaldialog.js | 2 +- src/app/ui/renderer.js | 2 +- src/multiParamManager.js | 4 ++-- src/persmission-handler.js | 2 +- src/universal-dapp-ui.js | 4 ++-- 27 files changed, 71 insertions(+), 71 deletions(-) diff --git a/index.html b/index.html index 934a8e74a1..7a8db83e6a 100644 --- a/index.html +++ b/index.html @@ -29,8 +29,8 @@ Remix - Solidity IDE + - diff --git a/src/app/components/vertical-icons-component.js b/src/app/components/vertical-icons-component.js index e85322e09a..9e01f33856 100644 --- a/src/app/components/vertical-icons-component.js +++ b/src/app/components/vertical-icons-component.js @@ -90,7 +90,7 @@ class VerticalIconComponent { let key = helper.checkSpecialChars(status.key) ? '' : status.key let type = helper.checkSpecialChars(status.type) ? '' : status.type let title = helper.checkSpecialChars(status.title) ? '' : status.title - el.appendChild(yo``) + el.appendChild(yo``) // el.classList = "" doesn't work on all browser use instead var classList = el.classList diff --git a/src/app/debugger/debuggerUI/ButtonNavigator.js b/src/app/debugger/debuggerUI/ButtonNavigator.js index ab93272492..f4c777983a 100644 --- a/src/app/debugger/debuggerUI/ButtonNavigator.js +++ b/src/app/debugger/debuggerUI/ButtonNavigator.js @@ -46,19 +46,19 @@ ButtonNavigator.prototype.render = function () { var self = this var view = yo`
- - - - + + + +
- - - + + +
` diff --git a/src/app/execution/txLogger.js b/src/app/execution/txLogger.js index 401c393caa..47595b550c 100644 --- a/src/app/execution/txLogger.js +++ b/src/app/execution/txLogger.js @@ -233,7 +233,7 @@ function renderKnownTransaction (self, data) {
- + ` @@ -259,7 +259,7 @@ function renderCall (self, data) {
debug(e, data, self)}>Debug
- + ` @@ -279,7 +279,7 @@ function renderUnknownTransaction (self, data) {
debug(e, data, self)}>Debug
- + ` @@ -295,14 +295,14 @@ function renderEmptyBlock (self, data) { function checkTxStatus (tx, type) { if (tx.status === '0x1') { - return yo`` + return yo`` } if (type === 'call' || type === 'unknownCall') { return yo`call` } else if (tx.status === '0x0') { - return yo`` + return yo`` } else { - return yo`` + return yo`` } } @@ -369,8 +369,8 @@ function txDetails (e, tx, data, obj) { var to = obj.to var log = document.querySelector(`#${tx.id} [class^='log']`) var arrow = document.querySelector(`#${tx.id} [class^='arrow']`) - var arrowUp = yo`` - var arrowDown = yo`` + var arrowUp = yo`` + var arrowDown = yo`` if (table && table.parentNode) { tx.removeChild(table) log.removeChild(arrow) diff --git a/src/app/files/file-explorer.js b/src/app/files/file-explorer.js index 0d9de5d4b9..35fde0718b 100644 --- a/src/app/files/file-explorer.js +++ b/src/app/files/file-explorer.js @@ -28,23 +28,23 @@ function fileExplorer (localRegistry, files, menuItems) { [ { action: 'createNewFile', title: 'Create New File in the Browser Storage Explorer', - icon: 'fa fa-plus-circle' + icon: 'fas fa-plus-circle' }, { action: 'publishToGist', title: 'Publish all [browser] explorer files to a github gist', - icon: 'fa fa-github' + icon: 'fas fa-github' }, { action: 'copyFiles', title: 'Copy all files to another instance of Remix IDE', - icon: 'fa fa-files-o' + icon: 'fas fa-files-o' }, { action: 'uploadFile', title: 'Add Local file to the Browser Storage Explorer', - icon: 'fa fa-folder-open' + icon: 'fas fa-folder-open' }, { action: 'updateGist', title: 'Update the current [gist] explorer', - icon: 'fa fa-github' + icon: 'fas fa-github' } ] // menu items diff --git a/src/app/files/remixd-handle.js b/src/app/files/remixd-handle.js index 6787e2104d..a31af0c61b 100644 --- a/src/app/files/remixd-handle.js +++ b/src/app/files/remixd-handle.js @@ -98,7 +98,7 @@ function remixdDialog () {
Connection will start a session between ${window.location.href} and your local file system ws://127.0.0.1:65520 so please make sure your system is secured enough (port 65520 neither opened nor forwarded). - will show you current connection status. + will show you current connection status.
This feature is still in Alpha, so we recommend you to keep a copy of the shared folder.
diff --git a/src/app/panels/terminal.js b/src/app/panels/terminal.js index f9fb886208..794c0a6e3a 100644 --- a/src/app/panels/terminal.js +++ b/src/app/panels/terminal.js @@ -142,7 +142,7 @@ class Terminal extends BaseApi { ` self._view.icon = yo` ` + class="btn btn-secondary btn-sm align-items-center ${css.toggleTerminal} fas fa-angle-double-down">` self._view.dragbar = yo`
` self._view.dropdown = self._components.dropdown.render() @@ -154,7 +154,7 @@ class Terminal extends BaseApi {
${self._view.icon}
-
${self._view.pendingTxCount} @@ -166,7 +166,7 @@ class Terminal extends BaseApi {
${self._view.dropdown}
- + ${self._view.inputSearch}
diff --git a/src/app/tabs/compile-tab.js b/src/app/tabs/compile-tab.js index 955db1e7fd..041ee044a7 100644 --- a/src/app/tabs/compile-tab.js +++ b/src/app/tabs/compile-tab.js @@ -118,7 +118,7 @@ class CompileTab extends CompilerApi { this.renderer.error(data['error'].formattedMessage, this._view.errorContainer, {type: data['error'].severity || 'error'}) if (data['error'].mode === 'panic') { return modalDialogCustom.alert(yo` -
+
The compiler returned with the following internal error:
${data['error'].formattedMessage}.
The compiler might be in a non-sane state, please be careful and do not use further compilation data to deploy to mainnet. It is heavily recommended to use another browser not affected by this issue (Firefox is known to not be affected).
@@ -174,7 +174,7 @@ class CompileTab extends CompilerApi {
@@ -268,7 +268,7 @@ class CompileTab extends CompilerApi { const log = yo`
` Object.keys(contractProperties).map(propertyName => { const copyDetails = yo`${copyToClipboard(() => contractProperties[propertyName])}` - const questionMark = yo`` + const questionMark = yo`` log.appendChild(yo`
${propertyName} ${copyDetails} ${questionMark}
${this.insertValue(contractProperties, propertyName)} diff --git a/src/app/tabs/compileTab/compilerContainer.js b/src/app/tabs/compileTab/compilerContainer.js index d425891b44..9eb9d1561a 100644 --- a/src/app/tabs/compileTab/compilerContainer.js +++ b/src/app/tabs/compileTab/compilerContainer.js @@ -117,8 +117,8 @@ class CompilerContainer { if (this._view.versionSelector) this._updateVersionSelector() }) - this._view.warnCompilationSlow = yo`` - this._view.compileIcon = yo`` + this._view.warnCompilationSlow = yo`` + this._view.compileIcon = yo`` this._view.autoCompile = yo`` this._view.hideWarningsBox = yo`` if (this.data.autoCompile) this._view.autoCompile.setAttribute('checked', '') diff --git a/src/app/tabs/run-tab.js b/src/app/tabs/run-tab.js index 9f04298c83..2e5ec20261 100644 --- a/src/app/tabs/run-tab.js +++ b/src/app/tabs/run-tab.js @@ -60,7 +60,7 @@ class RunTab extends BaseApi {
Deployed Contracts - this.event.trigger('clearInstance', [])} + this.event.trigger('clearInstance', [])} title="Clear instances list and reset recorder" aria-hidden="true">
` diff --git a/src/app/tabs/runTab/contractDropdown.js b/src/app/tabs/runTab/contractDropdown.js index 900cc26554..1608cfb880 100644 --- a/src/app/tabs/runTab/contractDropdown.js +++ b/src/app/tabs/runTab/contractDropdown.js @@ -44,8 +44,8 @@ class ContractDropdownUI { } render () { - this.compFails = yo`` - var info = yo`` + this.compFails = yo`` + var info = yo`` this.atAddressButtonInput = yo`` this.selectContractNames = yo`` diff --git a/src/app/tabs/runTab/recorder.js b/src/app/tabs/runTab/recorder.js index 4621189388..459ce2b4d7 100644 --- a/src/app/tabs/runTab/recorder.js +++ b/src/app/tabs/runTab/recorder.js @@ -23,9 +23,9 @@ class RecorderUI { .recorder {} ` - this.runButton = yo`` + this.runButton = yo`` this.recordButton = yo` - ` diff --git a/src/app/tabs/runTab/settings.js b/src/app/tabs/runTab/settings.js index 04e96b3432..6c8366f8b6 100644 --- a/src/app/tabs/runTab/settings.js +++ b/src/app/tabs/runTab/settings.js @@ -64,7 +64,7 @@ class SettingsUI { value="web3" name="executionContext"> Web3 Provider - +
` @@ -73,12 +73,12 @@ class SettingsUI {
Account - +
${copyToClipboard(() => document.querySelector('#runTabView #txorigin').value)} - +
` @@ -231,7 +231,7 @@ class SettingsUI { this.netUI.innerHTML = 'can\'t detect network ' return } - this.netUI.innerHTML = ` ${name} (${id || '-'})` + this.netUI.innerHTML = ` ${name} (${id || '-'})` }) } diff --git a/src/app/tabs/settings-tab.js b/src/app/tabs/settings-tab.js index 21b2623791..da259ed06f 100644 --- a/src/app/tabs/settings-tab.js +++ b/src/app/tabs/settings-tab.js @@ -81,7 +81,7 @@ module.exports = class SettingsTab extends BaseApi { 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(' ') - this._view.warnPersonalMode = yo`` + this._view.warnPersonalMode = yo`` this._view.generateContractMetadata = yo`` if (this.config.get('settings/generate-contract-metadata')) this._view.generateContractMetadata.setAttribute('checked', '') diff --git a/src/app/ui/TreeView.js b/src/app/ui/TreeView.js index 809e5246fc..aeca3bfb1a 100644 --- a/src/app/ui/TreeView.js +++ b/src/app/ui/TreeView.js @@ -77,7 +77,7 @@ class TreeView { formatData (key, data, children, expand, keyPath) { var self = this var li = yo`
  • ` - var caret = yo`
    ` + var caret = yo`
    ` var label = yo`
    ${caret} @@ -87,7 +87,7 @@ class TreeView { if (data.children) { var list = yo`
      ${children}
    ` list.style.display = 'none' - caret.className = list.style.display === 'none' ? `fa fa-caret-right caret ${css.caret_tv}` : `fa fa-caret-down caret ${css.caret_tv}` + caret.className = list.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}` label.onclick = function () { self.expand(keyPath) } @@ -120,7 +120,7 @@ class TreeView { var node = this.nodeAt(path) if (node) { node.style.display = node.style.display === 'none' ? 'block' : 'none' - caret.className = node.style.display === 'none' ? `fa fa-caret-right caret ${css.caret_tv}` : `fa fa-caret-down caret ${css.caret_tv}` + caret.className = node.style.display === 'none' ? `fas fa-caret-right caret ${css.caret_tv}` : `fas fa-caret-down caret ${css.caret_tv}` this.event.trigger('nodeClick', [path, node]) } } diff --git a/src/app/ui/card.js b/src/app/ui/card.js index 0419a53971..8553e2e49c 100644 --- a/src/app/ui/card.js +++ b/src/app/ui/card.js @@ -16,7 +16,7 @@ module.exports = class Card { if (self._view.el) return self._view.el self._view.cardBody = yo`
    ` - self._view.arrow = yo`` + self._view.arrow = yo`` self._view.expandCollapseButton = yo`
    ${self._view.arrow}
    ` diff --git a/src/app/ui/copy-to-clipboard.js b/src/app/ui/copy-to-clipboard.js index bfcca749e8..8b23872b34 100644 --- a/src/app/ui/copy-to-clipboard.js +++ b/src/app/ui/copy-to-clipboard.js @@ -13,7 +13,7 @@ var css = csjs` ` module.exports = function copyToClipboard (getContent, tip = 'Copy value to clipboard', icon = 'fa-clipboard') { - var copyIcon = yo`` + var copyIcon = yo`` copyIcon.onclick = (event) => { event.stopPropagation() var copiableContent diff --git a/src/app/ui/draggableContent.js b/src/app/ui/draggableContent.js index a052326062..77892a7e45 100644 --- a/src/app/ui/draggableContent.js +++ b/src/app/ui/draggableContent.js @@ -44,9 +44,9 @@ module.exports =
    ${title} - ${url}
    - { this.minimize() }} class="fa fa-window-minimize ${css.modalAction}"> - { this.maximise() }} class="fa fa-window-maximize ${css.modalAction}"> - { this.close() }} class="fa fa-window-close-o ${css.modalAction}"> + { this.minimize() }} class="fas fa-window-minimize ${css.modalAction}"> + { this.maximise() }} class="fas fa-window-maximize ${css.modalAction}"> + { this.close() }} class="fas fa-window-close-o ${css.modalAction}">
    diff --git a/src/app/ui/dropdown.js b/src/app/ui/dropdown.js index 5dbc053fea..4edad93849 100644 --- a/src/app/ui/dropdown.js +++ b/src/app/ui/dropdown.js @@ -41,7 +41,7 @@ class Dropdown { self._view.selected = yo`
    [${self.data.selected.length}] ${self.data.selected.join(', ')} - +
    ` self._view.el = yo` diff --git a/src/app/ui/modaldialog.js b/src/app/ui/modaldialog.js index 44fe11e937..8483cf43ba 100644 --- a/src/app/ui/modaldialog.js +++ b/src/app/ui/modaldialog.js @@ -122,7 +122,7 @@ function html (opts) {

    - +
    -
    diff --git a/src/app/ui/renderer.js b/src/app/ui/renderer.js index b840ee0e4d..138a32434e 100644 --- a/src/app/ui/renderer.js +++ b/src/app/ui/renderer.js @@ -89,7 +89,7 @@ Renderer.prototype.error = function (message, container, opt) { var $pre = $(opt.useSpan ? yo`` : yo`
    `).html(message)
 
-  var $error = $(yo`
    `).prepend($pre)
+  var $error = $(yo`
    `).prepend($pre)
   $(container).append($error)
 
   $error.click((ev) => {
diff --git a/src/multiParamManager.js b/src/multiParamManager.js
index 16d188a93e..6222b97eb9 100644
--- a/src/multiParamManager.js
+++ b/src/multiParamManager.js
@@ -128,7 +128,7 @@ class MultiParamManager {
 // or do we need to only do this in 1 place - I have a feeling that this will happen in multiple places
 
     this.contractActionsContainerSingle = yo`
    
-      ${this.basicInputField} { this.switchMethodViewOn() }} title=${title} >
+      ${this.basicInputField} { this.switchMethodViewOn() }} title=${title} >
       
    `
 
     this.multiFields = this.createMultiFields()
@@ -148,7 +148,7 @@ class MultiParamManager {
       
    
         
     { this.switchMethodViewOff() }} class="${css.multiHeader}">
           
    ${title}
    
-          
+          
         
    
         ${this.multiFields}
         
    
diff --git a/src/persmission-handler.js b/src/persmission-handler.js
index 6b565d352e..a141d744e2 100644
--- a/src/persmission-handler.js
+++ b/src/persmission-handler.js
@@ -141,7 +141,7 @@ export class PermissionHandler {
     
    
       
    
         
-        
+        
         
       
    
       
diff --git a/src/universal-dapp-ui.js b/src/universal-dapp-ui.js
index 06b856a92a..95af847320 100644
--- a/src/universal-dapp-ui.js
+++ b/src/universal-dapp-ui.js
@@ -69,7 +69,7 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address
   var shortAddress = helper.shortenAddress(address)
   var title = yo`
     
    
-      
+      
       
    
         
     ${contractName} at ${shortAddress} (${context})
    
         
    
@@ -78,7 +78,7 @@ UniversalDAppUI.prototype.renderInstanceFromABI = function (contractABI, address
       
    
   
    `
 
-  var close = yo``
+  var close = yo``
   title.querySelector('.btn-group').appendChild(close)
 
   var contractActionsWrapper = yo`