mirror of
https://github.com/wahyd4/gitlabhq.git
synced 2026-08-15 15:46:08 +10:00
Ryan Mendivil
0a05ab9126
When viewing the diff for a changed image file, two bugs occur: - Both the 'before' and 'after' images link to the 'after' commit - Visiting the link for either image will cause a error The first is caused by both image links referencing '@commit.id' rather than '@commit.parent_id'. The second is caused by the use of 'project_tree_path' which is used for creating links to directories in the git file tree. 'project_blob_path' which links to files should be used instead.
63 lines
2.1 KiB
Plaintext
63 lines
2.1 KiB
Plaintext
- if diff.renamed_file || diff.new_file || diff.deleted_file
|
|
.image
|
|
%span.wrap
|
|
.frame{class: image_diff_class(diff)}
|
|
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
|
|
%p.image-info= "#{number_to_human_size file.size}"
|
|
- else
|
|
.image
|
|
%div.two-up.view
|
|
%span.wrap
|
|
.frame.deleted
|
|
%a{href: project_blob_path(@project, tree_join(@commit.parent_id, diff.old_path))}
|
|
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
|
|
%p.image-info.hide
|
|
%span.meta-filesize= "#{number_to_human_size old_file.size}"
|
|
|
|
|
%b W:
|
|
%span.meta-width
|
|
|
|
|
%b H:
|
|
%span.meta-height
|
|
%span.wrap
|
|
.frame.added
|
|
%a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))}
|
|
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
|
|
%p.image-info.hide
|
|
%span.meta-filesize= "#{number_to_human_size file.size}"
|
|
|
|
|
%b W:
|
|
%span.meta-width
|
|
|
|
|
%b H:
|
|
%span.meta-height
|
|
|
|
%div.swipe.view.hide
|
|
.swipe-frame
|
|
.frame.deleted
|
|
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
|
|
.swipe-wrap
|
|
.frame.added
|
|
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
|
|
%span.swipe-bar
|
|
%span.top-handle
|
|
%span.bottom-handle
|
|
|
|
%div.onion-skin.view.hide
|
|
.onion-skin-frame
|
|
.frame.deleted
|
|
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
|
|
.frame.added
|
|
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
|
|
.controls
|
|
.transparent
|
|
.drag-track
|
|
.dragger{:style => "left: 0px;"}
|
|
.opaque
|
|
|
|
|
|
.view-modes.hide
|
|
%ul.view-modes-menu
|
|
%li.two-up{data: {mode: 'two-up'}} 2-up
|
|
%li.swipe{data: {mode: 'swipe'}} Swipe
|
|
%li.onion-skin{data: {mode: 'onion-skin'}} Onion skin |