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
4ee29e89
Commit
4ee29e89
authored
Jan 12, 2018
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed shortcuts not working on some pages
parent
b69d7ac3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
7 deletions
+5
-7
app/assets/javascripts/dispatcher.js
app/assets/javascripts/dispatcher.js
+1
-1
app/assets/javascripts/shortcuts.js
app/assets/javascripts/shortcuts.js
+2
-4
app/assets/javascripts/shortcuts_issuable.js
app/assets/javascripts/shortcuts_issuable.js
+2
-2
No files found.
app/assets/javascripts/dispatcher.js
View file @
4ee29e89
...
...
@@ -302,7 +302,7 @@ import Activities from './activities';
window
.
mergeRequest
=
new
MergeRequest
({
action
:
mrShowNode
.
dataset
.
mrAction
,
});
console
.
log
(
'
asd
'
);
shortcut_handler
=
new
ShortcutsIssuable
(
true
);
break
;
case
'
dashboard:activity
'
:
...
...
app/assets/javascripts/shortcuts.js
View file @
4ee29e89
...
...
@@ -13,12 +13,10 @@ Mousetrap.stopCallback = (e, element, combo) => {
};
export
default
class
Shortcuts
{
constructor
(
skipResetBindings
)
{
constructor
()
{
this
.
onToggleHelp
=
this
.
onToggleHelp
.
bind
(
this
);
this
.
enabledHelp
=
[];
if
(
!
skipResetBindings
)
{
Mousetrap
.
reset
();
}
Mousetrap
.
bind
(
'
?
'
,
this
.
onToggleHelp
);
Mousetrap
.
bind
(
'
s
'
,
Shortcuts
.
focusSearch
);
Mousetrap
.
bind
(
'
f
'
,
this
.
focusFilter
.
bind
(
this
));
...
...
app/assets/javascripts/shortcuts_issuable.js
View file @
4ee29e89
import
Mousetrap
from
'
mousetrap
'
;
import
_
from
'
underscore
'
;
import
Sidebar
from
'
./right_sidebar
'
;
import
Shortcuts
Navigation
from
'
./shortcuts_navigation
'
;
import
Shortcuts
from
'
./shortcuts
'
;
import
{
CopyAsGFM
}
from
'
./behaviors/copy_as_gfm
'
;
export
default
class
ShortcutsIssuable
extends
Shortcuts
Navigation
{
export
default
class
ShortcutsIssuable
extends
Shortcuts
{
constructor
(
isMergeRequest
)
{
super
();
...
...
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