Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
16995b8c
Commit
16995b8c
authored
May 18, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed web IDE review & commit editors getting into incorrect state
Closes #46392
parent
2f7e0aba
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
2 deletions
+7
-2
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+7
-2
No files found.
app/assets/javascripts/ide/components/repo_editor.vue
View file @
16995b8c
...
@@ -43,9 +43,13 @@ export default {
...
@@ -43,9 +43,13 @@ export default {
},
},
},
},
watch
:
{
watch
:
{
file
(
oldVal
,
newVal
)
{
file
(
newVal
,
oldVal
)
{
if
(
oldVal
.
pending
)
{
this
.
removePendingTab
(
oldVal
);
}
// Compare key to allow for files opened in review mode to be cached differently
// Compare key to allow for files opened in review mode to be cached differently
if
(
new
Val
.
key
!==
this
.
file
.
key
)
{
if
(
old
Val
.
key
!==
this
.
file
.
key
)
{
this
.
initMonaco
();
this
.
initMonaco
();
if
(
this
.
currentActivityView
!==
activityBarViews
.
edit
)
{
if
(
this
.
currentActivityView
!==
activityBarViews
.
edit
)
{
...
@@ -99,6 +103,7 @@ export default {
...
@@ -99,6 +103,7 @@ export default {
'
setFileViewMode
'
,
'
setFileViewMode
'
,
'
setFileEOL
'
,
'
setFileEOL
'
,
'
updateViewer
'
,
'
updateViewer
'
,
'
removePendingTab
'
,
]),
]),
initMonaco
()
{
initMonaco
()
{
if
(
this
.
shouldHideEditor
)
return
;
if
(
this
.
shouldHideEditor
)
return
;
...
...
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