Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
李少辉-开发者
gitlab-foss
提交
c9f11db2
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,发现更多精彩内容 >>
提交
c9f11db2
编写于
4月 20, 2016
作者:
A
Alfredo Sumaran
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
Make shortcuts work when sidebar is collapsed
上级
a4592434
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
54 addition
and
35 deletion
+54
-35
app/assets/javascripts/right_sidebar.js.coffee
app/assets/javascripts/right_sidebar.js.coffee
+46
-18
app/assets/javascripts/shortcuts_issuable.coffee
app/assets/javascripts/shortcuts_issuable.coffee
+7
-16
app/views/shared/issuable/_sidebar.html.haml
app/views/shared/issuable/_sidebar.html.haml
+1
-1
未找到文件。
app/assets/javascripts/right_sidebar.js.coffee
浏览文件 @
c9f11db2
class
@
Sidebar
constructor
:
(
currentUser
)
->
@
sidebar
=
$
(
'aside'
)
@
addEventListeners
()
addEventListeners
:
->
$
(
'aside'
).
on
(
'click'
,
'.sidebar-collapsed-icon'
,
@
sidebarCollapseClicked
)
$
(
'.dropdown'
).
on
(
'hidden.gl.dropdown'
,
@
sidebarDropdownHidden
)
_this
=
@
@
sidebar
.
on
'click'
,
'.sidebar-collapsed-icon'
,
(
e
)
->
e
.
preventDefault
()
$block
=
$
(
@
).
closest
(
'.block'
)
_this
.
openDropdown
(
$block
);
$
(
'.dropdown'
).
on
'hidden.gl.dropdown'
,
(
e
)
->
e
.
preventDefault
()
$block
=
$
(
@
).
closest
(
'.block'
)
_this
.
sidebarDropdownHidden
(
$block
)
$
(
'.dropdown'
).
on
(
'loading.gl.dropdown'
,
@
sidebarDropdownLoading
)
$
(
'.dropdown'
).
on
(
'loaded.gl.dropdown'
,
@
sidebarDropdownLoaded
)
...
...
@@ -30,26 +40,44 @@ class @Sidebar
else
i
.
show
()
openDropdown
:
(
blockOrName
)
->
$block
=
if
_
.
isString
(
blockOrName
)
then
@
getBlock
(
blockOrName
)
else
blockOrName
sidebarCollapseClicked
:
(
e
)
->
e
.
preventDefault
()
$block
=
$
(
@
).
closest
(
'.block'
)
$block
.
find
(
'.edit-link'
).
trigger
(
'click'
)
$
(
'aside'
)
.
find
(
'.gutter-toggle'
)
.
trigger
(
'click'
)
$editLink
=
$block
.
find
(
'.edit-link'
)
if
not
@
isOpen
()
@
setCollapseAfterUpdate
(
$block
)
@
toggleSidebar
(
'open'
)
if
$editLink
.
length
$editLink
.
trigger
(
'click'
)
$block
.
addClass
(
'collapse-after-update'
)
$
(
'.page-with-sidebar'
).
addClass
(
'with-overlay'
)
setCollapseAfterUpdate
:
(
$block
)
->
$block
.
addClass
(
'collapse-after-update'
)
$
(
'.page-with-sidebar'
).
addClass
(
'with-overlay'
)
sidebarDropdownHidden
:
(
e
)
->
$block
=
$
(
@
).
closest
(
'.block'
)
sidebarDropdownHidden
:
(
$block
)
->
if
$block
.
hasClass
(
'collapse-after-update'
)
$block
.
removeClass
(
'collapse-after-update'
)
$
(
'.page-with-sidebar'
).
removeClass
(
'with-overlay'
)
$
(
'aside'
)
.
find
(
'.gutter-toggle'
)
.
trigger
(
'click'
)
\ No newline at end of file
@
toggleSidebar
(
'hide'
)
triggerOpenSidebar
:
->
@
sidebar
.
find
(
'.js-sidebar-toggle'
)
.
trigger
(
'click'
)
toggleSidebar
:
(
action
=
'toggle'
)
->
if
action
is
'toggle'
@
triggerOpenSidebar
()
if
action
is
'open'
@
triggerOpenSidebar
()
if
not
@
isOpen
()
if
action
is
'hide'
@
triggerOpenSidebar
()
is
@
isOpen
()
isOpen
:
->
@
sidebar
.
is
(
'.right-sidebar-expanded'
)
getBlock
:
(
name
)
->
@
sidebar
.
find
(
".block.
#{
name
}
"
)
app/assets/javascripts/shortcuts_issuable.coffee
浏览文件 @
c9f11db2
...
...
@@ -4,18 +4,8 @@
class
@
ShortcutsIssuable
extends
ShortcutsNavigation
constructor
:
(
isMergeRequest
)
->
super
()
Mousetrap
.
bind
(
'a'
,
->
$
(
'.block.assignee .edit-link'
).
trigger
(
'click'
)
return
false
)
Mousetrap
.
bind
(
'm'
,
->
$
(
'.block.milestone .edit-link'
).
trigger
(
'click'
)
return
false
)
Mousetrap
.
bind
(
'r'
,
=>
@
replyWithSelectedText
()
return
false
)
Mousetrap
.
bind
(
'a'
,
@
openSidebarDropdown
.
bind
(
@
,
'assignee'
))
Mousetrap
.
bind
(
'm'
,
@
openSidebarDropdown
.
bind
(
@
,
'milestone'
))
Mousetrap
.
bind
(
'j'
,
=>
@
prevIssue
()
return
false
...
...
@@ -28,10 +18,7 @@ class @ShortcutsIssuable extends ShortcutsNavigation
@
editIssue
()
return
false
)
Mousetrap
.
bind
(
'l'
,
=>
$
(
'.block.labels .edit-link'
).
trigger
(
'click'
)
return
false
)
Mousetrap
.
bind
(
'l'
,
@
openSidebarDropdown
.
bind
(
@
,
'labels'
))
if
isMergeRequest
@
enabledHelp
.
push
(
'.hidden-shortcut.merge_requests'
)
...
...
@@ -74,3 +61,7 @@ class @ShortcutsIssuable extends ShortcutsNavigation
editIssue
:
->
$editBtn
=
$
(
'.issuable-edit'
)
Turbolinks
.
visit
(
$editBtn
.
attr
(
'href'
))
openSidebarDropdown
:
(
name
)
->
sidebar
.
openDropdown
(
name
)
return
false
app/views/shared/issuable/_sidebar.html.haml
浏览文件 @
c9f11db2
...
...
@@ -153,4 +153,4 @@
new
LabelsSelect
();
new
IssuableContext
(
'
#{
escape_javascript
(
current_user
.
to_json
(
only:
[
:username
,
:id
,
:name
]))
}
'
);
new
Subscription
(
'
.subscription
'
)
new
Sidebar
();
sidebar
=
new
Sidebar
();
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录