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
1a0734fa
Commit
1a0734fa
authored
Aug 01, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix initial not syntax highlighting.
parent
3b431cc0
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
9 deletions
+6
-9
app/assets/javascripts/repo/repo_editor.vue
app/assets/javascripts/repo/repo_editor.vue
+3
-4
app/assets/javascripts/repo/repo_helper.js
app/assets/javascripts/repo/repo_helper.js
+3
-5
No files found.
app/assets/javascripts/repo/repo_editor.vue
View file @
1a0734fa
...
@@ -18,11 +18,10 @@ const RepoEditor = {
...
@@ -18,11 +18,10 @@ const RepoEditor = {
this
.
addMonacoEvents
();
this
.
addMonacoEvents
();
Helper
.
getContent
().
then
(()
=>
{
Helper
.
getContent
().
then
(()
=>
{
const
languages
=
this
.
monaco
.
languages
.
getLanguages
();
const
languageID
=
Helper
.
getLanguageIDForFile
(
this
.
activeFile
,
languages
);
this
.
showHide
();
this
.
showHide
();
const
newModel
=
this
.
monaco
.
editor
.
createModel
(
this
.
blobRaw
,
languageID
);
if
(
this
.
blobRaw
===
''
)
return
;
const
newModel
=
this
.
monaco
.
editor
.
createModel
(
this
.
blobRaw
,
'
plaintext
'
);
this
.
monacoInstance
.
setModel
(
newModel
);
this
.
monacoInstance
.
setModel
(
newModel
);
}).
catch
(
Helper
.
loadingError
);
}).
catch
(
Helper
.
loadingError
);
...
...
app/assets/javascripts/repo/repo_helper.js
View file @
1a0734fa
...
@@ -194,10 +194,7 @@ const RepoHelper = {
...
@@ -194,10 +194,7 @@ const RepoHelper = {
Store
.
prevURL
=
Service
.
blobURLtoParentTree
(
Service
.
url
);
Store
.
prevURL
=
Service
.
blobURLtoParentTree
(
Service
.
url
);
}
}
})
})
.
catch
(()
=>
{
.
catch
(
RepoHelper
.
loadingError
);
// RepoHelper.setLoading(false, loadingData);
RepoHelper
.
loadingError
();
});
},
},
toFA
(
icon
)
{
toFA
(
icon
)
{
...
@@ -286,7 +283,8 @@ const RepoHelper = {
...
@@ -286,7 +283,8 @@ const RepoHelper = {
}
}
},
},
loadingError
()
{
loadingError
(
e
)
{
console
.
log
(
e
)
Flash
(
'
Unable to load the file at this time.
'
);
Flash
(
'
Unable to load the file at this time.
'
);
},
},
};
};
...
...
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