Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tatuya Kamada
gitlab-ce
Commits
8e3a52cf
Commit
8e3a52cf
authored
Nov 14, 2016
by
Clement Ho
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix eslint
parent
e3395e3a
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
15 deletions
+17
-15
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
...avascripts/filtered_search/filtered_search_manager.js.es6
+17
-15
No files found.
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file @
8e3a52cf
...
@@ -13,7 +13,7 @@
...
@@ -13,7 +13,7 @@
conditions: [{
conditions: [{
keyword: 'none',
keyword: 'none',
url: 'assignee_id=0',
url: 'assignee_id=0',
}]
}]
,
}, {
}, {
key: 'milestone',
key: 'milestone',
type: 'string',
type: 'string',
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
}, {
}, {
keyword: 'upcoming',
keyword: 'upcoming',
url: 'milestone_title=%23upcoming',
url: 'milestone_title=%23upcoming',
}]
}]
,
}, {
}, {
key: 'label',
key: 'label',
type: 'array',
type: 'array',
...
@@ -34,7 +34,7 @@
...
@@ -34,7 +34,7 @@
conditions: [{
conditions: [{
keyword: 'none',
keyword: 'none',
url: 'label_name[]=No+Label',
url: 'label_name[]=No+Label',
}]
}]
,
}];
}];
function clearSearch(e) {
function clearSearch(e) {
...
@@ -48,11 +48,11 @@
...
@@ -48,11 +48,11 @@
function toggleClearSearchButton(e) {
function toggleClearSearchButton(e) {
const clearSearchButton = document.querySelector('.clear-search');
const clearSearchButton = document.querySelector('.clear-search');
if (e
vent
.target.value) {
if (e.target.value) {
clearSearchButton.classList.remove('hidden');
clearSearchButton.classList.remove('hidden');
} else {
} else {
clearSearchButton.classList.add('hidden');
clearSearchButton.classList.add('hidden');
}
}
}
}
function loadSearchParamsFromURL() {
function loadSearchParamsFromURL() {
...
@@ -68,12 +68,13 @@
...
@@ -68,12 +68,13 @@
// Check if it matches edge conditions listed in validTokenKeys
// Check if it matches edge conditions listed in validTokenKeys
let conditionIndex = 0;
let conditionIndex = 0;
const validCondition = validTokenKeys.filter(v => v.conditions && v.conditions.filter((c, index) => {
const validCondition = validTokenKeys
if (c.url === p) {
.filter(v => v.conditions && v.conditions.filter((c, index) => {
conditionIndex = index;
if (c.url === p) {
}
conditionIndex = index;
return c.url === p;
}
})[0])[0];
return c.url === p;
})[0])[0];
if (validCondition) {
if (validCondition) {
inputValue += `${validCondition.key}:${validCondition.conditions[conditionIndex].keyword}`;
inputValue += `${validCondition.key}:${validCondition.conditions[conditionIndex].keyword}`;
...
@@ -170,7 +171,8 @@
...
@@ -170,7 +171,8 @@
let tokenPath = '';
let tokenPath = '';
if (token.wildcard && match.conditions) {
if (token.wildcard && match.conditions) {
const condition = match.conditions.filter(c => c.keyword === token.value.toLowerCase())[0];
const condition = match.conditions
.filter(c => c.keyword === token.value.toLowerCase())[0];
if (condition) {
if (condition) {
tokenPath = `${condition.url}`;
tokenPath = `${condition.url}`;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment