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
3c9439ac
Commit
3c9439ac
authored
May 02, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
made path prop in dropdown optional
added computed prop for showing loading indicator
parent
06eb127b
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
7 deletions
+9
-7
app/assets/javascripts/ide/components/ide_tree.vue
app/assets/javascripts/ide/components/ide_tree.vue
+0
-1
app/assets/javascripts/ide/components/ide_tree_list.vue
app/assets/javascripts/ide/components/ide_tree_list.vue
+4
-1
app/assets/javascripts/ide/components/new_dropdown/index.vue
app/assets/javascripts/ide/components/new_dropdown/index.vue
+2
-1
app/assets/javascripts/ide/components/repo_editor.vue
app/assets/javascripts/ide/components/repo_editor.vue
+2
-3
app/assets/javascripts/ide/stores/getters.js
app/assets/javascripts/ide/stores/getters.js
+1
-1
No files found.
app/assets/javascripts/ide/components/ide_tree.vue
View file @
3c9439ac
...
@@ -26,7 +26,6 @@ export default {
...
@@ -26,7 +26,6 @@ export default {
<new-dropdown
<new-dropdown
:project-id=
"currentProject.name_with_namespace"
:project-id=
"currentProject.name_with_namespace"
:branch=
"currentBranchId"
:branch=
"currentBranchId"
path=
""
/>
/>
</
template
>
</
template
>
</ide-tree-list>
</ide-tree-list>
...
...
app/assets/javascripts/ide/components/ide_tree_list.vue
View file @
3c9439ac
...
@@ -31,6 +31,9 @@ export default {
...
@@ -31,6 +31,9 @@ export default {
computed
:
{
computed
:
{
...
mapState
([
'
currentBranchId
'
]),
...
mapState
([
'
currentBranchId
'
]),
...
mapGetters
([
'
currentProject
'
,
'
currentTree
'
]),
...
mapGetters
([
'
currentProject
'
,
'
currentTree
'
]),
showLoading
()
{
return
!
this
.
currentTree
||
this
.
currentTree
.
loading
;
},
},
},
mounted
()
{
mounted
()
{
this
.
updateViewer
(
this
.
viewerType
);
this
.
updateViewer
(
this
.
viewerType
);
...
@@ -45,7 +48,7 @@ export default {
...
@@ -45,7 +48,7 @@ export default {
<div
<div
class=
"ide-file-list"
class=
"ide-file-list"
>
>
<template
v-if=
"
!currentTree || currentTree.l
oading"
>
<template
v-if=
"
showL
oading"
>
<div
<div
class=
"multi-file-loading-container"
class=
"multi-file-loading-container"
v-for=
"n in 3"
v-for=
"n in 3"
...
...
app/assets/javascripts/ide/components/new_dropdown/index.vue
View file @
3c9439ac
...
@@ -17,7 +17,8 @@ export default {
...
@@ -17,7 +17,8 @@ export default {
},
},
path
:
{
path
:
{
type
:
String
,
type
:
String
,
required
:
true
,
required
:
false
,
default
:
''
,
},
},
},
},
data
()
{
data
()
{
...
...
app/assets/javascripts/ide/components/repo_editor.vue
View file @
3c9439ac
...
@@ -24,7 +24,7 @@ export default {
...
@@ -24,7 +24,7 @@ export default {
...
mapGetters
([
...
mapGetters
([
'
currentMergeRequest
'
,
'
currentMergeRequest
'
,
'
getStagedFile
'
,
'
getStagedFile
'
,
'
is
Review
ModeActive
'
,
'
is
Edit
ModeActive
'
,
'
isCommitModeActive
'
,
'
isCommitModeActive
'
,
]),
]),
shouldHideEditor
()
{
shouldHideEditor
()
{
...
@@ -191,8 +191,7 @@ export default {
...
@@ -191,8 +191,7 @@ export default {
<div
class=
"ide-mode-tabs clearfix"
>
<div
class=
"ide-mode-tabs clearfix"
>
<ul
<ul
class=
"nav-links pull-left"
class=
"nav-links pull-left"
v-if=
"!shouldHideEditor"
v-if=
"!shouldHideEditor && isEditModeActive"
v-show=
"!isReviewModeActive && !isCommitModeActive"
>
>
<li
:class=
"editTabCSS"
>
<li
:class=
"editTabCSS"
>
<a
<a
...
...
app/assets/javascripts/ide/stores/getters.js
View file @
3c9439ac
...
@@ -54,7 +54,7 @@ export const allBlobs = state =>
...
@@ -54,7 +54,7 @@ export const allBlobs = state =>
export
const
getStagedFile
=
state
=>
path
=>
state
.
stagedFiles
.
find
(
f
=>
f
.
path
===
path
);
export
const
getStagedFile
=
state
=>
path
=>
state
.
stagedFiles
.
find
(
f
=>
f
.
path
===
path
);
export
const
is
ReviewModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
review
;
export
const
is
EditModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
edit
;
export
const
isCommitModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
commit
;
export
const
isCommitModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
commit
;
// prevent babel-plugin-rewire from generating an invalid default during karma tests
// prevent babel-plugin-rewire from generating an invalid default during karma tests
...
...
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