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
Jérome Perrin
gitlab-ce
Commits
e7314e4c
Commit
e7314e4c
authored
Dec 27, 2015
by
Robert Speicher
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix the "Show all" link for the keyboard shortcut modal
parent
a97a2d27
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
12 deletions
+8
-12
app/assets/javascripts/dispatcher.js.coffee
app/assets/javascripts/dispatcher.js.coffee
+1
-1
app/assets/javascripts/shortcuts.js.coffee
app/assets/javascripts/shortcuts.js.coffee
+7
-3
app/views/help/_shortcuts.html.haml
app/views/help/_shortcuts.html.haml
+0
-8
No files found.
app/assets/javascripts/dispatcher.js.coffee
View file @
e7314e4c
...
...
@@ -49,7 +49,7 @@ class Dispatcher
new
DropzoneInput
(
$
(
'.release-form'
))
when
'projects:merge_requests:show'
new
Diff
()
shortcut_handler
=
new
ShortcutsIssuable
()
shortcut_handler
=
new
ShortcutsIssuable
(
true
)
new
ZenMode
()
when
"projects:merge_requests:diffs"
new
Diff
()
...
...
app/assets/javascripts/shortcuts.js.coffee
View file @
e7314e4c
...
...
@@ -7,7 +7,7 @@ class @Shortcuts
selectiveHelp
:
(
e
)
=>
Shortcuts
.
showHelp
(
e
,
@
enabledHelp
)
@
showHelp
:
(
e
,
location
)
->
if
$
(
'#modal-shortcuts'
).
length
>
0
$
(
'#modal-shortcuts'
).
modal
(
'show'
)
...
...
@@ -17,8 +17,7 @@ class @Shortcuts
dataType
:
'script'
,
success
:
(
e
)
->
if
location
and
location
.
length
>
0
for
l
in
location
$
(
l
).
show
()
$
(
l
).
show
()
for
l
in
location
else
$
(
'.hidden-shortcut'
).
show
()
$
(
'.js-more-help-button'
).
remove
()
...
...
@@ -28,3 +27,8 @@ class @Shortcuts
@
focusSearch
:
(
e
)
->
$
(
'#search'
).
focus
()
e
.
preventDefault
()
$
(
document
).
on
'click.more_help'
,
'.js-more-help-button'
,
(
e
)
->
$
(
@
).
remove
()
$
(
'.hidden-shortcut'
).
show
()
e
.
preventDefault
()
app/views/help/_shortcuts.html.haml
View file @
e7314e4c
...
...
@@ -219,11 +219,3 @@
%td
.shortcut
.key
r
%td
Reply (quoting selected text)
:javascript
$
(
'
.js-more-help-button
'
).
click
(
function
(
e
)
{
$
(
this
).
remove
()
l
$
(
'
.hidden-shortcut
'
).
show
();
e
.
preventDefault
();
});
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