diff options
author | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-03 18:59:38 +0300 |
---|---|---|
committer | Luke "Jared" Bennett <lbennett@gitlab.com> | 2017-08-03 18:59:38 +0300 |
commit | b6770b3d9af23376f182a96da78cf8c405120d22 (patch) | |
tree | d0dce79586b44d0d5141cad1970160a587b22d7c /app/assets/javascripts/repo/components/repo.vue | |
parent | 03716dd38ccfd1399af25580329e8da887fdf5cc (diff) |
[ci skip] WIP dynamically switch between preview and repo-editor, disable edit button and editor for binary files
Diffstat (limited to 'app/assets/javascripts/repo/components/repo.vue')
-rw-r--r-- | app/assets/javascripts/repo/components/repo.vue | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/app/assets/javascripts/repo/components/repo.vue b/app/assets/javascripts/repo/components/repo.vue index 81cdf06b3ab..a09999e247a 100644 --- a/app/assets/javascripts/repo/components/repo.vue +++ b/app/assets/javascripts/repo/components/repo.vue @@ -7,6 +7,7 @@ import RepoBinaryViewer from './repo_binary_viewer.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 MonacoLoaderHelper from '../helpers/monaco_loader_helper'; export default { @@ -20,6 +21,16 @@ export default { 'repo-editor': MonacoLoaderHelper.repoEditorLoader, 'repo-commit-section': RepoCommitSection, 'popup-dialog': PopupDialog, + preview: { // POC + data: () => Store, + template: '<div v-html="activeFile.html"></div>', + }, + }, + + mounted() { + RepoHelper.getContent().then(() => { + + }).catch(RepoHelper.loadingError); }, methods: { @@ -31,6 +42,8 @@ export default { this.dialog.open = false; this.dialog.status = status; }, + + toggleBlobView: Store.toggleBlobView, }, }; </script> @@ -40,8 +53,8 @@ export default { <repo-sidebar/><div class="panel-right" :class="{'edit-mode': editMode}"> <repo-tabs/> <repo-file-buttons/> - <repo-editor/> - <repo-binary-viewer/> + <component :is="currentBlobView"></component> + <!-- <repo-binary-viewer/> soon™ --> </div> <repo-commit-section/> <popup-dialog |