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

[ci skip] WIP start to fix file raw state

Browse source
This commit is contained in:
Luke "Jared" Bennett 2017-08-03 19:01:48 +01:00
parent e361ed1e31
commit 2fce0c86e5
No known key found for this signature in database
GPG key ID: 402ED51FB5D306C2
2 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
app/assets/javascripts/repo/helpers/repo_helper.js
View file

@ -166,22 +166,17 @@ const RepoHelper = {
const rawUrl = RepoHelper.getRawURLFromBlobURL(file.url || Service.url);
RepoHelper.setBinaryDataAsBase64(rawUrl, data);
Store.setViewToPreview();
} else {
if (!Store.isPreviewView()) {
Service.getRaw(data.raw_path)
} else if (!Store.isPreviewView()) {
Service.getRaw(data.raw_path)
.then((rawResponse) => {
Store.blobRaw = rawResponse.data;
data.plain = rawResponse.data;
RepoHelper.setFile(data, file);
}).catch(RepoHelper.loadingError);
}
}
if (!file.url) file.url = location.pathname;
data.url = file.url;
data.newContent = '';
Store.addToOpenedFiles(data);
Store.setActiveFiles(data);
if (Store.isPreviewView()) RepoHelper.setFile(data, file);
// if the file tree is empty
if (Store.files.length === 0) {
@ -200,6 +195,17 @@ const RepoHelper = {
}).catch(RepoHelper.loadingError);
},
setFile(data, file) {
const newFile = data;
newFile.url = file.url || location.pathname;
newFile.url = file.url;
newFile.newContent = '';
Store.addToOpenedFiles(newFile);
Store.setActiveFiles(newFile);
},
toFA(icon) {
return `fa-${icon}`;
},

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

@ -95,6 +95,8 @@ const RepoStore = {
if (file.binary) {
RepoStore.blobRaw = file.base64;
RepoStore.binaryMimeType = file.mime_type;
} else {
RepoStore.blobRaw = file.newContent || file.plain;
}
if (!file.loading) RepoHelper.toURL(file.url, file.name);