Skip to content

G
gitlab-ce
Commit 3a2f883f authored by Jacob Schatz's avatar Jacob Schatz
Browse files
Options

Merge branch 'ide' of gitlab.com:gitlab-org/gitlab-ce into ide With conflicts

parents 0b500111 51a936fb
Expand all Show whitespace changes
Inline Side-by-side
Showing with 310 additions and 186 deletions
app/assets/javascripts/dispatcher.js
View file @ 3a2f883f
......@@ -72,19 +72,18 @@ import RepoBundle from './repo/repo_bundle';
}
Dispatcher.prototype.initPageScripts = function() {
var page, path, shortcut_handler, fileBlobPermalinkUrlElement, fileBlobPermalinkUrl, os;
var page, path, shortcut_handler, fileBlobPermalinkUrlElement, fileBlobPermalinkUrl;
page = $('body').attr('data-page');
if (!page) {
return false;
}
function getScrollBarWidth () {
var $outer = $('<div>').css({visibility: 'hidden', width: 100, overflow: 'scroll'}).appendTo('body'),
widthWithScroll = $('<div>').css({width: '100%'}).appendTo($outer).outerWidth();
var $outer = $('<div>').css({ visibility: 'hidden', width: 100, overflow: 'scroll' }).appendTo('body'),
widthWithScroll = $('<div>').css({ width: '100%' }).appendTo($outer).outerWidth();
$outer.remove();
return 100 - widthWithScroll;
};
}
$('body').attr('data-scroll-width', getScrollBarWidth());
......
app/assets/javascripts/repo/repo_binary_viewer.js
View file @ 3a2f883f
import Vue from 'vue'
import Store from './repo_store'
import Vue from 'vue';
import Store from './repo_store';
import { loadingError } from './repo_helper';
export default class RepoBinaryViewer {
constructor(url) {
constructor() {
this.initVue();
}
......@@ -15,32 +16,51 @@ export default class RepoBinaryViewer {
computed: {
pngBlobWithDataURI() {
return `data:image/png;base64,${this.blobRaw}`;
}
},
},
methods: {
<<<<<<< HEAD
isMarkdown() {
return this.activeFile.extension === 'md';
=======
supportedNonBinaryFileType() {
switch (this.activeFile.extension) {
case 'md':
this.binaryTypes.markdown = true;
return true;
default:
return false;
}
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
},
},
watch: {
blobRaw() {
<<<<<<< HEAD
if(this.isMarkdown()) {
=======
const supported = this.supportedNonBinaryFileType();
if (supported) {
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
this.binaryTypes.markdown = true;
this.activeFile.raw = false;
// counts as binaryish so we use the binary viewer in this case.
this.binary = true;
return;
}
if(!this.binary) return;
switch(this.binaryMimeType) {
if (!this.binary) return;
switch (this.binaryMimeType) {
case 'image/png':
this.binaryTypes.png = true;
break;
default:
loadingError();
break;
}
}
}
},
},
});
}
}
app/assets/javascripts/repo/repo_bundle.js
View file @ 3a2f883f
<<<<<<< HEAD
import Tabs from './repo_tabs'
import Sidebar from './repo_sidebar'
import Editor from './repo_editor'
......@@ -8,6 +9,16 @@ import CommitSection from './repo_commit_section'
import Service from './repo_service'
import Store from './repo_store'
import Helper from './repo_helper'
=======
import Tabs from './repo_tabs';
import Sidebar from './repo_sidebar';
import Editor from './repo_editor';
import FileButtons from './repo_file_buttons';
import BinaryViewer from './repo_binary_viewer';
import Service from './repo_service';
import Store from './repo_store';
import Helper from './repo_helper';
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
export default class RepoBundle {
constructor() {
......
app/assets/javascripts/repo/repo_editor.js
View file @ 3a2f883f
/* global monaco */
import Vue from 'vue';
import Store from './repo_store'
import Helper from './repo_helper'
import Store from './repo_store';
import Helper from './repo_helper';
export default class RepoEditor {
constructor() {
......@@ -10,12 +10,19 @@ export default class RepoEditor {
}
addMonacoEvents() {
<<<<<<< HEAD
this.monacoEditor.onMouseUp(this.onMonacoEditorMouseUp.bind(this));
this.monacoEditor.onKeyUp(this.onMonacoEditorKeysPressed.bind(this));
=======
this.vue.$watch('activeFile.lineNumber', () => {
console.log('cahnged');
});
this.monacoEditor.onMouseUp(RepoEditor.onMonacoEditorMouseUp);
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
}
onMonacoEditorMouseUp(e) {
if(e.target.element.className === 'line-numbers') {
static onMonacoEditorMouseUp(e) {
if (e.target.element.className === 'line-numbers') {
location.hash = `L${e.target.position.lineNumber}`;
Store.activeLine = e.target.position.lineNumber;
}
......@@ -34,7 +41,7 @@ export default class RepoEditor {
model: null,
readOnly: true,
contextmenu: false,
}
},
);
Helper.monacoInstance = monaco;
......@@ -49,33 +56,37 @@ export default class RepoEditor {
const monacoEditor = this.monacoEditor;
this.vue = new Vue({
data: () => Store,
created () {
created() {
this.showHide();
if(this.blobRaw !== ''){
if (this.blobRaw !== '') {
monacoEditor.setModel(
monaco.editor.createModel(
this.blobRaw,
'plain'
)
'plain',
),
);
}
},
methods: {
showHide() {
<<<<<<< HEAD
if(!this.openedFiles.length || (this.binary && !this.activeFile.raw)) {
=======
if ((!this.openedFiles.length) || this.binary) {
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
self.el.style.display = 'none';
} else {
self.el.style.display = 'inline-block';
}
}
},
},
watch: {
activeLine() {
self.monacoEditor.setPosition({
lineNumber: this.activeLine,
column: 1
column: 1,
});
},
......@@ -114,20 +125,24 @@ export default class RepoEditor {
blobRaw() {
this.showHide();
<<<<<<< HEAD
if(!this.isTree) {
// kill the current model;
self.monacoEditor.setModel(null);
// then create the new one
=======
if (!this.isTree) {
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
self.monacoEditor.setModel(
monaco.editor.createModel(
this.blobRaw,
this.activeFile.mime_type
)
this.activeFile.mime_type,
),
);
console.log(monaco.editor.getModels());
}
}
}
},
},
});
}
}
app/assets/javascripts/repo/repo_file.js
View file @ 3a2f883f
let RepoFile = {
const RepoFile = {
template: `
<tr v-if='!loading.tree || hasFiles' :class='{"active": activeFile.url === file.url}'>
<td>
......@@ -20,13 +20,13 @@ let RepoFile = {
isMini: Boolean,
loading: Object,
hasFiles: Boolean,
activeFile: Object
activeFile: Object,
},
methods: {
linkClicked(file) {
this.$emit('linkclicked', file);
}
}
},
},
};
export default RepoFile;
app/assets/javascripts/repo/repo_file_buttons.js
View file @ 3a2f883f
<<<<<<< HEAD
import Vue from 'vue'
import Store from './repo_store'
import Helper from './repo_helper'
import RepoMiniMixin from './repo_mini_mixin'
=======
import Vue from 'vue';
import Store from './repo_store';
import Helper from './repo_helper';
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
export default class RepoSidebar {
constructor(url) {
......@@ -31,9 +37,14 @@ export default class RepoSidebar {
</div>
`,
computed: {
<<<<<<< HEAD
editableBorder() {
return this.editMode ? '1px solid #1F78D1' :'1px solid #f0f0f0';
=======
previewLabel() {
return this.activeFile.raw ? 'Preview' : 'Raw';
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
},
canPreview() {
......@@ -50,13 +61,19 @@ export default class RepoSidebar {
historyFileUrl() {
return Helper.getHistoryURLFromBlobURL(this.activeFile.url);
}
},
},
methods: {
<<<<<<< HEAD
rawPreviewToggle() {
Helper.setCurrentFileRawOrPreview();
}
=======
setRawPreviewMode() {
},
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
},
});
}
......
app/assets/javascripts/repo/repo_file_options.js
View file @ 3a2f883f
let RepoFileOptions = {
const RepoFileOptions = {
template: `
<tr v-if='isMini' class='repo-file-options'>
<td>
......@@ -21,8 +21,8 @@ let RepoFileOptions = {
props: {
name: 'repo-file-options',
isMini: Boolean,
projectName: String
}
}
projectName: String,
},
};
export default RepoFileOptions;
app/assets/javascripts/repo/repo_helper.js
View file @ 3a2f883f
This diff is collapsed.
app/assets/javascripts/repo/repo_loading_file.js
View file @ 3a2f883f
let RepoLoadingFile = {
const RepoLoadingFile = {
template: `
<tr v-if='loading.tree && !hasFiles'>
<td>
......@@ -22,13 +22,13 @@ let RepoLoadingFile = {
methods: {
lineOfCode(n) {
return `line-of-code-${n}`;
}
},
},
props: {
loading: Object,
hasFiles: Boolean,
isMini: Boolean
}
isMini: Boolean,
},
};
export default RepoLoadingFile;
app/assets/javascripts/repo/repo_mini_mixin.js
View file @ 3a2f883f
import Store from './repo_store'
import Store from './repo_store';
let RepoMiniMixin = {
const RepoMiniMixin = {
computed: {
isMini() {
return !!Store.openedFiles.length;
}
},
},
};
......
app/assets/javascripts/repo/repo_prev_directory.js
View file @ 3a2f883f
let RepoPreviousDirectory = {
const RepoPreviousDirectory = {
template: `
<tr>
<td colspan='3'>
......@@ -8,13 +8,13 @@ let RepoPreviousDirectory = {
`,
props: {
name: 'repo-previous-directory',
prevUrl: String
prevUrl: String,
},
methods: {
linkClicked(file) {
this.$emit('linkclicked', file);
}
}
},
},
};
export default RepoPreviousDirectory;
app/assets/javascripts/repo/repo_service.js
View file @ 3a2f883f
import axios from 'axios';
let RepoService = {
const RepoService = {
url: '',
params: {
params: {
format: 'json'
}
format: 'json',
},
},
setUrl(url) {
......@@ -14,16 +14,16 @@ let RepoService = {
paramsWithRich(url) {
// copy the obj so we don't modify perm.
let params = JSON.parse(JSON.stringify(this.params));
if(url.substr(url.length-2) === 'md') {
const params = JSON.parse(JSON.stringify(this.params));
if (url.substr(url.length - 2) === 'md') {
params.params.viewer = 'rich';
}
return params;
},
getContent(url) {
if(url){
return axios.get(url, this.paramsWithRich(url, params));
if (url) {
return axios.get(url, this.paramsWithRich(url, this.params));
}
return axios.get(this.url, this.paramsWithRich(this.url, this.params));
},
......@@ -31,10 +31,10 @@ let RepoService = {
getBase64Content(url) {
return axios
.get(url, {
responseType: 'arraybuffer'
responseType: 'arraybuffer',
})
.then(response => new Buffer(response.data, 'binary').toString('base64'))
}
.then(response => new Buffer(response.data, 'binary').toString('base64'));
},
};
export default RepoService;
app/assets/javascripts/repo/repo_sidebar.js
View file @ 3a2f883f
import Service from './repo_service'
import Helper from './repo_helper'
import Vue from 'vue'
import Store from './repo_store'
import RepoPreviousDirectory from './repo_prev_directory'
import RepoFileOptions from './repo_file_options'
import RepoFile from './repo_file'
import RepoLoadingFile from './repo_loading_file'
import RepoMiniMixin from './repo_mini_mixin'
import Vue from 'vue';
import Service from './repo_service';
import Helper from './repo_helper';
import Store from './repo_store';
import RepoPreviousDirectory from './repo_prev_directory';
import RepoFileOptions from './repo_file_options';
import RepoFile from './repo_file';
import RepoLoadingFile from './repo_loading_file';
import RepoMiniMixin from './repo_mini_mixin';
export default class RepoSidebar {
constructor(url) {
......@@ -35,31 +35,37 @@ export default class RepoSidebar {
methods: {
addPopEventListener() {
window.addEventListener('popstate', () => {
if(location.href.indexOf('#') > -1) return;
if (location.href.indexOf('#') > -1) return;
this.linkClicked({
url: location.href
url: location.href,
});
});
},
linkClicked(file) {
let url = '';
if(typeof file === 'object') {
if(file.type === 'tree' && file.opened) {
if (typeof file === 'object') {
if (file.type === 'tree' && file.opened) {
Helper.removeChildFilesOfTree(file);
<<<<<<< HEAD
return;
} else {
url = file.url;
Service.url = url;
Helper.getContent(file);
=======
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
}
} else if(typeof file === 'string') {
url = file.url;
Service.url = url;
Helper.getContent(file);
} else if (typeof file === 'string') {
// go back
url = file;
Service.url = url;
Helper.getContent();
}
}
},
},
});
}
......
app/assets/javascripts/repo/repo_store.js
View file @ 3a2f883f
let RepoStore = {
const RepoStore = {
service: '',
editor: '',
sidebar: '',
......@@ -22,9 +22,12 @@ let RepoStore = {
plain: '',
size: 0,
url: '',
<<<<<<< HEAD
raw: false,
newContent: '',
changed: false
=======
>>>>>>> 51a936fb3d2cdbd133a3b0eed463b47c1c92fe7d
},
activeFileIndex: 0,
activeLine: 0,
......@@ -32,15 +35,15 @@ let RepoStore = {
files: [],
binary: false,
binaryMimeType: '',
//scroll bar space for windows
// scroll bar space for windows
scrollWidth: 0,
binaryTypes: {
png: false,
markdown: false
markdown: false,
},
loading: {
tree: false,
blob: false
}
blob: false,
},
};
export default RepoStore;
app/assets/javascripts/repo/repo_tab.js
View file @ 3a2f883f
import RepoHelper from './repo_helper'
import RepoHelper from './repo_helper';
let RepoTab = {
const RepoTab = {
template: `
<li>
<a href='#' @click.prevent='xClicked(tab)' v-if='!tab.loading'>
......@@ -34,7 +34,7 @@ let RepoTab = {
xClicked(file) {
if(file.changed) return;
RepoHelper.removeFromOpenedFiles(file);
}
}
},
},
};
export default RepoTab;
app/assets/javascripts/repo/repo_tabs.js
View file @ 3a2f883f
import Vue from 'vue';
import Store from './repo_store'
import RepoTab from './repo_tab'
import RepoMiniMixin from './repo_mini_mixin'
import Store from './repo_store';
import RepoTab from './repo_tab';
import RepoMiniMixin from './repo_mini_mixin';
export default class RepoTabs {
constructor() {
this.styleTabsForWindows();
RepoTabs.styleTabsForWindows();
this.initVue();
}
......@@ -20,7 +20,7 @@ export default class RepoTabs {
});
}
styleTabsForWindows() {
static styleTabsForWindows() {
const scrollWidth = Number(document.body.dataset.scrollWidth);
Store.scrollWidth = scrollWidth;
}
......
app/assets/javascripts/repo/repo_view_toggler.js 0 → 100644
View file @ 3a2f883f
import Vue from 'vue';
import Store from './repo_store';
export default class RepoViewToggler {
constructor() {
this.initVue();
}
initVue() {
this.vue = new Vue({
el: '#view-toggler',
data: () => Store,
});
}
}
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7