diff options
| author | Magnus Hagander | 2014-07-15 10:05:47 +0000 |
|---|---|---|
| committer | Magnus Hagander | 2014-07-15 10:05:47 +0000 |
| commit | e6fd075d049e1f66ccdb515dcc376d99027fc7fc (patch) | |
| tree | e5d0dd193a0bba320734718b59de60271c771552 /pgcommitfest/commitfest | |
| parent | 0eba14c4159a492edfa9e66fab0403440645154f (diff) | |
Clear the patch filter when hidden, if it contained anything
Diffstat (limited to 'pgcommitfest/commitfest')
| -rw-r--r-- | pgcommitfest/commitfest/static/commitfest/js/commitfest.js | 13 | ||||
| -rw-r--r-- | pgcommitfest/commitfest/templates/commitfest.html | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js b/pgcommitfest/commitfest/static/commitfest/js/commitfest.js index 579ad18..0ca6316 100644 --- a/pgcommitfest/commitfest/static/commitfest/js/commitfest.js +++ b/pgcommitfest/commitfest/static/commitfest/js/commitfest.js @@ -129,3 +129,16 @@ function toggleButtonCollapse(buttonId, collapseId) { $('#' + buttonId).button('toggle'); $('#' + collapseId).toggleClass('in') } + +function togglePatchFilterButton(buttonId, collapseId) { + /* Figure out if we are collapsing it */ + if ($('#' + collapseId).hasClass('in')) { + /* Go back to ourselves without a querystring to reset the form, unless it's already empty */ + if (document.location.href.indexOf('?') > -1) { + document.location.href = '.'; + return; + } + } + + toggleButtonCollapse(buttonId, collapseId); +} diff --git a/pgcommitfest/commitfest/templates/commitfest.html b/pgcommitfest/commitfest/templates/commitfest.html index b084962..4896e71 100644 --- a/pgcommitfest/commitfest/templates/commitfest.html +++ b/pgcommitfest/commitfest/templates/commitfest.html @@ -2,7 +2,7 @@ {%load commitfest %} {%block contents%} -<button type="button" class="btn btn-default{%if has_filter%} active{%endif%}" id="filterButton" onClick="toggleButtonCollapse('filterButton', 'collapseFilters')">Search/filter</button> +<button type="button" class="btn btn-default{%if has_filter%} active{%endif%}" id="filterButton" onClick="togglePatchFilterButton('filterButton', 'collapseFilters')">Search/filter</button> <div class="btn-group"> <a class="btn btn-default dropdown-toggle" data-toggle="dropdown" href="#">Shortcuts <span class="caret"></span></a> <ul class="dropdown-menu"> |