diff options
| author | Phil Hughes <me@iamphill.com> | 2016-02-23 13:29:36 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-02-24 08:28:33 +0000 |
| commit | 30b56fb017f29b2f49335ba4791debc063bb7607 (patch) | |
| tree | 11352f91d5bf9e82c32fe5091c334faad1022b90 | |
| parent | bd71438d6accb61a33b520177aeb92a3614eedb5 (diff) | |
| download | gitlab-ce-30b56fb017f29b2f49335ba4791debc063bb7607.tar.gz | |
Treats activity tabs as single select
Fixes #8092
| -rw-r--r-- | app/assets/javascripts/activities.js.coffee | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/app/assets/javascripts/activities.js.coffee b/app/assets/javascripts/activities.js.coffee index 3b6b453ac51..0f51926cbdc 100644 --- a/app/assets/javascripts/activities.js.coffee +++ b/app/assets/javascripts/activities.js.coffee @@ -1,7 +1,7 @@ class @Activities constructor: -> Pager.init 20, true - $(".event-filter a").bind "click", (event) => + $(".event-filter-link").bind "click", (event) => event.preventDefault() @toggleFilter($(event.currentTarget)) @reloadActivities() @@ -12,18 +12,10 @@ class @Activities toggleFilter: (sender) -> - sender.closest('li').toggleClass "active" + $('.event-filter .active').removeClass "active" event_filters = $.cookie("event_filter") filter = sender.attr("id").split("_")[0] - if event_filters - event_filters = event_filters.split(",") - else - event_filters = new Array() + $.cookie "event_filter", (if event_filters isnt filter then filter else ""), { path: '/' } - index = event_filters.indexOf(filter) - if index is -1 - event_filters.push filter - else - event_filters.splice index, 1 - - $.cookie "event_filter", event_filters.join(","), { path: '/' } + if event_filters isnt filter + sender.closest('li').toggleClass "active" |