Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
24a9983d
G
gitlab-foss
项目概览
李少辉-开发者
/
gitlab-foss
通知
15
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
G
gitlab-foss
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
24a9983d
编写于
12月 11, 2017
作者:
C
Clement Ho
提交者:
Filipa Lacerda
12月 11, 2017
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Fix image view mode
上级
cb63a754
变更
2
隐藏空白更改
内联
并排
Showing
2 changed file
with
14 addition
and
2 deletion
+14
-2
app/assets/javascripts/commit/image_file.js
app/assets/javascripts/commit/image_file.js
+2
-2
spec/features/merge_requests/image_diff_notes.rb
spec/features/merge_requests/image_diff_notes.rb
+12
-0
未找到文件。
app/assets/javascripts/commit/image_file.js
浏览文件 @
24a9983d
...
...
@@ -121,7 +121,7 @@ export default class ImageFile {
return
$
(
'
.swipe.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
$swipeWrap
,
$swipeBar
,
$swipeFrame
,
wrapPadding
,
ref
;
ref
=
this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
ref
=
_
this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$swipeFrame
=
$
(
'
.swipe-frame
'
,
view
);
$swipeWrap
=
$
(
'
.swipe-wrap
'
,
view
);
$swipeBar
=
$
(
'
.swipe-bar
'
,
view
);
...
...
@@ -158,7 +158,7 @@ export default class ImageFile {
return
$
(
'
.onion-skin.view
'
,
this
.
file
).
each
((
function
(
_this
)
{
return
function
(
index
,
view
)
{
var
$frame
,
$track
,
$dragger
,
$frameAdded
,
framePadding
,
ref
,
dragging
=
false
;
ref
=
this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
ref
=
_
this
.
prepareFrames
(
view
),
maxWidth
=
ref
[
0
],
maxHeight
=
ref
[
1
];
$frame
=
$
(
'
.onion-skin-frame
'
,
view
);
$frameAdded
=
$
(
'
.frame.added
'
,
view
);
$track
=
$
(
'
.drag-track
'
,
view
);
...
...
spec/features/merge_requests/image_diff_notes.rb
浏览文件 @
24a9983d
...
...
@@ -185,6 +185,18 @@ feature 'image diff notes', :js do
expect
(
page
).
to
have_content
(
diff_note
.
note
)
end
end
describe
'image view modes'
do
before
do
visit
project_commit_path
(
project
,
'2f63565e7aac07bcdadb654e253078b727143ec4'
)
end
it
'resizes image in onion skin view mode'
do
find
(
'.view-modes-menu .onion-skin'
).
click
expect
(
find
(
'.onion-skin-frame'
)[
'style'
]).
to
match
(
'width: 228px; height: 240px;'
)
end
end
end
def
create_image_diff_note
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录