kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Make Store->RepoStore and others consistent.

Browse source
This commit is contained in:
Jacob Schatz 2017-08-06 10:53:59 -04:00
parent 863114b4f5
commit f86cea6fdb
5 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/assets/javascripts/repo/components/repo.vue
View file

@ -8,7 +8,7 @@ import RepoPreview from './repo_preview.vue';
import RepoMixin from '../mixins/repo_mixin';
import PopupDialog from '../../vue_shared/components/popup_dialog.vue';
import Store from '../stores/repo_store';
import RepoHelper from '../helpers/repo_helper';
import Helper from '../helpers/repo_helper';
import MonacoLoaderHelper from '../helpers/monaco_loader_helper';
export default {
@ -26,7 +26,7 @@ export default {
},
mounted() {
RepoHelper.getContent().catch(RepoHelper.loadingError);
Helper.getContent().catch(Helper.loadingError);
},
methods: {

4
app/assets/javascripts/repo/components/repo_binary_viewer.vue
View file

@ -1,6 +1,6 @@
<script>
import Store from '../stores/repo_store';
import RepoHelper from '../helpers/repo_helper';
import Helper from '../helpers/repo_helper';
const RepoBinaryViewer = {
data: () => Store,
@ -41,7 +41,7 @@ const RepoBinaryViewer = {
watch: {
blobRaw() {
Store.resetBinaryTypes();
if (RepoHelper.isKindaBinary()) {
if (Helper.isKindaBinary()) {
this.activeFile.raw = false;
// counts as binaryish so we use the binary viewer in this case.
this.binary = true;

4
app/assets/javascripts/repo/components/repo_tab.vue
View file

@ -1,5 +1,5 @@
<script>
import RepoStore from '../stores/repo_store';
import Store from '../stores/repo_store';
const RepoTab = {
props: {
@ -20,7 +20,7 @@ const RepoTab = {
},
methods: {
tabClicked: RepoStore.setActiveFiles,
tabClicked: Store.setActiveFiles,
xClicked(file) {
if (file.changed) return;

8
app/assets/javascripts/repo/helpers/monaco_loader_helper.js
View file

@ -1,14 +1,14 @@
/* global monaco */
import RepoEditor from '../components/repo_editor.vue';
import RepoStore from '../stores/repo_store';
import Store from '../stores/repo_store';
import monacoLoader from '../monaco_loader';
function repoEditorLoader() {
RepoStore.monacoLoading = true;
Store.monacoLoading = true;
return new Promise((resolve) => {
monacoLoader(['vs/editor/editor.main'], () => {
RepoStore.monaco = monaco;
RepoStore.monacoLoading = false;
Store.monaco = monaco;
Store.monacoLoading = false;
resolve(RepoEditor);
});
});

18
app/assets/javascripts/repo/stores/repo_store.js
View file

@ -1,6 +1,6 @@
/* global Flash */
import RepoHelper from '../helpers/repo_helper';
import RepoService from '../services/repo_service';
import Helper from '../helpers/repo_helper';
import Service from '../services/repo_service';
const RepoStore = {
ideEl: {},
@ -35,7 +35,7 @@ const RepoStore = {
title: '',
status: false,
},
activeFile: RepoHelper.getDefaultActiveFile(),
activeFile: Helper.getDefaultActiveFile(),
activeFileIndex: 0,
activeLine: 0,
activeFileLabel: 'Raw',
@ -79,7 +79,7 @@ const RepoStore = {
},
addFilesToDirectory(inDirectory, currentList, newList) {
RepoStore.files = RepoHelper.getNewMergedList(inDirectory, currentList, newList);
RepoStore.files = Helper.getNewMergedList(inDirectory, currentList, newList);
},
toggleRawPreview() {
@ -100,14 +100,14 @@ const RepoStore = {
} else if (file.newContent || file.plain) {
RepoStore.blobRaw = file.newContent || file.plain;
} else {
RepoService.getRaw(file.raw_path)
Service.getRaw(file.raw_path)
.then((rawResponse) => {
RepoStore.blobRaw = rawResponse.data;
RepoHelper.findOpenedFileFromActive().plain = rawResponse.data;
}).catch(RepoHelper.loadingError);
Helper.findOpenedFileFromActive().plain = rawResponse.data;
}).catch(Helper.loadingError);
}
if (!file.loading) RepoHelper.toURL(file.url, file.name);
if (!file.loading) Helper.toURL(file.url, file.name);
RepoStore.binary = file.binary;
},
@ -182,7 +182,7 @@ const RepoStore = {
},
addPlaceholderFile() {
const randomURL = RepoHelper.Time.now();
const randomURL = Helper.Time.now();
const newFakeFile = {
active: false,
binary: true,