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

fixed render_error not being hooked up correctly

Browse source 
[ci skip]
This commit is contained in:
Phil Hughes 2017-10-26 16:54:44 +01:00
parent bdac5569b1
commit 4d18e20011
No known key found for this signature in database
GPG key ID: 32245528C52E0F9F
5 changed files with 9 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/assets/javascripts/repo/components/repo_preview.vue
View file

@ -33,21 +33,21 @@ export default {
<template> <template>
<div> <div>
<div <div
v-if="!activeFile.render_error" v-if="!activeFile.renderError"
v-html="activeFile.html"> v-html="activeFile.html">
</div> </div>
<div <div
v-else-if="activeFile.tooLarge" v-else-if="activeFile.renderError == 'too_large'"
class="vertical-center render-error"> class="vertical-center render-error">
<p class="text-center"> <p class="text-center">
The source could not be displayed because it is too large. You can <a :href="activeFile.raw_path">download</a> it instead. The source could not be displayed because it is too large. You can <a :href="activeFile.rawPath" download>download</a> it instead.
</p> </p>
</div> </div>
<div <div
v-else v-else
class="vertical-center render-error"> class="vertical-center render-error">
<p class="text-center"> <p class="text-center">
The source could not be displayed because a rendering error occurred. You can <a :href="activeFile.raw_path">download</a> it instead. The source could not be displayed because a rendering error occurred. You can <a :href="activeFile.rawPath" download>download</a> it instead.
</p> </p>
</div> </div>
</div> </div>

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

@ -35,5 +35,5 @@ export const canEditFile = (state) => {
return state.canCommit && return state.canCommit &&
state.onTopOfBranch && state.onTopOfBranch &&
openedFiles.length && openedFiles.length &&
(currentActiveFile && !currentActiveFile.render_error && !currentActiveFile.binary); (currentActiveFile && !currentActiveFile.renderError && !currentActiveFile.binary);
}; };

1
app/assets/javascripts/repo/stores/mutations/file.js
View file

@ -26,6 +26,7 @@ export default {
rawPath: data.raw_path, rawPath: data.raw_path,
binary: data.binary, binary: data.binary,
html: data.html, html: data.html,
renderError: data.render_error,
}); });
}, },
[types.SET_FILE_RAW_DATA](state, { file, raw }) { [types.SET_FILE_RAW_DATA](state, { file, raw }) {

3
app/assets/javascripts/repo/stores/utils.js
View file

@ -23,6 +23,7 @@ export const dataStructure = () => ({
raw: '', raw: '',
content: '', content: '',
parentTreeUrl: '', parentTreeUrl: '',
renderError: false,
}); });
export const decorateData = (entity, projectUrl = '') => { export const decorateData = (entity, projectUrl = '') => {
@ -36,6 +37,7 @@ export const decorateData = (entity, projectUrl = '') => {
tree_url, tree_url,
path, path,
tempFile, tempFile,
renderError,
active = false, active = false,
opened = false, opened = false,
changed = false, changed = false,
@ -58,6 +60,7 @@ export const decorateData = (entity, projectUrl = '') => {
active, active,
parentTreeUrl, parentTreeUrl,
changed, changed,
renderError,
// eslint-disable-next-line camelcase // eslint-disable-next-line camelcase
lastCommit: last_commit ? { lastCommit: last_commit ? {
url: `${projectUrl}/commit/${last_commit.id}`, url: `${projectUrl}/commit/${last_commit.id}`,

29
app/assets/stylesheets/pages/repo.scss
View file

@ -1,12 +1,3 @@
.monaco-loader {
position: absolute;
top: 0;
left: 0;
right: 0;
bottom: 0;
background: $black-transparent;
}
.modal.popup-dialog { .modal.popup-dialog {
display: block; display: block;
background-color: $black-transparent; background-color: $black-transparent;
@ -313,23 +304,3 @@
width: 100%; width: 100%;
} }
} }
@keyframes swipeRightAppear {
0% {
transform: scaleX(0.00);
}
100% {
transform: scaleX(1.00);
}
}
@keyframes swipeRightDissapear {
0% {
transform: scaleX(1.00);
}
100% {
transform: scaleX(0.00);
}
}