Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Boxiang Sun
gitlab-ce
Commits
78db68ab
Commit
78db68ab
authored
Jun 30, 2017
by
Jacob Schatz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Show PNG's and setup nice framework for showing any binary fine.
parent
7869cbaa
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
126 additions
and
17 deletions
+126
-17
app/assets/javascripts/repo/repo_binary_viewer.js
app/assets/javascripts/repo/repo_binary_viewer.js
+33
-0
app/assets/javascripts/repo/repo_bundle.js
app/assets/javascripts/repo/repo_bundle.js
+2
-0
app/assets/javascripts/repo/repo_editor.js
app/assets/javascripts/repo/repo_editor.js
+9
-1
app/assets/javascripts/repo/repo_helper.js
app/assets/javascripts/repo/repo_helper.js
+40
-7
app/assets/javascripts/repo/repo_service.js
app/assets/javascripts/repo/repo_service.js
+8
-0
app/assets/javascripts/repo/repo_store.js
app/assets/javascripts/repo/repo_store.js
+6
-1
app/assets/stylesheets/pages/repo.scss
app/assets/stylesheets/pages/repo.scss
+10
-0
app/controllers/concerns/renders_blob.rb
app/controllers/concerns/renders_blob.rb
+16
-7
app/views/projects/tree/_tree_content.html.haml
app/views/projects/tree/_tree_content.html.haml
+2
-1
No files found.
app/assets/javascripts/repo/repo_binary_viewer.js
0 → 100644
View file @
78db68ab
import
Vue
from
'
vue
'
import
Store
from
'
./repo_store
'
export
default
class
RepoBinaryViewer
{
constructor
(
url
)
{
this
.
initVue
();
}
initVue
()
{
this
.
vue
=
new
Vue
({
el
:
'
#binary-viewer
'
,
data
:
()
=>
Store
,
computed
:
{
pngBlobWithDataURI
()
{
return
`data:image/png;base64,
${
this
.
blobRaw
}
`
;
}
},
watch
:
{
blobRaw
()
{
if
(
!
this
.
binary
)
return
;
switch
(
this
.
binaryMimeType
)
{
case
'
image/png
'
:
this
.
binaryTypes
.
png
=
true
;
break
;
}
}
}
});
}
}
\ No newline at end of file
app/assets/javascripts/repo/repo_bundle.js
View file @
78db68ab
import
Tabs
from
'
./repo_tabs
'
import
Tabs
from
'
./repo_tabs
'
import
Sidebar
from
'
./repo_sidebar
'
import
Sidebar
from
'
./repo_sidebar
'
import
Editor
from
'
./repo_editor
'
import
Editor
from
'
./repo_editor
'
import
BinaryViewer
from
'
./repo_binary_viewer
'
import
Service
from
'
./repo_service
'
import
Service
from
'
./repo_service
'
import
Store
from
'
./repo_store
'
import
Store
from
'
./repo_store
'
import
Helper
from
'
./repo_helper
'
import
Helper
from
'
./repo_helper
'
...
@@ -13,6 +14,7 @@ export default class RepoBundle {
...
@@ -13,6 +14,7 @@ export default class RepoBundle {
Store
.
tabs
=
new
Tabs
();
Store
.
tabs
=
new
Tabs
();
Store
.
sidebar
=
new
Sidebar
(
url
);
Store
.
sidebar
=
new
Sidebar
(
url
);
Store
.
editor
=
new
Editor
();
Store
.
editor
=
new
Editor
();
Store
.
binaryViewer
=
new
BinaryViewer
();
Helper
.
getContent
();
Helper
.
getContent
();
}
}
}
}
app/assets/javascripts/repo/repo_editor.js
View file @
78db68ab
...
@@ -20,6 +20,7 @@ export default class RepoEditor {
...
@@ -20,6 +20,7 @@ export default class RepoEditor {
)
)
Helper
.
monacoInstance
=
monaco
;
Helper
.
monacoInstance
=
monaco
;
this
.
initVue
();
this
.
initVue
();
monaco
.
languages
.
getLanguages
();
});
});
}
}
...
@@ -49,14 +50,21 @@ export default class RepoEditor {
...
@@ -49,14 +50,21 @@ export default class RepoEditor {
},
},
openedFiles
()
{
openedFiles
()
{
if
(
this
.
isTree
&&
!
this
.
openedFiles
.
length
)
{
if
(
(
this
.
isTree
&&
!
this
.
openedFiles
.
length
)
||
this
.
binary
)
{
self
.
el
.
style
.
display
=
'
none
'
;
self
.
el
.
style
.
display
=
'
none
'
;
}
else
{
}
else
{
console
.
log
(
'
inline-block
'
);
self
.
el
.
style
.
display
=
'
inline-block
'
;
self
.
el
.
style
.
display
=
'
inline-block
'
;
}
}
},
},
blobRaw
()
{
blobRaw
()
{
if
(
this
.
binary
)
{
self
.
el
.
style
.
display
=
'
none
'
;
}
else
{
console
.
log
(
'
inline-block2
'
);
self
.
el
.
style
.
display
=
'
inline-block
'
;
}
if
(
!
this
.
isTree
)
{
if
(
!
this
.
isTree
)
{
self
.
monacoEditor
.
setModel
(
self
.
monacoEditor
.
setModel
(
monaco
.
editor
.
createModel
(
monaco
.
editor
.
createModel
(
...
...
app/assets/javascripts/repo/repo_helper.js
View file @
78db68ab
...
@@ -69,8 +69,14 @@ let RepoHelper = {
...
@@ -69,8 +69,14 @@ let RepoHelper = {
}
}
return
openedFile
;
return
openedFile
;
});
});
Store
.
blobRaw
=
file
.
plain
;
if
(
file
.
binary
)
{
Store
.
blobRaw
=
file
.
base64
;
console
.
log
(
'
binary
'
,
file
)
}
else
{
Store
.
blobRaw
=
file
.
plain
;
}
this
.
toURL
(
file
.
url
);
this
.
toURL
(
file
.
url
);
Store
.
binary
=
file
.
binary
;
},
},
removeFromOpenedFiles
(
file
)
{
removeFromOpenedFiles
(
file
)
{
...
@@ -96,6 +102,19 @@ let RepoHelper = {
...
@@ -96,6 +102,19 @@ let RepoHelper = {
}
}
},
},
getRawURLFromBlobURL
(
url
)
{
return
url
.
replace
(
'
blob
'
,
'
raw
'
);
},
setBinaryDataAsBase64
(
url
,
file
)
{
Service
.
getBase64Content
(
url
)
.
then
((
response
)
=>
{
Store
.
blobRaw
=
response
;
file
.
base64
=
response
console
.
log
(
'
file
'
,
file
);
});
},
// may be tree or file.
// may be tree or file.
getContent
(
file
)
{
getContent
(
file
)
{
Service
.
getContent
()
Service
.
getContent
()
...
@@ -104,12 +123,26 @@ let RepoHelper = {
...
@@ -104,12 +123,26 @@ let RepoHelper = {
Store
.
isTree
=
this
.
isTree
(
data
);
Store
.
isTree
=
this
.
isTree
(
data
);
if
(
!
Store
.
isTree
)
{
if
(
!
Store
.
isTree
)
{
// it's a blob
// it's a blob
const
parentURL
=
this
.
blobURLtoParent
(
Service
.
url
);
Store
.
binary
=
data
.
binary
;
Store
.
blobRaw
=
data
.
plain
;
if
(
data
.
binary
)
{
Store
.
prevURL
=
this
.
blobURLtoParent
(
parentURL
);
Store
.
binaryMimeType
=
data
.
mime_type
;
data
.
url
=
file
.
url
;
this
.
setBinaryDataAsBase64
(
this
.
addToOpenedFiles
(
data
);
this
.
getRawURLFromBlobURL
(
file
.
url
),
this
.
setActiveFile
(
data
);
data
);
data
.
binary
=
true
;
data
.
url
=
file
.
url
;
this
.
addToOpenedFiles
(
data
);
this
.
setActiveFile
(
data
);
}
else
{
const
parentURL
=
this
.
blobURLtoParent
(
Service
.
url
);
Store
.
blobRaw
=
data
.
plain
;
Store
.
prevURL
=
this
.
blobURLtoParent
(
parentURL
);
data
.
url
=
file
.
url
;
data
.
binary
=
false
;
this
.
addToOpenedFiles
(
data
);
this
.
setActiveFile
(
data
);
}
}
else
{
}
else
{
// it's a tree
// it's a tree
this
.
setDirectoryOpen
(
file
);
this
.
setDirectoryOpen
(
file
);
...
...
app/assets/javascripts/repo/repo_service.js
View file @
78db68ab
...
@@ -17,6 +17,14 @@ let RepoService = {
...
@@ -17,6 +17,14 @@ let RepoService = {
return
axios
.
get
(
url
,
this
.
params
);
return
axios
.
get
(
url
,
this
.
params
);
}
}
return
axios
.
get
(
this
.
url
,
this
.
params
);
return
axios
.
get
(
this
.
url
,
this
.
params
);
},
getBase64Content
(
url
)
{
return
axios
.
get
(
url
,
{
responseType
:
'
arraybuffer
'
})
.
then
(
response
=>
new
Buffer
(
response
.
data
,
'
binary
'
).
toString
(
'
base64
'
))
}
}
};
};
...
...
app/assets/javascripts/repo/repo_store.js
View file @
78db68ab
...
@@ -11,6 +11,11 @@ let RepoStore = {
...
@@ -11,6 +11,11 @@ let RepoStore = {
blobRendered
:
''
,
blobRendered
:
''
,
openedFiles
:
[],
openedFiles
:
[],
activeFile
:
''
,
activeFile
:
''
,
files
:
[]
files
:
[],
binary
:
false
,
binaryMimeType
:
''
,
binaryTypes
:
{
png
:
false
}
};
};
export
default
RepoStore
;
export
default
RepoStore
;
app/assets/stylesheets/pages/repo.scss
View file @
78db68ab
...
@@ -35,6 +35,10 @@ header {
...
@@ -35,6 +35,10 @@ header {
padding-left
:
0
;
padding-left
:
0
;
margin-bottom
:
0
;
margin-bottom
:
0
;
background
:
$gray-light
;
background
:
$gray-light
;
display
:
inline-block
;
white-space
:
nowrap
;
width
:
100%
;
overflow
:
scroll
;
li
{
li
{
list-style-type
:
none
;
list-style-type
:
none
;
...
@@ -42,6 +46,7 @@ header {
...
@@ -42,6 +46,7 @@ header {
display
:
inline-block
;
display
:
inline-block
;
padding
:
10px
18px
;
padding
:
10px
18px
;
border-right
:
1px
solid
$border-color
;
border-right
:
1px
solid
$border-color
;
white-space
:
nowrap
;
&
.active
{
&
.active
{
background
:
$white-light
;
background
:
$white-light
;
...
@@ -63,6 +68,11 @@ header {
...
@@ -63,6 +68,11 @@ header {
}
}
}
}
#binary-viewer
{
img
{
max-width
:
100%
;
}
}
#sidebar
{
#sidebar
{
&
.sidebar-mini
{
&
.sidebar-mini
{
...
...
app/controllers/concerns/renders_blob.rb
View file @
78db68ab
...
@@ -13,13 +13,22 @@ module RendersBlob
...
@@ -13,13 +13,22 @@ module RendersBlob
end
end
return
render_404
unless
viewer
return
render_404
unless
viewer
puts
blob
puts
blob
render
json:
{
if
blob
.
binary?
html:
view_to_html_string
(
"projects/blob/_viewer"
,
viewer:
viewer
,
load_async:
false
),
render
json:
{
plain:
blob
.
data
,
binary:
true
,
name:
blob
.
name
,
mime_type:
blob
.
mime_type
,
size:
blob
.
size
,
name:
blob
.
name
,
mime_type:
blob
.
mime_type
size:
blob
.
size
}
}
else
render
json:
{
html:
view_to_html_string
(
"projects/blob/_viewer"
,
viewer:
viewer
,
load_async:
false
),
plain:
blob
.
data
,
name:
blob
.
name
,
size:
blob
.
size
,
mime_type:
blob
.
mime_type
}
end
end
end
def
conditionally_expand_blob
(
blob
)
def
conditionally_expand_blob
(
blob
)
...
...
app/views/projects/tree/_tree_content.html.haml
View file @
78db68ab
...
@@ -16,7 +16,8 @@
...
@@ -16,7 +16,8 @@
%ul
#tabs
{
"v-if"
=>
"isMini"
}
%ul
#tabs
{
"v-if"
=>
"isMini"
}
%li
{
is:
"repo-tab"
,
"v-for"
=>
"tab in openedFiles"
,
":key"
=>
"tab.id"
,
":tab"
=>
"tab"
,
":class"
=>
"{'active' : tab.active}"
}
%li
{
is:
"repo-tab"
,
"v-for"
=>
"tab in openedFiles"
,
":key"
=>
"tab.id"
,
":tab"
=>
"tab"
,
":class"
=>
"{'active' : tab.active}"
}
#ide
{
data:
{
url:
repo_url
}
}
#ide
{
data:
{
url:
repo_url
}
}
#binary-viewer
{
"v-if"
=>
"binary"
}
%img
{
"v-if"
=>
"binaryTypes.png"
,
":src"
=>
"pngBlobWithDataURI"
}
-
if
can_edit_tree?
-
if
can_edit_tree?
=
render
'projects/blob/upload'
,
title:
_
(
'Upload New File'
),
placeholder:
_
(
'Upload New File'
),
button_title:
_
(
'Upload file'
),
form_path:
namespace_project_create_blob_path
(
@project
.
namespace
,
@project
,
@id
),
method: :post
=
render
'projects/blob/upload'
,
title:
_
(
'Upload New File'
),
placeholder:
_
(
'Upload New File'
),
button_title:
_
(
'Upload file'
),
form_path:
namespace_project_create_blob_path
(
@project
.
namespace
,
@project
,
@id
),
method: :post
=
render
'projects/blob/new_dir'
=
render
'projects/blob/new_dir'
...
...
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