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
Boxiang Sun
gitlab-ce
Commits
80864a19
Commit
80864a19
authored
Oct 05, 2016
by
Bryce Johnson
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Safely scope siblings of validated input.
parent
cbd68e5b
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
2 deletions
+15
-2
app/assets/javascripts/gl_field_errors.js.es6
app/assets/javascripts/gl_field_errors.js.es6
+15
-2
No files found.
app/assets/javascripts/gl_field_errors.js.es6
View file @
80864a19
...
@@ -36,6 +36,19 @@
...
@@ -36,6 +36,19 @@
// hidden when injected into DOM
// hidden when injected into DOM
this.inputElement.after(this.fieldErrorElement);
this.inputElement.after(this.fieldErrorElement);
this.inputElement.off('invalid').on('invalid', this.handleInvalidInput.bind(this));
this.inputElement.off('invalid').on('invalid', this.handleInvalidInput.bind(this));
this.scopedSiblings = this.safelySelectSiblings();
}
safelySelectSiblings() {
// Apply `ignoreSelector` in markup to siblings whose visibility should not be toggled with input validity
const ignoreSelector = '.validation-ignore';
const unignoredSiblings = this.inputElement.siblings(`p:not(${ignoreSelector})`);
const parentContainer = this.inputElement.parent('.form-group');
// Only select siblings when they're scoped within a form-group with one input
const safelyScoped = parentContainer.length && parentContainer.find('input').length === 1;
return safelyScoped ? unignoredSiblings : this.fieldErrorElement;
}
}
renderValidity() {
renderValidity() {
...
@@ -90,7 +103,7 @@
...
@@ -90,7 +103,7 @@
setInvalidState() {
setInvalidState() {
this.inputElement.addClass(inputErrorClass);
this.inputElement.addClass(inputErrorClass);
this.
inputElement.siblings('p')
.hide();
this.
scopedSiblings
.hide();
return this.fieldErrorElement.show();
return this.fieldErrorElement.show();
}
}
...
@@ -101,7 +114,7 @@
...
@@ -101,7 +114,7 @@
this.inputElement.val(trimmedInput);
this.inputElement.val(trimmedInput);
}
}
this.inputElement.removeClass(inputErrorClass);
this.inputElement.removeClass(inputErrorClass);
this.
inputElement.siblings('p')
.hide();
this.
scopedSiblings
.hide();
this.fieldErrorElement.hide();
this.fieldErrorElement.hide();
}
}
}
}
...
...
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