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
b40e2c7d
Commit
b40e2c7d
authored
Mar 09, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove hacky margin added to hide diff overview
added comment re. try/catch in dispose
parent
c463cfd9
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
16 deletions
+4
-16
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+0
-4
ee/app/assets/javascripts/ide/components/repo_editor.vue
ee/app/assets/javascripts/ide/components/repo_editor.vue
+0
-4
ee/app/assets/javascripts/ide/lib/editor.js
ee/app/assets/javascripts/ide/lib/editor.js
+4
-8
No files found.
app/assets/stylesheets/pages/repo.scss
View file @
b40e2c7d
...
@@ -706,7 +706,3 @@
...
@@ -706,7 +706,3 @@
.ide-commit-new-branch
{
.ide-commit-new-branch
{
margin-left
:
25px
;
margin-left
:
25px
;
}
}
.ide-editor-diff
{
margin-right
:
-30px
;
}
ee/app/assets/javascripts/ide/components/repo_editor.vue
View file @
b40e2c7d
...
@@ -20,9 +20,6 @@ export default {
...
@@ -20,9 +20,6 @@ export default {
shouldHideEditor
()
{
shouldHideEditor
()
{
return
this
.
activeFile
&&
this
.
activeFile
.
binary
&&
!
this
.
activeFile
.
raw
;
return
this
.
activeFile
&&
this
.
activeFile
.
binary
&&
!
this
.
activeFile
.
raw
;
},
},
ideClassName
()
{
return
`ide-editor-
${
this
.
viewer
}
`
;
},
},
},
watch
:
{
watch
:
{
activeFile
(
oldVal
,
newVal
)
{
activeFile
(
oldVal
,
newVal
)
{
...
@@ -141,7 +138,6 @@ export default {
...
@@ -141,7 +138,6 @@ export default {
<div
<div
id=
"ide"
id=
"ide"
class=
"blob-viewer-container blob-editor-container"
class=
"blob-viewer-container blob-editor-container"
:class=
"ideClassName"
>
>
<div
<div
v-if=
"shouldHideEditor"
v-if=
"shouldHideEditor"
...
...
ee/app/assets/javascripts/ide/lib/editor.js
View file @
b40e2c7d
...
@@ -124,18 +124,14 @@ export default class Editor {
...
@@ -124,18 +124,14 @@ export default class Editor {
dispose
()
{
dispose
()
{
window
.
removeEventListener
(
'
resize
'
,
this
.
debouncedUpdate
);
window
.
removeEventListener
(
'
resize
'
,
this
.
debouncedUpdate
);
// catch any potential errors with disposing the error
// this is mainly for tests caused by elements not existing
try
{
try
{
this
.
disposable
.
dispose
();
this
.
disposable
.
dispose
();
// dispose main monaco instance
this
.
instance
=
null
;
if
(
this
.
instance
)
{
this
.
instance
=
null
;
}
}
catch
(
e
)
{
}
catch
(
e
)
{
// dispose main monaco instance
this
.
instance
=
null
;
if
(
this
.
instance
)
{
this
.
instance
=
null
;
}
}
}
}
}
...
...
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