summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-10-26 16:54:44 +0100
committerPhil Hughes <me@iamphill.com>2017-10-26 16:54:44 +0100
commit4d18e2001102fc2269da0509861770cc5bf8de11 (patch)
tree036a02cd13a4e5dab824eb3e74b5ab8b1863e357 /app
parentbdac5569b10b4dde32a7ac98973da2805f42e92d (diff)
downloadgitlab-ce-4d18e2001102fc2269da0509861770cc5bf8de11.tar.gz
fixed render_error not being hooked up correctly
[ci skip]
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/repo/components/repo_preview.vue8
-rw-r--r--app/assets/javascripts/repo/stores/getters.js2
-rw-r--r--app/assets/javascripts/repo/stores/mutations/file.js1
-rw-r--r--app/assets/javascripts/repo/stores/utils.js3
-rw-r--r--app/assets/stylesheets/pages/repo.scss29
5 files changed, 9 insertions, 34 deletions
diff --git a/app/assets/javascripts/repo/components/repo_preview.vue b/app/assets/javascripts/repo/components/repo_preview.vue
index 23b71b03a14..647c9079d0f 100644
--- a/app/assets/javascripts/repo/components/repo_preview.vue
+++ b/app/assets/javascripts/repo/components/repo_preview.vue
@@ -33,21 +33,21 @@ export default {
<template>
<div>
<div
- v-if="!activeFile.render_error"
+ v-if="!activeFile.renderError"
v-html="activeFile.html">
</div>
<div
- v-else-if="activeFile.tooLarge"
+ v-else-if="activeFile.renderError == 'too_large'"
class="vertical-center render-error">
<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>
</div>
<div
v-else
class="vertical-center render-error">
<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>
</div>
</div>
diff --git a/app/assets/javascripts/repo/stores/getters.js b/app/assets/javascripts/repo/stores/getters.js
index 9fa593a82da..1c83c943ef7 100644
--- a/app/assets/javascripts/repo/stores/getters.js
+++ b/app/assets/javascripts/repo/stores/getters.js
@@ -35,5 +35,5 @@ export const canEditFile = (state) => {
return state.canCommit &&
state.onTopOfBranch &&
openedFiles.length &&
- (currentActiveFile && !currentActiveFile.render_error && !currentActiveFile.binary);
+ (currentActiveFile && !currentActiveFile.renderError && !currentActiveFile.binary);
};
diff --git a/app/assets/javascripts/repo/stores/mutations/file.js b/app/assets/javascripts/repo/stores/mutations/file.js
index 4d10fa8169d..f9ba80b9dc2 100644
--- a/app/assets/javascripts/repo/stores/mutations/file.js
+++ b/app/assets/javascripts/repo/stores/mutations/file.js
@@ -26,6 +26,7 @@ export default {
rawPath: data.raw_path,
binary: data.binary,
html: data.html,
+ renderError: data.render_error,
});
},
[types.SET_FILE_RAW_DATA](state, { file, raw }) {
diff --git a/app/assets/javascripts/repo/stores/utils.js b/app/assets/javascripts/repo/stores/utils.js
index 81638e46672..feafcebcfe2 100644
--- a/app/assets/javascripts/repo/stores/utils.js
+++ b/app/assets/javascripts/repo/stores/utils.js
@@ -23,6 +23,7 @@ export const dataStructure = () => ({
raw: '',
content: '',
parentTreeUrl: '',
+ renderError: false,
});
export const decorateData = (entity, projectUrl = '') => {
@@ -36,6 +37,7 @@ export const decorateData = (entity, projectUrl = '') => {
tree_url,
path,
tempFile,
+ renderError,
active = false,
opened = false,
changed = false,
@@ -58,6 +60,7 @@ export const decorateData = (entity, projectUrl = '') => {
active,
parentTreeUrl,
changed,
+ renderError,
// eslint-disable-next-line camelcase
lastCommit: last_commit ? {
url: `${projectUrl}/commit/${last_commit.id}`,
diff --git a/app/assets/stylesheets/pages/repo.scss b/app/assets/stylesheets/pages/repo.scss
index b082c3f4bb2..b360fb7de1a 100644
--- a/app/assets/stylesheets/pages/repo.scss
+++ b/app/assets/stylesheets/pages/repo.scss
@@ -1,12 +1,3 @@
-.monaco-loader {
- position: absolute;
- top: 0;
- left: 0;
- right: 0;
- bottom: 0;
- background: $black-transparent;
-}
-
.modal.popup-dialog {
display: block;
background-color: $black-transparent;
@@ -313,23 +304,3 @@
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);
- }
-}