Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
baas-ide
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
guxukai
baas-ide
Commits
d3f1322e
Unverified
Commit
d3f1322e
authored
May 09, 2019
by
yann300
Committed by
GitHub
May 09, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1943 from ethereum/showCompilerError
Switch to file when clicking on the compiler error && update behavior when displaying context menu for read only explorer
parents
e7109135
a49c8a1a
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
7 deletions
+23
-7
file-explorer.js
src/app/files/file-explorer.js
+16
-5
fileManager.js
src/app/files/fileManager.js
+6
-0
editor-panel.js
src/app/panels/editor-panel.js
+1
-1
contextMenu.js
src/app/ui/contextMenu.js
+0
-1
No files found.
src/app/files/file-explorer.js
View file @
d3f1322e
...
...
@@ -172,6 +172,7 @@ function fileExplorer (localRegistry, files, menuItems) {
})
self
.
treeView
.
event
.
register
(
'nodeRightClick'
,
function
(
key
,
data
,
label
,
event
)
{
if
(
self
.
files
.
readonly
)
return
if
(
key
===
self
.
files
.
type
)
return
MENU_HANDLE
&&
MENU_HANDLE
.
hide
(
null
,
true
)
MENU_HANDLE
=
contextMenu
(
event
,
{
...
...
@@ -190,17 +191,27 @@ function fileExplorer (localRegistry, files, menuItems) {
self
.
treeView
.
event
.
register
(
'leafRightClick'
,
function
(
key
,
data
,
label
,
event
)
{
if
(
key
===
self
.
files
.
type
)
return
MENU_HANDLE
&&
MENU_HANDLE
.
hide
(
null
,
true
)
MENU_HANDLE
=
contextMenu
(
event
,
{
'Rename'
:
()
=>
{
let
actions
=
{}
if
(
!
self
.
files
.
readonly
)
{
actions
[
'Rename'
]
=
()
=>
{
if
(
self
.
files
.
readonly
)
{
return
tooltip
(
'cannot rename file. '
+
self
.
files
.
type
+
' is a read only explorer'
)
}
var
name
=
label
.
querySelector
(
'label[data-path="'
+
key
+
'"]'
)
if
(
name
)
editModeOn
(
name
)
}
,
'Delete'
:
()
=>
{
}
actions
[
'Delete'
]
=
()
=>
{
if
(
self
.
files
.
readonly
)
{
return
tooltip
(
'cannot delete file. '
+
self
.
files
.
type
+
' is a read only explorer'
)
}
modalDialogCustom
.
confirm
(
'Delete a file'
,
'Are you sure you want to delete this file?'
,
()
=>
{
files
.
remove
(
key
)
},
()
=>
{})
}
})
}
if
(
self
.
files
.
type
!==
'browser'
)
{
actions
[
'Copy to Browser explorer'
]
=
()
=>
{
files
.
get
(
key
,
(
error
,
content
)
=>
{
if
(
error
)
return
tooltip
(
error
)
self
.
_deps
.
fileManager
.
setFile
(
`browser/
${
label
.
innerText
}
`
,
content
)
})
}
}
MENU_HANDLE
=
contextMenu
(
event
,
actions
)
})
self
.
treeView
.
event
.
register
(
'leafClick'
,
function
(
key
,
data
,
label
)
{
...
...
src/app/files/fileManager.js
View file @
d3f1322e
...
...
@@ -189,6 +189,12 @@ class FileManager extends FileSystemApi {
this.switchFile()
}
unselectCurrentFile () {
this.saveCurrentFile()
this._deps.config.set('currentFile', '')
this.events.emit('noFileSelected')
}
switchFile (file) {
const _switchFile = (file) => {
this.saveCurrentFile()
...
...
src/app/panels/editor-panel.js
View file @
d3f1322e
...
...
@@ -51,11 +51,11 @@ class EditorPanel {
}
self
.
tabProxy
=
new
TabProxy
(
self
.
_deps
.
fileManager
,
self
.
_components
.
editor
,
self
.
appStore
,
self
.
appManager
)
let
showApp
=
function
(
name
)
{
self
.
_deps
.
fileManager
.
unselectCurrentFile
()
self
.
mainPanelComponent
.
showContent
(
name
)
self
.
_view
.
editor
.
style
.
display
=
'none'
self
.
_components
.
contextView
.
hide
()
self
.
_view
.
mainPanel
.
style
.
display
=
'block'
self
.
tabProxy
.
sh
}
self
.
appManager
.
event
.
on
(
'ensureActivated'
,
(
name
)
=>
{
if
(
name
===
'home'
)
{
...
...
src/app/ui/contextMenu.js
View file @
d3f1322e
...
...
@@ -7,7 +7,6 @@ var css = csjs`
{
display: none;
position: fixed;
width:100px;
border-radius: 2px;
z-index: 1000;
box-shadow: 0 0 4px var(--dark);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment