diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 01:17:35 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-03-26 01:17:35 +0000 |
| commit | 12430b65d44f93bb77979d7bb546814c637fd5c6 (patch) | |
| tree | 140d09083ef1969b26195d308fb13586f4f55af7 /app | |
| parent | d41b2085fee554b08992bbd5783c07a8350540a2 (diff) | |
| parent | eecd897170c7f6428ba500610f368a1f3bdcbb8f (diff) | |
| download | gitlab-ce-12430b65d44f93bb77979d7bb546814c637fd5c6.tar.gz | |
Merge branch 'fix-compare-diff-unfold' into 'master'
Fix code unfold not working on Compare commits page
### What does this MR do?
The code unfold buttons (`...`) don't work when you go to Commits -> Compare mode. This MR fixes that.
### Are there points in the code the reviewer needs to double check?
Check to make sure all the right initializers are run in the `projects:compare:xxx` case. I'm also not sure if there are other cases where a diff is shown but the code unfolding is not activated.
### What are the relevant issue numbers / [Feature requests](http://feedback.gitlab.com/)?
Closes #1274
See merge request !434
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/dispatcher.js.coffee | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/app/assets/javascripts/dispatcher.js.coffee b/app/assets/javascripts/dispatcher.js.coffee index deabaf8a784..3535d8c2cfc 100644 --- a/app/assets/javascripts/dispatcher.js.coffee +++ b/app/assets/javascripts/dispatcher.js.coffee @@ -28,6 +28,8 @@ class Dispatcher new Milestone() when 'projects:milestones:new', 'projects:milestones:edit' new ZenMode() + when 'projects:compare:show' + new Diff() when 'projects:issues:new','projects:issues:edit' GitLab.GfmAutoComplete.setup() shortcut_handler = new ShortcutsNavigation() @@ -115,6 +117,8 @@ class Dispatcher new Project() new ProjectAvatar() switch path[1] + when 'compare' + shortcut_handler = new ShortcutsNavigation() when 'edit' shortcut_handler = new ShortcutsNavigation() new ProjectNew() |