summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-06-06 09:58:59 -0500
committerClement Ho <ClemMakesApps@gmail.com>2017-06-06 09:58:59 -0500
commit8229b545f9914214701bfb151395c23a3aa44c2f (patch)
treea3cf49935c5acf151f0be3e9d8892b9694833d87 /app
parent75e0ec0fa6798de220ddeb207a8754d97d9da660 (diff)
downloadgitlab-ce-8229b545f9914214701bfb151395c23a3aa44c2f.tar.gz
Refactor to use class name to determine state
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/filtered_search/filtered_search_manager.js65
1 files changed, 34 insertions, 31 deletions
diff --git a/app/assets/javascripts/filtered_search/filtered_search_manager.js b/app/assets/javascripts/filtered_search/filtered_search_manager.js
index fbb1a08089f..c6118bc1282 100644
--- a/app/assets/javascripts/filtered_search/filtered_search_manager.js
+++ b/app/assets/javascripts/filtered_search/filtered_search_manager.js
@@ -78,42 +78,36 @@ class FilteredSearchManager {
}
bindStateEvents() {
- const stateFilters = document.querySelector('.container-fluid .issues-state-filters');
-
- if (stateFilters) {
- this.searchStateOpened = this.search.bind(this, 'opened');
- this.searchStateMerged = this.search.bind(this, 'merged');
- this.searchStateClosed = this.search.bind(this, 'closed');
- this.searchStateAll = this.search.bind(this, 'all');
-
- stateFilters.querySelector('.state-opened')
- .addEventListener('click', this.searchStateOpened);
- stateFilters.querySelector('.state-closed')
- .addEventListener('click', this.searchStateClosed);
- stateFilters.querySelector('.state-all')
- .addEventListener('click', this.searchStateAll);
-
- const mergedState = stateFilters.querySelector('.state-merged');
- if (mergedState) {
- mergedState.addEventListener('click', this.searchStateMerged);
+ this.stateFilters = document.querySelector('.container-fluid .issues-state-filters');
+
+ if (this.stateFilters) {
+ this.searchStateWrapper = this.searchState.bind(this);
+
+ this.stateFilters.querySelector('.state-opened')
+ .addEventListener('click', this.searchStateWrapper);
+ this.stateFilters.querySelector('.state-closed')
+ .addEventListener('click', this.searchStateWrapper);
+ this.stateFilters.querySelector('.state-all')
+ .addEventListener('click', this.searchStateWrapper);
+
+ this.mergedState = this.stateFilters.querySelector('.state-merged');
+ if (this.mergedState) {
+ this.mergedState.addEventListener('click', this.searchStateWrapper);
}
}
}
unbindStateEvents() {
- const stateFilters = document.querySelector('.container-fluid .issues-state-filters');
-
- if (stateFilters) {
- stateFilters.querySelector('.state-opened')
- .removeEventListener('click', this.searchStateOpened);
- stateFilters.querySelector('.state-closed')
- .removeEventListener('click', this.searchStateClosed);
- stateFilters.querySelector('.state-all')
- .removeEventListener('click', this.searchStateAll);
-
- const mergedState = stateFilters.querySelector('.state-merged');
- if (mergedState) {
- mergedState.removeEventListener('click', this.searchStateMerged);
+ if (this.stateFilters) {
+ this.stateFilters.querySelector('.state-opened')
+ .removeEventListener('click', this.searchStateWrapper);
+ this.stateFilters.querySelector('.state-closed')
+ .removeEventListener('click', this.searchStateWrapper);
+ this.stateFilters.querySelector('.state-all')
+ .removeEventListener('click', this.searchStateWrapper);
+
+ if (this.mergedState) {
+ this.mergedState.removeEventListener('click', this.searchStateWrapper);
}
}
}
@@ -504,6 +498,15 @@ class FilteredSearchManager {
}
}
+ searchState(e) {
+ const target = e.currentTarget;
+ // return class name that has a prefix of `state-`
+ const stateClassName = [].find.call(target.classList, name => name.match(/(state-)(\w+)/g));
+ const state = stateClassName.replace('state-', '');
+
+ this.search(state);
+ }
+
search(state = null) {
const paths = [];
const searchQuery = gl.DropdownUtils.getSearchQuery();