Commit 2fce0c86 authored by Luke "Jared" Bennett's avatar Luke "Jared" Bennett

[ci skip] WIP start to fix file raw state

parent e361ed1e
...@@ -166,22 +166,17 @@ const RepoHelper = { ...@@ -166,22 +166,17 @@ const RepoHelper = {
const rawUrl = RepoHelper.getRawURLFromBlobURL(file.url || Service.url); const rawUrl = RepoHelper.getRawURLFromBlobURL(file.url || Service.url);
RepoHelper.setBinaryDataAsBase64(rawUrl, data); RepoHelper.setBinaryDataAsBase64(rawUrl, data);
Store.setViewToPreview(); Store.setViewToPreview();
} else { } else if (!Store.isPreviewView()) {
if (!Store.isPreviewView()) { Service.getRaw(data.raw_path)
Service.getRaw(data.raw_path)
.then((rawResponse) => { .then((rawResponse) => {
Store.blobRaw = rawResponse.data; Store.blobRaw = rawResponse.data;
data.plain = rawResponse.data;
RepoHelper.setFile(data, file);
}).catch(RepoHelper.loadingError); }).catch(RepoHelper.loadingError);
}
} }
if (!file.url) file.url = location.pathname; if (Store.isPreviewView()) RepoHelper.setFile(data, file);
data.url = file.url;
data.newContent = '';
Store.addToOpenedFiles(data);
Store.setActiveFiles(data);
// if the file tree is empty // if the file tree is empty
if (Store.files.length === 0) { if (Store.files.length === 0) {
...@@ -200,6 +195,17 @@ const RepoHelper = { ...@@ -200,6 +195,17 @@ const RepoHelper = {
}).catch(RepoHelper.loadingError); }).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) { toFA(icon) {
return `fa-${icon}`; return `fa-${icon}`;
}, },
......
...@@ -95,6 +95,8 @@ const RepoStore = { ...@@ -95,6 +95,8 @@ const RepoStore = {
if (file.binary) { if (file.binary) {
RepoStore.blobRaw = file.base64; RepoStore.blobRaw = file.base64;
RepoStore.binaryMimeType = file.mime_type; RepoStore.binaryMimeType = file.mime_type;
} else {
RepoStore.blobRaw = file.newContent || file.plain;
} }
if (!file.loading) RepoHelper.toURL(file.url, file.name); if (!file.loading) RepoHelper.toURL(file.url, file.name);
......
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