kotovalexarian-likes-gitlab/gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Convert string concatenations with an array join

Browse source
This commit is contained in:
Clement Ho 2016-12-12 16:42:00 -06:00
parent 78fe37b169
commit e9886b5704
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/assets/javascripts/filtered_search/filtered_search_manager.js.es6
View file

@ -83,7 +83,7 @@
// We can trust that each param has one & since values containing & will be encoded // We can trust that each param has one & since values containing & will be encoded
// Remove the first character of search as it is always ? // Remove the first character of search as it is always ?
const params = window.location.search.slice(1).split('&'); const params = window.location.search.slice(1).split('&');
let inputValue = ''; let inputValues = [];
params.forEach((p) => { params.forEach((p) => {
const split = p.split('='); const split = p.split('=');
@ -103,8 +103,7 @@
if (validCondition) { if (validCondition) {
// Parse params based on rules provided in the conditions key of gl.FilteredSearchTokenKeys.get() // Parse params based on rules provided in the conditions key of gl.FilteredSearchTokenKeys.get()
inputValue += `${validCondition.key}:${validCondition.conditions[conditionIndex].keyword}`; inputValues.push(`${validCondition.key}:${validCondition.conditions[conditionIndex].keyword}`);
inputValue += ' ';
} else { } else {
// Sanitize value since URL converts spaces into + // Sanitize value since URL converts spaces into +
// Replace before decode so that we know what was originally + versus the encoded + // Replace before decode so that we know what was originally + versus the encoded +
@ -122,25 +121,23 @@
quotationsToUse = sanitizedValue.indexOf('"') === -1 ? '"' : '\''; quotationsToUse = sanitizedValue.indexOf('"') === -1 ? '"' : '\'';
} }
inputValue += valueHasSpace ? `${sanitizedKey}:${symbol}${quotationsToUse}${sanitizedValue}${quotationsToUse}` : `${sanitizedKey}:${symbol}${sanitizedValue}`; inputValues.push(valueHasSpace ? `${sanitizedKey}:${symbol}${quotationsToUse}${sanitizedValue}${quotationsToUse}` : `${sanitizedKey}:${symbol}${sanitizedValue}`);
inputValue += ' ';
} else if (!match && key === 'search') { } else if (!match && key === 'search') {
inputValue += sanitizedValue; inputValues.push(sanitizedValue);
inputValue += ' ';
} }
} }
}); });
// Trim the last space value // Trim the last space value
this.filteredSearchInput.value = inputValue.trim(); this.filteredSearchInput.value = inputValues.join(' ');
if (inputValue.trim()) { if (inputValues.length > 0) {
this.clearSearchButton.classList.remove('hidden'); this.clearSearchButton.classList.remove('hidden');
} }
} }
search() { search() {
let path = '?scope=all&utf8=✓'; let paths = [];
// Check current state // Check current state
const currentPath = window.location.search; const currentPath = window.location.search;
@ -158,7 +155,7 @@
currentState = separatorIndex === -1 ? remaining : remaining.slice(0, separatorIndex); currentState = separatorIndex === -1 ? remaining : remaining.slice(0, separatorIndex);
} }
path += `&state=${currentState}`; paths.push(`state=${currentState}`);
tokens.forEach((token) => { tokens.forEach((token) => {
const match = gl.FilteredSearchTokenKeys.get().filter(t => t.key === token.key)[0]; const match = gl.FilteredSearchTokenKeys.get().filter(t => t.key === token.key)[0];
let tokenPath = ''; let tokenPath = '';
@ -177,14 +174,14 @@
tokenPath = `${token.key}_${match.param}=${encodeURIComponent(token.value)}`; tokenPath = `${token.key}_${match.param}=${encodeURIComponent(token.value)}`;
} }
path += `&${tokenPath}`; paths.push(tokenPath);
}); });
if (searchToken) { if (searchToken) {
path += `&search=${encodeURIComponent(searchToken)}`; paths.push(`search=${encodeURIComponent(searchToken)}`);
} }
window.location = path; window.location = `?scope=all&utf8=✓&${paths.join('&')}`;
} }
} }