Commit 6947890e authored by Tim Zallmann's avatar Tim Zallmann

Merge branch 'prettify-all-the-things-5' into 'master'

Prettify all the things (part 5)

See merge request gitlab-org/gitlab-ce!22255
parents 20bfbdf2 69b7c032
...@@ -38,14 +38,18 @@ export default { ...@@ -38,14 +38,18 @@ export default {
return this.modifiedFilesLength ? 'multi-file-modified' : ''; return this.modifiedFilesLength ? 'multi-file-modified' : '';
}, },
additionsTooltip() { additionsTooltip() {
return sprintf(n__('1 %{type} addition', '%{count} %{type} additions', this.addedFilesLength), { return sprintf(
n__('1 %{type} addition', '%{count} %{type} additions', this.addedFilesLength),
{
type: this.title.toLowerCase(), type: this.title.toLowerCase(),
count: this.addedFilesLength, count: this.addedFilesLength,
}); },
);
}, },
modifiedTooltip() { modifiedTooltip() {
return sprintf( return sprintf(
n__('1 %{type} modification', '%{count} %{type} modifications', this.modifiedFilesLength), { n__('1 %{type} modification', '%{count} %{type} modifications', this.modifiedFilesLength),
{
type: this.title.toLowerCase(), type: this.title.toLowerCase(),
count: this.modifiedFilesLength, count: this.modifiedFilesLength,
}, },
......
...@@ -25,10 +25,7 @@ export default { ...@@ -25,10 +25,7 @@ export default {
return `discard-file-${this.path}`; return `discard-file-${this.path}`;
}, },
modalTitle() { modalTitle() {
return sprintf( return sprintf(__('Discard changes to %{path}?'), { path: this.path });
__('Discard changes to %{path}?'),
{ path: this.path },
);
}, },
}, },
methods: { methods: {
......
...@@ -24,13 +24,7 @@ export default { ...@@ -24,13 +24,7 @@ export default {
IdeProjectHeader, IdeProjectHeader,
}, },
computed: { computed: {
...mapState([ ...mapState(['loading', 'currentActivityView', 'changedFiles', 'stagedFiles', 'lastCommitMsg']),
'loading',
'currentActivityView',
'changedFiles',
'stagedFiles',
'lastCommitMsg',
]),
...mapGetters(['currentProject', 'someUncommitedChanges']), ...mapGetters(['currentProject', 'someUncommitedChanges']),
showSuccessMessage() { showSuccessMessage() {
return ( return (
......
...@@ -37,14 +37,10 @@ export default { ...@@ -37,14 +37,10 @@ export default {
return this.hasSearchFocus && !this.search && !this.currentSearchType; return this.hasSearchFocus && !this.search && !this.currentSearchType;
}, },
type() { type() {
return this.currentSearchType return this.currentSearchType ? this.currentSearchType.type : '';
? this.currentSearchType.type
: '';
}, },
searchTokens() { searchTokens() {
return this.currentSearchType return this.currentSearchType ? [this.currentSearchType] : [];
? [this.currentSearchType]
: [];
}, },
}, },
watch: { watch: {
......
...@@ -13,9 +13,7 @@ export default { ...@@ -13,9 +13,7 @@ export default {
computed: { computed: {
...mapState(['currentBranchId', 'currentMergeRequestId']), ...mapState(['currentBranchId', 'currentMergeRequestId']),
mergeRequestLabel() { mergeRequestLabel() {
return this.currentMergeRequestId return this.currentMergeRequestId ? `!${this.currentMergeRequestId}` : EMPTY_LABEL;
? `!${this.currentMergeRequestId}`
: EMPTY_LABEL;
}, },
branchLabel() { branchLabel() {
return this.currentBranchId || EMPTY_LABEL; return this.currentBranchId || EMPTY_LABEL;
......
...@@ -43,34 +43,25 @@ export default { ...@@ -43,34 +43,25 @@ export default {
{ {
show: this.currentMergeRequestId, show: this.currentMergeRequestId,
title: __('Merge Request'), title: __('Merge Request'),
views: [ views: [rightSidebarViews.mergeRequestInfo],
rightSidebarViews.mergeRequestInfo,
],
icon: 'text-description', icon: 'text-description',
}, },
{ {
show: true, show: true,
title: __('Pipelines'), title: __('Pipelines'),
views: [ views: [rightSidebarViews.pipelines, rightSidebarViews.jobsDetail],
rightSidebarViews.pipelines,
rightSidebarViews.jobsDetail,
],
icon: 'rocket', icon: 'rocket',
}, },
{ {
show: this.showLivePreview, show: this.showLivePreview,
title: __('Live preview'), title: __('Live preview'),
views: [ views: [rightSidebarViews.clientSidePreview],
rightSidebarViews.clientSidePreview,
],
icon: 'live-preview', icon: 'live-preview',
}, },
]; ];
}, },
tabs() { tabs() {
return this.defaultTabs return this.defaultTabs.concat(this.extensionTabs).filter(tab => tab.show);
.concat(this.extensionTabs)
.filter(tab => tab.show);
}, },
tabViews() { tabViews() {
return _.flatten(this.tabs.map(tab => tab.views)); return _.flatten(this.tabs.map(tab => tab.views));
......
...@@ -25,12 +25,7 @@ export default { ...@@ -25,12 +25,7 @@ export default {
...mapState('rightPane', { ...mapState('rightPane', {
rightPaneIsOpen: 'isOpen', rightPaneIsOpen: 'isOpen',
}), }),
...mapState([ ...mapState(['rightPanelCollapsed', 'viewer', 'panelResizing', 'currentActivityView']),
'rightPanelCollapsed',
'viewer',
'panelResizing',
'currentActivityView',
]),
...mapGetters([ ...mapGetters([
'currentMergeRequest', 'currentMergeRequest',
'getStagedFile', 'getStagedFile',
......
...@@ -30,9 +30,7 @@ export default { ...@@ -30,9 +30,7 @@ export default {
}, },
computed: { computed: {
placeholderText() { placeholderText() {
return this.tokens.length return this.tokens.length ? '' : this.placeholder;
? ''
: this.placeholder;
}, },
}, },
watch: { watch: {
......
...@@ -21,10 +21,7 @@ Vue.use(Translate); ...@@ -21,10 +21,7 @@ Vue.use(Translate);
export function initIde(el, options = {}) { export function initIde(el, options = {}) {
if (!el) return null; if (!el) return null;
const { const { extraInitialData = () => ({}), rootComponent = ide } = options;
extraInitialData = () => ({}),
rootComponent = ide,
} = options;
return new Vue({ return new Vue({
el, el,
......
...@@ -11,14 +11,16 @@ export const computeDiff = (originalContent, newContent) => { ...@@ -11,14 +11,16 @@ export const computeDiff = (originalContent, newContent) => {
if (findOnLine) { if (findOnLine) {
Object.assign(findOnLine, change, { Object.assign(findOnLine, change, {
modified: true, modified: true,
endLineNumber: (lineNumber + change.count) - 1, endLineNumber: lineNumber + change.count - 1,
}); });
} else if ('added' in change || 'removed' in change) { } else if ('added' in change || 'removed' in change) {
acc.push(Object.assign({}, change, { acc.push(
Object.assign({}, change, {
lineNumber, lineNumber,
modified: undefined, modified: undefined,
endLineNumber: (lineNumber + change.count) - 1, endLineNumber: lineNumber + change.count - 1,
})); }),
);
} }
if (!change.removed) { if (!change.removed) {
......
import { computeDiff } from './diff'; import { computeDiff } from './diff';
// eslint-disable-next-line no-restricted-globals // eslint-disable-next-line no-restricted-globals
self.addEventListener('message', (e) => { self.addEventListener('message', e => {
const { data } = e; const { data } = e;
// eslint-disable-next-line no-restricted-globals // eslint-disable-next-line no-restricted-globals
......
...@@ -125,10 +125,7 @@ export const showBranchNotFoundError = ({ dispatch }, branchId) => { ...@@ -125,10 +125,7 @@ export const showBranchNotFoundError = ({ dispatch }, branchId) => {
}); });
}; };
export const openBranch = ( export const openBranch = ({ dispatch, state }, { projectId, branchId, basePath }) => {
{ dispatch, state },
{ projectId, branchId, basePath },
) => {
dispatch('setCurrentBranchId', branchId); dispatch('setCurrentBranchId', branchId);
dispatch('getBranchData', { dispatch('getBranchData', {
...@@ -136,12 +133,10 @@ export const openBranch = ( ...@@ -136,12 +133,10 @@ export const openBranch = (
branchId, branchId,
}); });
return ( return dispatch('getFiles', {
dispatch('getFiles', {
projectId, projectId,
branchId, branchId,
}) }).then(() => {
.then(() => {
if (basePath) { if (basePath) {
const path = basePath.slice(-1) === '/' ? basePath.slice(0, -1) : basePath; const path = basePath.slice(-1) === '/' ? basePath.slice(0, -1) : basePath;
const treeEntryKey = Object.keys(state.entries).find( const treeEntryKey = Object.keys(state.entries).find(
...@@ -153,6 +148,5 @@ export const openBranch = ( ...@@ -153,6 +148,5 @@ export const openBranch = (
dispatch('handleTreeEntryAction', treeEntry); dispatch('handleTreeEntryAction', treeEntry);
} }
} }
}) });
);
}; };
...@@ -3,8 +3,7 @@ import Api from '../../../../api'; ...@@ -3,8 +3,7 @@ import Api from '../../../../api';
import { scopes } from './constants'; import { scopes } from './constants';
import * as types from './mutation_types'; import * as types from './mutation_types';
export const requestMergeRequests = ({ commit }) => export const requestMergeRequests = ({ commit }) => commit(types.REQUEST_MERGE_REQUESTS);
commit(types.REQUEST_MERGE_REQUESTS);
export const receiveMergeRequestsError = ({ commit, dispatch }, { type, search }) => { export const receiveMergeRequestsError = ({ commit, dispatch }, { type, search }) => {
dispatch( dispatch(
'setErrorMessage', 'setErrorMessage',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment