Skip to content

Commit 63b37a0

Browse files
rimi-itkrimi-itk
committed
Cleaned up JavaScript
1 parent 5f411a4 commit 63b37a0

File tree

3 files changed

+80
-77
lines changed

3 files changed

+80
-77
lines changed

‎web/profiles/custom/os2loop/modules/os2loop_question/assets/js/hideReferenceIds.js‎

Lines changed: 50 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,57 @@
11
(function ($, Drupal, once) {
2-
'use strict';
3-
/**
4-
* Remove entity reference ID from "entity_autocomplete" field.
5-
*
6-
* @type {{attach: Drupal.behaviors.autocompleteReferenceEntityId.attach}}
7-
*/
8-
Drupal.behaviors.autocompleteReferenceEntityId = {
9-
attach: function (context) {
10-
// Remove reference IDs for autocomplete elements on init.
11-
$(once('replaceReferenceIdOnInit', '.form-autocomplete', context)).each(function () {
12-
let splitValues = (this.value && this.value !== 'false') ?
13-
Drupal.autocomplete.splitValues(this.value) : [];
2+
"use strict";
3+
/**
4+
* Remove entity reference ID from "entity_autocomplete" field.
5+
*
6+
* @type {{attach: Drupal.behaviors.autocompleteReferenceEntityId.attach}}
7+
*/
8+
Drupal.behaviors.autocompleteReferenceEntityId = {
9+
attach: function (context) {
10+
// Remove reference IDs for autocomplete elements on init.
11+
$(once("replaceReferenceIdOnInit", ".form-autocomplete", context)).each(
12+
function () {
13+
let splitValues =
14+
this.value && this.value !== "false"
15+
? Drupal.autocomplete.splitValues(this.value)
16+
: [];
1417

15-
if (splitValues.length > 0) {
16-
let labelValues = [];
17-
for (let i in splitValues) {
18-
let value = splitValues[i].trim();
19-
let entityIdMatch = value.match(/\s*\((.*?)\)$/);
20-
if (entityIdMatch) {
21-
labelValues[i] = value.replace(entityIdMatch[0], '');
22-
}
23-
}
24-
if (labelValues.length > 0) {
25-
$(this).data('real-value', splitValues.join(', '));
26-
this.value = labelValues.join(', ');
27-
}
28-
}
29-
});
30-
}
31-
};
18+
if (splitValues.length > 0) {
19+
let labelValues = [];
20+
for (let i in splitValues) {
21+
let value = splitValues[i].trim();
22+
let entityIdMatch = value.match(/\s*\((.*?)\)$/);
23+
if (entityIdMatch) {
24+
labelValues[i] = value.replace(entityIdMatch[0], "");
25+
}
26+
}
27+
if (labelValues.length > 0) {
28+
$(this).data("real-value", splitValues.join(", "));
29+
this.value = labelValues.join(", ");
30+
}
31+
}
32+
}
33+
);
34+
},
35+
};
3236

33-
let autocomplete = Drupal.autocomplete.options;
34-
autocomplete.originalValues = [];
35-
autocomplete.labelValues = [];
37+
let autocomplete = Drupal.autocomplete.options;
38+
autocomplete.originalValues = [];
39+
autocomplete.labelValues = [];
3640

37-
/**
38-
* Add custom select handler.
39-
*/
40-
autocomplete.select = function (event, ui) {
41-
autocomplete.labelValues = Drupal.autocomplete.splitValues(event.target.value);
42-
autocomplete.labelValues.pop();
43-
autocomplete.labelValues.push(ui.item.label);
44-
autocomplete.originalValues.push(ui.item.value);
41+
/**
42+
* Add custom select handler.
43+
*/
44+
autocomplete.select = function (event, ui) {
45+
autocomplete.labelValues = Drupal.autocomplete.splitValues(
46+
event.target.value
47+
);
48+
autocomplete.labelValues.pop();
49+
autocomplete.labelValues.push(ui.item.label);
50+
autocomplete.originalValues.push(ui.item.value);
4551

46-
$(event.target).data('real-value', autocomplete.originalValues.join(', '));
47-
event.target.value = autocomplete.labelValues.join(', ');
48-
49-
return FALSE;
50-
}
52+
$(event.target).data("real-value", autocomplete.originalValues.join(", "));
53+
event.target.value = autocomplete.labelValues.join(", ");
5154

55+
return FALSE;
56+
};
5257
})(jQuery, Drupal, once);

‎web/profiles/custom/os2loop/modules/os2loop_search_db/assets/js/hideFilters.js‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
* Hide search filters if the search yields no result.
33
*/
44
(function (Drupal, drupalSettings) {
5-
'use strict';
6-
Drupal.behaviors.hideFilters = {
7-
attach: function (context, settings) {
8-
let noResult = document.getElementById('js-no-result');
9-
if (noResult) {
10-
document.getElementById('js-search-filters').style.display = 'none';
11-
}
12-
}
13-
};
14-
5+
"use strict";
6+
Drupal.behaviors.hideFilters = {
7+
attach: function (context, settings) {
8+
let noResult = document.getElementById("js-no-result");
9+
if (noResult) {
10+
document.getElementById("js-search-filters").style.display = "none";
11+
}
12+
},
13+
};
1514
})(Drupal, drupalSettings);

‎web/profiles/custom/os2loop/modules/os2loop_section_page/js/hide-empty-sections.js‎

Lines changed: 21 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,28 @@
11
Drupal.behaviors.hideEmptySections = {
2-
attach: function (context, settings) {
3-
let empty_views = document.getElementsByClassName("js-view-empty");
4-
// Act on each empty view.
5-
for (let i = 0; i < empty_views.length; i++) {
6-
let el = empty_views.item(i);
7-
// Look for class section in parents.
8-
let section = findUpClass(el, 'section');
9-
if (section) {
10-
// Add explanatory class.
11-
section.classList.add("js-empty-list");
2+
attach: function (context, settings) {
3+
let empty_views = document.getElementsByClassName("js-view-empty");
4+
// Act on each empty view.
5+
for (let i = 0; i < empty_views.length; i++) {
6+
let el = empty_views.item(i);
7+
// Look for class section in parents.
8+
let section = findUpClass(el, "section");
9+
if (section) {
10+
// Add explanatory class.
11+
section.classList.add("js-empty-list");
1212

13-
// Hide element.
14-
section.classList.add("d-none");
15-
}
16-
}
17-
}
13+
// Hide element.
14+
section.classList.add("d-none");
15+
}
16+
}
17+
},
1818
};
1919

2020
// Iterate up through parents looking for a class.
2121
function findUpClass(el, tag) {
22-
while (el.parentNode) {
23-
el = el.parentNode;
24-
let classList = el.className.split(' ')
25-
if (classList.includes(tag))
26-
return el;
27-
}
28-
return null;
22+
while (el.parentNode) {
23+
el = el.parentNode;
24+
let classList = el.className.split(" ");
25+
if (classList.includes(tag)) return el;
26+
}
27+
return null;
2928
}

0 commit comments

Comments
 (0)