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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
317ef7b5
Commit
317ef7b5
authored
Jan 20, 2017
by
Phil Hughes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed failing JS specs
parent
8198d498
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
7 deletions
+17
-7
app/assets/javascripts/filtered_search/dropdown_utils.js.es6
app/assets/javascripts/filtered_search/dropdown_utils.js.es6
+1
-2
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
...s/filtered_search/filtered_search_dropdown_manager.js.es6
+0
-1
spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
+16
-4
No files found.
app/assets/javascripts/filtered_search/dropdown_utils.js.es6
View file @
317ef7b5
...
@@ -76,7 +76,6 @@
...
@@ -76,7 +76,6 @@
}
}
static getSearchInput(filteredSearchInput) {
static getSearchInput(filteredSearchInput) {
const selectionStart = filteredSearchInput.selectionStart;
const inputValue = filteredSearchInput.value;
const inputValue = filteredSearchInput.value;
const { right } = gl.DropdownUtils.getInputSelectionPosition(filteredSearchInput);
const { right } = gl.DropdownUtils.getInputSelectionPosition(filteredSearchInput);
...
@@ -88,7 +87,7 @@
...
@@ -88,7 +87,7 @@
let inputValue = input.value;
let inputValue = input.value;
// Replace all spaces inside quote marks with underscores
// Replace all spaces inside quote marks with underscores
// This helps with matching the beginning & end of a token:key
// This helps with matching the beginning & end of a token:key
inputValue = inputValue.replace(/"(.*?)"/g, str => str.replace(/\s/g, '_')
);
inputValue = inputValue.replace(/"(.*?)"/g, str => str.replace(/\s/g, '_'));
// Get the right position for the word selected
// Get the right position for the word selected
// Regex matches first space
// Regex matches first space
...
...
app/assets/javascripts/filtered_search/filtered_search_dropdown_manager.js.es6
View file @
317ef7b5
...
@@ -73,7 +73,6 @@
...
@@ -73,7 +73,6 @@
// Sometimes can end up at end of input
// Sometimes can end up at end of input
input.setSelectionRange(selectionStart, selectionStart);
input.setSelectionRange(selectionStart, selectionStart);
const inputValue = input.value;
const { right } = gl.DropdownUtils.getInputSelectionPosition(input);
const { right } = gl.DropdownUtils.getInputSelectionPosition(input);
input.setSelectionRange(right, right);
input.setSelectionRange(right, right);
...
...
spec/javascripts/filtered_search/dropdown_utils_spec.js.es6
View file @
317ef7b5
...
@@ -67,20 +67,32 @@
...
@@ -67,20 +67,32 @@
});
});
describe('filterHint', () => {
describe('filterHint', () => {
let input;
beforeEach(() => {
setFixtures(`
<input type="text" id="test" />
`);
input = document.getElementById('test');
});
it('should filter', () => {
it('should filter', () => {
let updatedItem = gl.DropdownUtils.filterHint({
input.value = 'l';
let updatedItem = gl.DropdownUtils.filterHint(input, {
hint: 'label',
hint: 'label',
}
, 'l'
);
});
expect(updatedItem.droplab_hidden).toBe(false);
expect(updatedItem.droplab_hidden).toBe(false);
updatedItem = gl.DropdownUtils.filterHint({
input.value = 'o';
updatedItem = gl.DropdownUtils.filterHint(input, {
hint: 'label',
hint: 'label',
}, 'o');
}, 'o');
expect(updatedItem.droplab_hidden).toBe(true);
expect(updatedItem.droplab_hidden).toBe(true);
});
});
it('should return droplab_hidden false when item has no hint', () => {
it('should return droplab_hidden false when item has no hint', () => {
const updatedItem = gl.DropdownUtils.filterHint({}, '');
const updatedItem = gl.DropdownUtils.filterHint(
input,
{}, '');
expect(updatedItem.droplab_hidden).toBe(false);
expect(updatedItem.droplab_hidden).toBe(false);
});
});
});
});
...
...
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