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
2c198b57
Commit
2c198b57
authored
Oct 30, 2018
by
George Tsiolis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix typos in IDE props
parent
c71c1f03
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
12 additions
and
7 deletions
+12
-7
app/assets/javascripts/ide/components/ide.vue
app/assets/javascripts/ide/components/ide.vue
+2
-2
app/assets/javascripts/ide/components/ide_side_bar.vue
app/assets/javascripts/ide/components/ide_side_bar.vue
+2
-2
app/assets/javascripts/ide/components/repo_commit_section.vue
...assets/javascripts/ide/components/repo_commit_section.vue
+2
-2
app/assets/javascripts/ide/stores/getters.js
app/assets/javascripts/ide/stores/getters.js
+1
-1
changelogs/unreleased/gt-fix-ide-typos-in-props.yml
changelogs/unreleased/gt-fix-ide-typos-in-props.yml
+5
-0
No files found.
app/assets/javascripts/ide/components/ide.vue
View file @
2c198b57
...
@@ -43,7 +43,7 @@ export default {
...
@@ -43,7 +43,7 @@ export default {
'
currentProjectId
'
,
'
currentProjectId
'
,
'
errorMessage
'
,
'
errorMessage
'
,
]),
]),
...
mapGetters
([
'
activeFile
'
,
'
hasChanges
'
,
'
someUncommitedChanges
'
,
'
isCommitModeActive
'
]),
...
mapGetters
([
'
activeFile
'
,
'
hasChanges
'
,
'
someUncommit
t
edChanges
'
,
'
isCommitModeActive
'
]),
},
},
mounted
()
{
mounted
()
{
window
.
onbeforeunload
=
e
=>
this
.
onBeforeUnload
(
e
);
window
.
onbeforeunload
=
e
=>
this
.
onBeforeUnload
(
e
);
...
@@ -63,7 +63,7 @@ export default {
...
@@ -63,7 +63,7 @@ export default {
onBeforeUnload
(
e
=
{})
{
onBeforeUnload
(
e
=
{})
{
const
returnValue
=
__
(
'
Are you sure you want to lose unsaved changes?
'
);
const
returnValue
=
__
(
'
Are you sure you want to lose unsaved changes?
'
);
if
(
!
this
.
someUncommitedChanges
)
return
undefined
;
if
(
!
this
.
someUncommit
t
edChanges
)
return
undefined
;
Object
.
assign
(
e
,
{
Object
.
assign
(
e
,
{
returnValue
,
returnValue
,
...
...
app/assets/javascripts/ide/components/ide_side_bar.vue
View file @
2c198b57
...
@@ -25,11 +25,11 @@ export default {
...
@@ -25,11 +25,11 @@ export default {
},
},
computed
:
{
computed
:
{
...
mapState
([
'
loading
'
,
'
currentActivityView
'
,
'
changedFiles
'
,
'
stagedFiles
'
,
'
lastCommitMsg
'
]),
...
mapState
([
'
loading
'
,
'
currentActivityView
'
,
'
changedFiles
'
,
'
stagedFiles
'
,
'
lastCommitMsg
'
]),
...
mapGetters
([
'
currentProject
'
,
'
someUncommitedChanges
'
]),
...
mapGetters
([
'
currentProject
'
,
'
someUncommit
t
edChanges
'
]),
showSuccessMessage
()
{
showSuccessMessage
()
{
return
(
return
(
this
.
currentActivityView
===
activityBarViews
.
edit
&&
this
.
currentActivityView
===
activityBarViews
.
edit
&&
(
this
.
lastCommitMsg
&&
!
this
.
someUncommitedChanges
)
(
this
.
lastCommitMsg
&&
!
this
.
someUncommit
t
edChanges
)
);
);
},
},
},
},
...
...
app/assets/javascripts/ide/components/repo_commit_section.vue
View file @
2c198b57
...
@@ -27,10 +27,10 @@ export default {
...
@@ -27,10 +27,10 @@ export default {
'
unusedSeal
'
,
'
unusedSeal
'
,
]),
]),
...
mapState
(
'
commit
'
,
[
'
commitMessage
'
,
'
submitCommitLoading
'
]),
...
mapState
(
'
commit
'
,
[
'
commitMessage
'
,
'
submitCommitLoading
'
]),
...
mapGetters
([
'
lastOpenedFile
'
,
'
hasChanges
'
,
'
someUncommitedChanges
'
,
'
activeFile
'
]),
...
mapGetters
([
'
lastOpenedFile
'
,
'
hasChanges
'
,
'
someUncommit
t
edChanges
'
,
'
activeFile
'
]),
...
mapGetters
(
'
commit
'
,
[
'
discardDraftButtonDisabled
'
]),
...
mapGetters
(
'
commit
'
,
[
'
discardDraftButtonDisabled
'
]),
showStageUnstageArea
()
{
showStageUnstageArea
()
{
return
!!
(
this
.
someUncommitedChanges
||
this
.
lastCommitMsg
||
!
this
.
unusedSeal
);
return
!!
(
this
.
someUncommit
t
edChanges
||
this
.
lastCommitMsg
||
!
this
.
unusedSeal
);
},
},
activeFileKey
()
{
activeFileKey
()
{
return
this
.
activeFile
?
this
.
activeFile
.
key
:
null
;
return
this
.
activeFile
?
this
.
activeFile
.
key
:
null
;
...
...
app/assets/javascripts/ide/stores/getters.js
View file @
2c198b57
...
@@ -63,7 +63,7 @@ export const isEditModeActive = state => state.currentActivityView === activityB
...
@@ -63,7 +63,7 @@ export const isEditModeActive = state => state.currentActivityView === activityB
export
const
isCommitModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
commit
;
export
const
isCommitModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
commit
;
export
const
isReviewModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
review
;
export
const
isReviewModeActive
=
state
=>
state
.
currentActivityView
===
activityBarViews
.
review
;
export
const
someUncommitedChanges
=
state
=>
export
const
someUncommit
t
edChanges
=
state
=>
!!
(
state
.
changedFiles
.
length
||
state
.
stagedFiles
.
length
);
!!
(
state
.
changedFiles
.
length
||
state
.
stagedFiles
.
length
);
export
const
getChangesInFolder
=
state
=>
path
=>
{
export
const
getChangesInFolder
=
state
=>
path
=>
{
...
...
changelogs/unreleased/gt-fix-ide-typos-in-props.yml
0 → 100644
View file @
2c198b57
---
title
:
Fix IDE typos in props
merge_request
:
22685
author
:
George Tsiolis
type
:
other
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