BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
272b8f3f
Unverified
Commit
272b8f3f
authored
Apr 25, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed alignment of new dropdown in file rows
fixed bad merge resolutions
parent
7adbed74
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
21 deletions
+28
-21
ide.vue
app/assets/javascripts/ide/components/ide.vue
+27
-21
repo.scss
app/assets/stylesheets/pages/repo.scss
+1
-0
No files found.
app/assets/javascripts/ide/components/ide.vue
View file @
272b8f3f
<
script
>
<
script
>
import
{
mapState
,
mapGetters
}
from
'vuex'
;
import
{
map
Actions
,
map
State
,
mapGetters
}
from
'vuex'
;
import
IdeSidebar
from
'./ide_side_bar.vue'
;
import
IdeSidebar
from
'./ide_side_bar.vue'
;
import
RepoTabs
from
'./repo_tabs.vue'
;
import
RepoTabs
from
'./repo_tabs.vue'
;
import
IdeStatusBar
from
'./ide_status_bar.vue'
;
import
IdeStatusBar
from
'./ide_status_bar.vue'
;
...
@@ -32,34 +32,40 @@ export default {
...
@@ -32,34 +32,40 @@ export default {
]),
]),
...
mapGetters
([
'activeFile'
,
'hasChanges'
]),
...
mapGetters
([
'activeFile'
,
'hasChanges'
]),
},
},
methods
:
{
...
mapActions
([
'toggleFileFinder'
]),
mousetrapStopCallback
(
e
,
el
,
combo
)
{
if
(
combo
===
't'
&&
el
.
classList
.
contains
(
'dropdown-input-field'
))
{
return
true
;
}
else
if
(
combo
===
'command+p'
||
combo
===
'ctrl+p'
)
{
return
false
;
}
return
originalStopCallback
(
e
,
el
,
combo
);
},
},
mounted
()
{
mounted
()
{
const
returnValue
=
'Are you sure you want to lose unsaved changes?'
;
const
returnValue
=
'Are you sure you want to lose unsaved changes?'
;
window
.
onbeforeunload
=
e
=>
{
window
.
onbeforeunload
=
e
=>
{
if
(
!
this
.
changedFiles
.
length
)
return
undefined
;
if
(
!
this
.
changedFiles
.
length
)
return
undefined
;
Mousetrap
.
bind
([
't'
,
'command+p'
,
'ctrl+p'
],
e
=>
{
Object
.
assign
(
e
,
{
if
(
e
.
preventDefault
)
{
returnValue
,
e
.
preventDefault
();
}
this
.
toggleFileFinder
(
!
this
.
fileFindVisible
);
});
});
return
returnValue
;
};
Mousetrap
.
stopCallback
=
(
e
,
el
,
combo
)
=>
this
.
mousetrapStopCallback
(
e
,
el
,
combo
);
Mousetrap
.
bind
([
't'
,
'command+p'
,
'ctrl+p'
],
e
=>
{
},
if
(
e
.
preventDefault
)
{
methods
:
{
e
.
preventDefault
();
...
mapActions
([
'toggleFileFinder'
]),
}
mousetrapStopCallback
(
e
,
el
,
combo
)
{
if
(
combo
===
't'
&&
el
.
classList
.
contains
(
'dropdown-input-field'
))
{
return
true
;
}
else
if
(
combo
===
'command+p'
||
combo
===
'ctrl+p'
)
{
return
false
;
}
return
originalStopCallback
(
e
,
el
,
combo
);
this
.
toggleFileFinder
(
!
this
.
fileFindVisible
);
},
});
},
};
Mousetrap
.
stopCallback
=
(
e
,
el
,
combo
)
=>
this
.
mousetrapStopCallback
(
e
,
el
,
combo
);
},
};
</
script
>
</
script
>
<
template
>
<
template
>
...
...
app/assets/stylesheets/pages/repo.scss
View file @
272b8f3f
...
@@ -55,6 +55,7 @@
...
@@ -55,6 +55,7 @@
white-space
:
nowrap
;
white-space
:
nowrap
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
max-width
:
inherit
;
max-width
:
inherit
;
line-height
:
22px
;
svg
{
svg
{
vertical-align
:
middle
;
vertical-align
:
middle
;
...
...
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