Merge branch '44846-improve-web-ide-left-panel-and-modes' into ide-sidebar-merge-request
This commit is contained in:
commit
b64b8377b9
|
@ -2,14 +2,8 @@
|
|||
import { mapState } from 'vuex';
|
||||
|
||||
export default {
|
||||
props: {
|
||||
committedStateSvgPath: {
|
||||
type: String,
|
||||
required: true,
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
...mapState(['lastCommitMsg']),
|
||||
...mapState(['lastCommitMsg', 'committedStateSvgPath']),
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
|
|
@ -105,7 +105,6 @@ export default {
|
|||
>
|
||||
<success-message
|
||||
v-if="lastCommitMsg && !someUncommitedChanges"
|
||||
:committed-state-svg-path="committedStateSvgPath"
|
||||
/>
|
||||
<commit-message-field
|
||||
:text="commitMessage"
|
||||
|
|
|
@ -26,6 +26,7 @@ export default {
|
|||
'getStagedFile',
|
||||
'isEditModeActive',
|
||||
'isCommitModeActive',
|
||||
'isReviewModeActive',
|
||||
]),
|
||||
shouldHideEditor() {
|
||||
return this.file && this.file.binary && !this.file.content;
|
||||
|
|
|
@ -56,6 +56,7 @@ export const getStagedFile = state => path => state.stagedFiles.find(f => f.path
|
|||
|
||||
export const isEditModeActive = state => state.currentActivityView === activityBarViews.edit;
|
||||
export const isCommitModeActive = state => state.currentActivityView === activityBarViews.commit;
|
||||
export const isReviewModeActive = state => state.currentActivityView === activityBarViews.review;
|
||||
|
||||
// prevent babel-plugin-rewire from generating an invalid default during karma tests
|
||||
export default () => {};
|
||||
|
|
Loading…
Reference in New Issue