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
0
Merge Requests
0
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
Léo-Paul Géneau
gitlab-ce
Commits
204d78e7
Commit
204d78e7
authored
Jun 07, 2018
by
Mike Greiling
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
don't reference monaco directly in RepoEditor component
parent
15993df1
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+4
-4
No files found.
app/assets/javascripts/ide/components/repo_editor.vue
View file @
204d78e7
...
@@ -48,7 +48,7 @@ export default {
...
@@ -48,7 +48,7 @@ export default {
// 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
(
oldVal
.
key
!==
this
.
file
.
key
)
{
if
(
oldVal
.
key
!==
this
.
file
.
key
)
{
this
.
init
Monaco
();
this
.
init
Editor
();
if
(
this
.
currentActivityView
!==
activityBarViews
.
edit
)
{
if
(
this
.
currentActivityView
!==
activityBarViews
.
edit
)
{
this
.
setFileViewMode
({
this
.
setFileViewMode
({
...
@@ -85,7 +85,7 @@ export default {
...
@@ -85,7 +85,7 @@ export default {
if
(
!
this
.
editor
)
{
if
(
!
this
.
editor
)
{
this
.
editor
=
Editor
.
create
();
this
.
editor
=
Editor
.
create
();
}
}
this
.
init
Monaco
();
this
.
init
Editor
();
},
},
methods
:
{
methods
:
{
...
mapActions
([
...
mapActions
([
...
@@ -98,7 +98,7 @@ export default {
...
@@ -98,7 +98,7 @@ export default {
'
updateViewer
'
,
'
updateViewer
'
,
'
removePendingTab
'
,
'
removePendingTab
'
,
]),
]),
init
Monaco
()
{
init
Editor
()
{
if
(
this
.
shouldHideEditor
)
return
;
if
(
this
.
shouldHideEditor
)
return
;
this
.
editor
.
clearEditor
();
this
.
editor
.
clearEditor
();
...
@@ -111,7 +111,7 @@ export default {
...
@@ -111,7 +111,7 @@ export default {
this
.
createEditorInstance
();
this
.
createEditorInstance
();
})
})
.
catch
(
err
=>
{
.
catch
(
err
=>
{
flash
(
'
Error setting up
monaco
. Please try again.
'
,
'
alert
'
,
document
,
null
,
false
,
true
);
flash
(
'
Error setting up
editor
. Please try again.
'
,
'
alert
'
,
document
,
null
,
false
,
true
);
throw
err
;
throw
err
;
});
});
},
},
...
...
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