Skip to content

B
baas-ide
Commit 6bab6b22 authored by yann300's avatar yann300 Committed by GitHub
Browse files
Options

Merge pull request #723 from ethereum/appjs

add fileManager.js
parents 2dcb41a8 c25ca289
Hide whitespace changes
Inline Side-by-side
Showing with 185 additions and 157 deletions
src/app.js
View file @ 6bab6b22
......@@ -34,6 +34,7 @@ var TxLogger = require('./app/execution/txLogger')
var EventsDecoder = require('./app/execution/eventsDecoder')
var Web3VMProvider = remix.web3.web3VMProvider
var handleImports = require('./app/compiler/compiler-imports')
var FileManager = require('./app/files/fileManager')
var styleGuide = require('./style-guide')
var styles = styleGuide()
......@@ -209,7 +210,11 @@ function run () {
var config = self._api.config
var filesProviders = self._api.filesProviders
var tabbedFiles = {} // list of files displayed in the tabs bar
var fileManager = new FileManager({
config: config,
editor: editor,
filesProviders: filesProviders
})
// return all the files, except the temporary/readonly ones.. package only files from the browser storage.
function packageFiles (callback) {
......@@ -238,7 +243,7 @@ function run () {
for (var f in filesSet) {
filesProviders['browser'].set(createNonClashingName(f), filesSet[f].content)
}
switchToNextFile()
fileManager.switchFile()
}
// Replace early callback with instant response
......@@ -283,7 +288,9 @@ function run () {
// ---------------- FilePanel --------------------
var FilePanelAPI = {
createName: createNonClashingName,
switchToFile: switchToFile,
switchFile: function (path) {
fileManager.switchFile(path)
},
event: this.event,
currentFile: function () {
return config.get('currentFile')
......@@ -306,149 +313,21 @@ function run () {
filePanel.event.register('resize', delta => self._adjustLayout('left', delta))
function fileRenamedEvent (oldName, newName, isFolder) {
// TODO please never use 'window' when it is possible to use a variable
// that references the DOM node
[...window.files.querySelectorAll('.file .name')].forEach(function (span) {
if (span.innerText === oldName) span.innerText = newName
})
if (!isFolder) {
config.set('currentFile', '')
editor.discard(oldName)
if (tabbedFiles[oldName]) {
delete tabbedFiles[oldName]
tabbedFiles[newName] = newName
}
switchToFile(newName)
} else {
var newFocus
for (var k in tabbedFiles) {
if (k.indexOf(oldName + '/') === 0) {
var newAbsolutePath = k.replace(oldName, newName)
tabbedFiles[newAbsolutePath] = newAbsolutePath
delete tabbedFiles[k]
if (config.get('currentFile') === k) {
newFocus = newAbsolutePath
}
}
}
if (newFocus) {
switchToFile(newFocus)
}
}
refreshTabs()
}
filesProviders['browser'].event.register('fileRenamed', fileRenamedEvent)
filesProviders['localhost'].event.register('fileRenamed', fileRenamedEvent)
function fileRemovedEvent (path) {
if (path === config.get('currentFile')) {
config.set('currentFile', '')
switchToNextFile()
}
editor.discard(path)
delete tabbedFiles[path]
refreshTabs()
}
filesProviders['browser'].event.register('fileRemoved', fileRemovedEvent)
filesProviders['localhost'].event.register('fileRemoved', fileRemovedEvent)
// --------------------Files tabs-----------------------------
var $filesEl = $('#files')
// Switch tab
$filesEl.on('click', '.file:not(.active)', function (ev) {
ev.preventDefault()
switchToFile($(this).find('.name').text())
return false
})
// Remove current tab
$filesEl.on('click', '.file .remove', function (ev) {
ev.preventDefault()
var name = $(this).parent().find('.name').text()
delete tabbedFiles[name]
refreshTabs()
if (Object.keys(tabbedFiles).length) {
switchToFile(Object.keys(tabbedFiles)[0])
} else {
editor.displayEmptyReadOnlySession()
}
return false
})
function switchToFile (file) {
editorSyncFile()
config.set('currentFile', file)
refreshTabs(file)
fileProviderOf(file).get(file, (error, content) => {
if (error) {
console.log(error)
} else {
if (fileProviderOf(file).isReadOnly(file)) {
editor.openReadOnly(file, content)
} else {
editor.open(file, content)
}
self.event.trigger('currentFileChanged', [file, fileProviderOf(file)])
}
})
}
function switchToNextFile () {
var fileList = Object.keys(filesProviders['browser'].list())
if (fileList.length) {
switchToFile(fileList[0])
}
}
var previouslyOpenedFile = config.get('currentFile')
if (previouslyOpenedFile) {
filesProviders['browser'].get(previouslyOpenedFile, (error, content) => {
if (!error && content) {
switchToFile(previouslyOpenedFile)
fileManager.switchFile(previouslyOpenedFile)
} else {
switchToNextFile()
fileManager.switchFile()
}
})
} else {
switchToNextFile()
}
function fileProviderOf (file) {
var provider = file.match(/[^/]*/)
if (provider !== null) {
return filesProviders[provider[0]]
}
return null
}
// Display files that have already been selected
function refreshTabs (newfile) {
if (newfile) {
tabbedFiles[newfile] = newfile
}
var $filesEl = $('#files')
$filesEl.find('.file').remove()
for (var file in tabbedFiles) {
$filesEl.append($('<li class="file"><span class="name">' + file + '</span><span class="remove"><i class="fa fa-close"></i></span></li>'))
}
var currentFileOpen = !!config.get('currentFile')
if (currentFileOpen) {
var active = $('#files .file').filter(function () { return $(this).find('.name').text() === config.get('currentFile') })
active.addClass('active')
}
$('#input').toggle(currentFileOpen)
$('#output').toggle(currentFileOpen)
self._components.editorpanel.refresh()
fileManager.switchFile()
}
var compiler = new Compiler((url, cb) => {
var provider = fileProviderOf(url)
var provider = fileManager.fileProviderOf(url)
if (provider && provider.exists(url)) {
cb(null, provider.get(url, cb))
}
......@@ -473,7 +352,7 @@ function run () {
},
errorClick: (errFile, errLine, errCol) => {
if (errFile !== config.get('currentFile') && (filesProviders['browser'].exists(errFile) || filesProviders['localhost'].exists(errFile))) {
switchToFile(errFile)
fileManager.switchFile(errFile)
}
editor.gotoLine(errLine, errCol)
}
......@@ -535,7 +414,7 @@ function run () {
return executionContext
},
fileProviderOf: (path) => {
return fileProviderOf(path)
return fileManager.fileProviderOf(path)
},
getBalance: (address, callback) => {
udapp.getBalance(address, (error, balance) => {
......@@ -604,7 +483,7 @@ function run () {
if (lineColumnPos) {
this.source = compiler.lastCompilationResult.data.sourceList[location.file] // auto switch to that tab
if (config.get('currentFile') !== this.source) {
switchToFile(this.source)
fileManager.switchFile(this.source)
}
this.statementMarker = editor.addMarker(lineColumnPos, this.source, 'highlightcode')
editor.scrollToLine(lineColumnPos.start.line, true, true, function () {})
......@@ -739,12 +618,12 @@ function run () {
function runCompiler () {
if (transactionDebugger.isActive) return
editorSyncFile()
fileManager.saveCurrentFile()
var currentFile = config.get('currentFile')
if (currentFile) {
var target = currentFile
var sources = {}
var provider = fileProviderOf(currentFile)
var provider = fileManager.fileProviderOf(currentFile)
if (provider) {
provider.get(target, (error, content) => {
if (error) {
......@@ -760,19 +639,6 @@ function run () {
}
}
function editorSyncFile () {
var currentFile = config.get('currentFile')
if (currentFile && editor.current()) {
var input = editor.get(currentFile)
var provider = fileProviderOf(currentFile)
if (provider) {
provider.set(currentFile, input)
} else {
console.log('cannot save ' + currentFile + '. Does not belong to any explorer')
}
}
}
var previousInput = ''
var saveTimeout = null
......@@ -794,7 +660,9 @@ function run () {
if (saveTimeout) {
window.clearTimeout(saveTimeout)
}
saveTimeout = window.setTimeout(editorSyncFile, 5000)
saveTimeout = window.setTimeout(() => {
fileManager.saveCurrentFile()
}, 5000)
}
editor.event.register('contentChanged', editorOnChange)
......
src/app/files/fileManager.js 0 → 100644
View file @ 6bab6b22
'use strict'
var $ = require('jquery')
var remix = require('ethereum-remix')
var EventManager = remix.lib.EventManager
/*
attach to files event (removed renamed)
opt needs:
- filesProviders
- config
- editor
trigger: currentFileChanged
*/
class FileManager {
constructor (opt = {}) {
this.tabbedFiles = {}
this.event = new EventManager()
var self = this
this.opt = opt
this.opt.filesProviders['browser'].event.register('fileRenamed', (oldName, newName, isFolder) => { this.fileRenamedEvent(oldName, newName, isFolder) })
this.opt.filesProviders['localhost'].event.register('fileRenamed', (oldName, newName, isFolder) => { this.fileRenamedEvent(oldName, newName, isFolder) })
this.opt.filesProviders['browser'].event.register('fileRemoved', (path) => { this.fileRemovedEvent(path) })
this.opt.filesProviders['localhost'].event.register('fileRemoved', (path) => { this.fileRemovedEvent(path) })
// tabs
var $filesEl = $('#files')
// Switch tab
$filesEl.on('click', '.file:not(.active)', function (ev) {
ev.preventDefault()
self.switchFile($(this).find('.name').text())
return false
})
// Remove current tab
$filesEl.on('click', '.file .remove', function (ev) {
ev.preventDefault()
var name = $(this).parent().find('.name').text()
delete self.tabbedFiles[name]
self.refreshTabs()
if (Object.keys(self.tabbedFiles).length) {
self.switchFile(Object.keys(self.tabbedFiles)[0])
} else {
opt.editor.displayEmptyReadOnlySession()
}
return false
})
}
fileRenamedEvent (oldName, newName, isFolder) {
if (!isFolder) {
this.opt.config.set('currentFile', '')
this.opt.editor.discard(oldName)
if (this.tabbedFiles[oldName]) {
delete this.tabbedFiles[oldName]
this.tabbedFiles[newName] = newName
}
this.switchFile(newName)
} else {
var newFocus
for (var k in this.opt.tabbedFiles) {
if (k.indexOf(oldName + '/') === 0) {
var newAbsolutePath = k.replace(oldName, newName)
this.tabbedFiles[newAbsolutePath] = newAbsolutePath
delete this.tabbedFiles[k]
if (this.opt.config.get('currentFile') === k) {
newFocus = newAbsolutePath
}
}
}
if (newFocus) {
this.switchFile(newFocus)
}
}
this.refreshTabs()
}
fileRemovedEvent (path) {
if (path === this.opt.config.get('currentFile')) {
this.opt.config.set('currentFile', '')
}
this.opt.editor.discard(path)
delete this.tabbedFiles[path]
this.refreshTabs()
}
// Display files that have already been selected
refreshTabs (newfile) {
var self = this
if (newfile) {
this.tabbedFiles[newfile] = newfile
}
var $filesEl = $('#files')
$filesEl.find('.file').remove()
for (var file in this.tabbedFiles) {
$filesEl.append($('<li class="file"><span class="name">' + file + '</span><span class="remove"><i class="fa fa-close"></i></span></li>'))
}
var currentFileOpen = !!this.opt.config.get('currentFile')
if (currentFileOpen) {
var active = $('#files .file').filter(function () { return $(this).find('.name').text() === self.opt.config.get('currentFile') })
active.addClass('active')
}
$('#input').toggle(currentFileOpen)
$('#output').toggle(currentFileOpen)
}
switchFile (file) {
if (!file) {
var fileList = Object.keys(this.opt.filesProviders['browser'].list())
if (fileList.length) {
file = fileList[0]
}
}
if (!file) return
this.saveCurrentFile()
this.opt.config.set('currentFile', file)
this.refreshTabs(file)
this.fileProviderOf(file).get(file, (error, content) => {
if (error) {
console.log(error)
} else {
if (this.fileProviderOf(file).isReadOnly(file)) {
this.opt.editor.openReadOnly(file, content)
} else {
this.opt.editor.open(file, content)
}
this.event.trigger('currentFileChanged', [file, this.fileProviderOf(file)])
}
})
}
fileProviderOf (file) {
var provider = file.match(/[^/]*/)
if (provider !== null) {
return this.opt.filesProviders[provider[0]]
}
return null
}
saveCurrentFile () {
var currentFile = this.opt.config.get('currentFile')
if (currentFile && this.opt.editor.current()) {
var input = this.opt.editor.get(currentFile)
var provider = this.fileProviderOf(currentFile)
if (provider) {
provider.set(currentFile, input)
} else {
console.log('cannot save ' + currentFile + '. Does not belong to any explorer')
}
}
}
}
module.exports = FileManager
src/app/panels/file-panel.js
View file @ 6bab6b22
......@@ -189,11 +189,11 @@ function filepanel (appAPI, filesProvider) {
})
fileExplorer.events.register('focus', function (path) {
appAPI.switchToFile(path)
appAPI.switchFile(path)
})
fileSystemExplorer.events.register('focus', function (path) {
appAPI.switchToFile(path)
appAPI.switchFile(path)
})
self.render = function render () { return element }
......@@ -247,7 +247,7 @@ function filepanel (appAPI, filesProvider) {
if (!filesProvider['browser'].set(newName, '')) {
modalDialogCustom.alert('Failed to create file ' + newName)
} else {
appAPI.switchToFile(newName)
appAPI.switchFile(newName)
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment