BigW Consortium Gitlab
Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gitlab-ce
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Forest Godfrey
gitlab-ce
Commits
a1adb794
Commit
a1adb794
authored
Jul 26, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixes broken images on load of PNGs
parent
727c8a26
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
1 deletion
+13
-1
repo_binary_viewer.vue
app/assets/javascripts/repo/repo_binary_viewer.vue
+12
-1
repo_store.js
app/assets/javascripts/repo/repo_store.js
+1
-0
No files found.
app/assets/javascripts/repo/repo_binary_viewer.vue
View file @
a1adb794
...
@@ -13,6 +13,16 @@ const RepoBinaryViewer = {
...
@@ -13,6 +13,16 @@ const RepoBinaryViewer = {
},
},
methods
:
{
methods
:
{
errored
()
{
console
.
log
(
'errored'
);
Store
.
binaryLoaded
=
false
;
},
loaded
()
{
console
.
log
(
'loaded'
);
Store
.
binaryLoaded
=
true
;
},
isMarkdown
()
{
isMarkdown
()
{
return
this
.
activeFile
.
extension
===
'md'
;
return
this
.
activeFile
.
extension
===
'md'
;
},
},
...
@@ -30,6 +40,7 @@ const RepoBinaryViewer = {
...
@@ -30,6 +40,7 @@ const RepoBinaryViewer = {
if
(
!
this
.
binary
)
return
;
if
(
!
this
.
binary
)
return
;
switch
(
this
.
binaryMimeType
)
{
switch
(
this
.
binaryMimeType
)
{
case
'image/png'
:
case
'image/png'
:
console
.
log
(
'png bitch'
)
this
.
binaryTypes
.
png
=
true
;
this
.
binaryTypes
.
png
=
true
;
break
;
break
;
default
:
default
:
...
@@ -45,7 +56,7 @@ export default RepoBinaryViewer;
...
@@ -45,7 +56,7 @@ export default RepoBinaryViewer;
<
template
>
<
template
>
<div
id=
"binary-viewer"
v-if=
"binary"
>
<div
id=
"binary-viewer"
v-if=
"binary"
>
<img
v-
if=
"binaryTypes.png
"
:src=
"pngBlobWithDataURI"
:alt=
"activeFile.name"
/>
<img
v-
show=
"binaryTypes.png && binaryLoaded"
@
error=
"errored"
@
load=
"loaded
"
:src=
"pngBlobWithDataURI"
:alt=
"activeFile.name"
/>
<div
v-if=
"binaryTypes.markdown"
v-html=
"activeFile.html"
></div>
<div
v-if=
"binaryTypes.markdown"
v-html=
"activeFile.html"
></div>
</div>
</div>
</
template
>
</
template
>
app/assets/javascripts/repo/repo_store.js
View file @
a1adb794
...
@@ -24,6 +24,7 @@ const RepoStore = {
...
@@ -24,6 +24,7 @@ const RepoStore = {
tabsOverflow
:
41
,
tabsOverflow
:
41
,
tempPrivateToken
:
''
,
tempPrivateToken
:
''
,
submitCommitsLoading
:
false
,
submitCommitsLoading
:
false
,
binaryLoaded
:
false
,
activeFile
:
{
activeFile
:
{
active
:
true
,
active
:
true
,
binary
:
false
,
binary
:
false
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment