Skip to content

Commit

Permalink
unregistered listeners
Browse files Browse the repository at this point in the history
  • Loading branch information
LianaHus committed Dec 9, 2019
1 parent dc540c1 commit fcfe789
Show file tree
Hide file tree
Showing 5 changed files with 31 additions and 15 deletions.
12 changes: 5 additions & 7 deletions src/app/files/file-explorer.js
Original file line number Diff line number Diff line change
Expand Up @@ -209,19 +209,17 @@ function fileExplorer (localRegistry, files, menuItems) {
const provider = self._deps.fileManager.fileProviderOf(key)
actions['Create File'] = () => self.createNewFile(key)
actions['Create Folder'] = () => self.createNewFolder(key)
// todo not fully implemented. Readd later when fixed
// https://github.com/ethereum/remix-ide/issues/2386
/* if (provider.isExternalFolder(key)) {
actions['Discard changes'] = () => {
// @todo(#2386) not fully implemented. Readd later when fixed
if (provider.isExternalFolder(key)) {
/* actions['Discard changes'] = () => {
modalDialogCustom.confirm(
'Discard changes',
'Are you sure you want to discard all your changes?',
() => { self.files.discardChanges(key) },
() => {}
)
}
} else { */
if (! provider.isExternalFolder(key)) {
} */
} else {
const folderPath = extractExternalFolder(key)
actions['Rename'] = () => {
if (self.files.isReadOnly(key)) { return tooltip('cannot rename folder. ' + self.files.type + ' is a read only explorer') }
Expand Down
4 changes: 2 additions & 2 deletions src/app/files/fileManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,8 @@ class FileManager extends Plugin {
}

fileChangedEvent (path) {
// todo. use only for discard changes function.
//this.syncEditor(path)
// @todo(#2386) use only for discard changes function.
// this.syncEditor(path)
}

fileRenamedEvent (oldName, newName, isFolder) {
Expand Down
11 changes: 11 additions & 0 deletions src/app/tabs/compile-tab.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 10 additions & 3 deletions src/app/tabs/compileTab/compilerContainer.js
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,9 @@ class CompilerContainer {
}

deactivate () {
// deactivate editor listeners
this.editor.event.unregister('contentChanged')
this.editor.event.unregister('sessionSwitched')
}

activate () {
Expand All @@ -50,8 +53,10 @@ class CompilerContainer {
}

listenToEvents () {
this.editor.event.register('contentChanged', this.scheduleCompilation.bind(this))
this.editor.event.register('sessionSwitched', this.scheduleCompilation.bind(this))
this.editor.event.register('sessionSwitched', () => {
if (!this._view.compileIcon) return
this.scheduleCompilation()
})

this.compileTabLogic.event.on('startingCompilation', () => {
if (!this._view.compileIcon) return
Expand All @@ -73,6 +78,7 @@ class CompilerContainer {

this.editor.event.register('contentChanged', () => {
if (!this._view.compileIcon) return
this.scheduleCompilation.bind(this)
this._view.compileIcon.classList.add(`${css.bouncingIcon}`) // @TODO: compileView tab
})

Expand Down Expand Up @@ -131,12 +137,13 @@ class CompilerContainer {

// Load solc compiler version according to pragma in contract file
_setCompilerVersionFromPragma (filename) {
if (!this.data.allversions) return
this.compileTabLogic.fileManager.getFile(filename).then(data => {
const pragmaArr = data.match(/(pragma solidity (.+?);)/g)
if (pragmaArr && pragmaArr.length === 1) {
const pragmaStr = pragmaArr[0].replace('pragma solidity', '').trim()
const pragma = pragmaStr.substring(0, pragmaStr.length - 1)
const releasedVersions = (this.data.allversions) ? this.data.allversions.filter(obj => !obj.prerelease).map(obj => obj.version) : []
const releasedVersions = this.data.allversions.filter(obj => !obj.prerelease).map(obj => obj.version)
const allVersions = this.data.allversions.map(obj => this._retrieveVersion(obj.version))
const currentCompilerName = this._retrieveVersion(this._view.versionSelector.selectedOptions[0].label)
// contains only numbers part, for example '0.4.22'
Expand Down
6 changes: 3 additions & 3 deletions src/app/ui/contextMenu.js
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@ module.exports = (event, items) => {
window.removeEventListener('click', hide)
}

var menu = Object.keys(items).map((item, index) => {
var current = yo`<li id="menuitem${item.toLowerCase()}" class=${css.liitem}>${item}</li>`
const menu = Object.keys(items).map((item, index) => {
const current = yo`<li id="menuitem${item.toLowerCase()}" class=${css.liitem}>${item}</li>`
current.onclick = () => { hide(null, true); items[item]() }
return current
})
var container = yo`<div class="p-1 ${css.container} bg-light shadow border"><ul id='menuitems'>${menu}</ul></div>`
const container = yo`<div class="p-1 ${css.container} bg-light shadow border"><ul id='menuitems'>${menu}</ul></div>`
container.style.left = event.pageX + 'px'
container.style.top = event.pageY + 'px'
container.style.display = 'block'
Expand Down

0 comments on commit fcfe789

Please sign in to comment.