Skip to content

Commit fbed87a

Browse files
authored
Activate field validation when expanding the advanced options (#722)
1 parent 4ac580e commit fbed87a

File tree

2 files changed

+14
-6
lines changed

2 files changed

+14
-6
lines changed

pywb/static/search.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,8 @@ var elemIds = {
2929
match: 'match-type-select',
3030
url: 'search-url',
3131
form: 'search-form',
32-
resultsNewWindow: 'open-results-new-window'
32+
resultsNewWindow: 'open-results-new-window',
33+
advancedOptions: 'advanced-options'
3334
};
3435

3536
function makeCheckDateRangeChecker(dtInputId, dtBadNotice) {
@@ -158,6 +159,13 @@ function performQuery(url) {
158159
}
159160
}
160161

162+
function validateFields(form) {
163+
if (!didSetWasValidated) {
164+
form.classList.add('was-validated');
165+
didSetWasValidated = true;
166+
}
167+
}
168+
161169
$(document).ready(function() {
162170
$('[data-toggle="tooltip"]').tooltip({
163171
container: 'body',
@@ -180,12 +188,12 @@ $(document).ready(function() {
180188
event.stopPropagation();
181189
var url = searchURLInput.value;
182190
if (!url) {
183-
if (!didSetWasValidated) {
184-
form.classList.add('was-validated');
185-
didSetWasValidated = true;
186-
}
191+
validateFields(form);
187192
return;
188193
}
189194
performQuery(url);
190195
});
196+
document.getElementById(elemIds.advancedOptions).onclick = function() {
197+
validateFields(form);
198+
}
191199
});

pywb/templates/search.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ <h4 class="display-4">
4747
{% trans %}Search{% endtrans %}
4848
</button>
4949
<button class="btn btn-outline-info float-right mr-3" type="button" role="button"
50-
data-toggle="collapse" data-target="#advancedOptions"
50+
data-toggle="collapse" data-target="#advancedOptions" id="advanced-options"
5151
aria-expanded="false" aria-controls="advancedOptions" aria-label="Advanced Search Options">
5252
{{ _('Advanced Search Options') }}
5353
</button>

0 commit comments

Comments
 (0)