Skip to content
Snippets Groups Projects
Commit 164b5a2c authored by Stephen Mustgrave's avatar Stephen Mustgrave
Browse files

Resolve #3372272 "Remove clear"

parent 83118b4a
No related branches found
No related tags found
1 merge request!36Resolve #3372272 "Remove clear"
Pipeline #70694 failed
......@@ -5,31 +5,6 @@
.winnow-input input.form-search {
padding-right: 2em;
}
.winnow-clear {
position: absolute;
top: 0;
right: 2px;
bottom: 0;
left: auto;
text-align: left;
text-indent: -9999px;
}
.winnow-clear::after {
position: absolute;
right: 0;
height: 100%;
padding: 0 0.5em;
content: '✕';
text-decoration: none;
text-indent: 0;
opacity: 0.7;
color: #aaa;
text-shadow: 0 1px 0 #fff;
font: 1em/2.2em arial, sans-serif;
}
.winnow-clear:hover::after {
opacity: 1;
}
.admin-missing {
/* Use Claro variable, but give a default as this will not exist in other themes */
color: var(--color-maximumred, #f00);
......
......@@ -78,7 +78,6 @@
selector: '',
textSelector: null,
emptyMessage: '',
clearLabel: 'clear',
rules: [],
buildIndex: [],
additionalOperators: {}
......@@ -89,21 +88,6 @@
self.element.wrap('<div class="winnow-input"></div>');
// Add clear button.
self.clearButton = $(`<a href="#" class="winnow-clear">${ self.options.clearLabel }</a>`);
self.clearButton.css({
'display': 'inline-block',
'margin-left': '0.75em'
});
if (self.element.val() === '') {
self.clearButton.hide();
}
self.clearButton.click((e) => {
e.preventDefault();
self.clearFilter();
});
self.element.after(self.clearButton);
self.element.on({
keyup: debounce(() => {
const value = self.element.val();
......@@ -115,13 +99,9 @@
keydown: preventEnterKey
});
self.element.on({
keyup () {
// Show/hide the clear button.
if (self.element.val() !== '') {
self.clearButton.show();
}
else {
self.clearButton.hide();
search () {
if (self.element.val() === '') {
self.clearFilter();
}
}
});
......@@ -360,7 +340,6 @@
Winnow.prototype.clearFilter = function () {
this.element.val('');
this.filter();
this.clearButton.hide();
this.element.focus();
};
......
......@@ -66,7 +66,6 @@
textSelector:
'td.module .module-name, .module-machine-name, .module-description',
emptyMessage: Drupal.t('No results'),
clearLabel: Drupal.t('clear'),
wrapper: ModuleFilter.modulesWrapper,
buildIndex: [
function (item) {
......
......@@ -25,7 +25,6 @@
// to explicitly include the module-description class.
textSelector: '.table-filter-text-source, td .module-description',
emptyMessage: Drupal.t('No results'),
clearLabel: Drupal.t('clear'),
wrapper: $modulesWrapper,
additionalOperators: {
description (string, item) {
......
......@@ -24,7 +24,6 @@
$input.winnow(`${wrapperId} ${selector}`, {
textSelector: 'td .project-update__title a',
emptyMessage: Drupal.t('No results'),
clearLabel: Drupal.t('clear'),
wrapper: $wrapper,
buildIndex: [
(item) => {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment