diff options
| author | Alex Denisov <1101.debian@gmail.com> | 2013-01-09 21:02:41 +0000 |
|---|---|---|
| committer | Alex Denisov <1101.debian@gmail.com> | 2013-01-09 21:02:41 +0000 |
| commit | d7bc1214748564604eb544c56dabb0b551737ae6 (patch) | |
| tree | 381c171bfb4dbf7a85b01ad8a264e5bed647747e | |
| parent | 5133fe8efb0f58f3a8fe0fe8e5474fa7db98cac1 (diff) | |
| download | gitlab-ce-d7bc1214748564604eb544c56dabb0b551737ae6.tar.gz | |
replace javascript:void with preventDefault
| -rw-r--r-- | app/assets/javascripts/dashboard.js.coffee | 3 | ||||
| -rw-r--r-- | app/helpers/events_helper.rb | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/app/assets/javascripts/dashboard.js.coffee b/app/assets/javascripts/dashboard.js.coffee index 0f52793f053..b0ae6bf8a02 100644 --- a/app/assets/javascripts/dashboard.js.coffee +++ b/app/assets/javascripts/dashboard.js.coffee @@ -3,7 +3,8 @@ $ -> dashboardPage = -> Pager.init 20, true - $(".event_filter_link").bind "click", -> + $(".event_filter_link").bind "click", (event) -> + event.preventDefault() toggleFilter $(this) reloadActivities() diff --git a/app/helpers/events_helper.rb b/app/helpers/events_helper.rb index 771a6364bbd..9b9d2a913e9 100644 --- a/app/helpers/events_helper.rb +++ b/app/helpers/events_helper.rb @@ -29,7 +29,7 @@ module EventsHelper end content_tag :div, class: "filter_icon #{inactive}" do - link_to 'javascript:void(0)', class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do + link_to dashboard_path, class: 'has_tooltip event_filter_link', id: "#{key}_event_filter", 'data-original-title' => tooltip do image_tag "event_filter_#{key}.png" end end |