Skip to content

Commit 3e8dd5e

Browse files
authored
revert 32240 (#32256)
1 parent 65c0e60 commit 3e8dd5e

File tree

12 files changed

+10
-28
lines changed

12 files changed

+10
-28
lines changed

build/build-modules-js/build-bootstrap-js.es6.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ const build = async () => {
5959
'node_modules/bootstrap/js/src/dom/manipulator.js',
6060
'node_modules/bootstrap/js/src/dom/selector-engine.js',
6161
'node_modules/bootstrap/js/src/util/index.js',
62-
'build/media_source/vendor/bootstrap/js/nojquerymode.es6.js',
6362
],
6463
},
6564
});

build/media_source/vendor/bootstrap/js/alert.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Alert from '../../../../../node_modules/bootstrap/js/src/alert';
32

43
window.bootstrap = window.bootstrap || {};
54
window.bootstrap.Alert = Alert;
65

7-
if (nojQueryMode && Joomla && Joomla.getOptions) {
6+
if (Joomla && Joomla.getOptions) {
87
// Get the elements/configurations from the PHP
98
const alerts = Joomla.getOptions('bootstrap.alert');
109
// Initialise the elements

build/media_source/vendor/bootstrap/js/button.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Button from '../../../../../node_modules/bootstrap/js/src/button';
32

43
window.bootstrap = window.bootstrap || {};
54
window.bootstrap.Button = Button;
65

7-
if (nojQueryMode && Joomla && Joomla.getOptions) {
6+
if (Joomla && Joomla.getOptions) {
87
// Get the elements/configurations from the PHP
98
const buttons = Joomla.getOptions('bootstrap.button');
109
// Initialise the elements

build/media_source/vendor/bootstrap/js/carousel.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Carousel from '../../../../../node_modules/bootstrap/js/src/carousel';
32

43
window.bootstrap = window.bootstrap || {};
54
window.bootstrap.Carousel = Carousel;
65

7-
if (nojQueryMode && Joomla && Joomla.getOptions) {
6+
if (Joomla && Joomla.getOptions) {
87
// Get the elements/configurations from the PHP
98
const carousels = Joomla.getOptions('bootstrap.carousel');
109
// Initialise the elements

build/media_source/vendor/bootstrap/js/collapse.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Collapse from '../../../../../node_modules/bootstrap/js/src/collapse';
32

43
window.bootstrap = window.bootstrap || {};
54
window.bootstrap.Collapse = Collapse;
65

7-
if (nojQueryMode && Joomla && Joomla.getOptions) {
6+
if (Joomla && Joomla.getOptions) {
87
// Get the elements/configurations from the PHP
98
const collapses = { ...Joomla.getOptions('bootstrap.collapse'), ...Joomla.getOptions('bootstrap.accordion') };
109
// Initialise the elements

build/media_source/vendor/bootstrap/js/dropdown.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Dropdown from '../../../../../node_modules/bootstrap/js/src/dropdown';
32

43
window.bootstrap = window.bootstrap || {};
54
window.bootstrap.Dropdown = Dropdown;
65

7-
if (nojQueryMode && Joomla && Joomla.getOptions) {
6+
if (Joomla && Joomla.getOptions) {
87
// Get the elements/configurations from the PHP
98
const dropdowns = Joomla.getOptions('bootstrap.dropdown');
109
// Initialise the elements

build/media_source/vendor/bootstrap/js/modal.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Modal from '../../../../../node_modules/bootstrap/js/src/modal';
32

43
Joomla = Joomla || {};
@@ -134,7 +133,7 @@ Joomla.iframeButtonClick = (options) => {
134133
}
135134
};
136135

137-
if (nojQueryMode && Joomla && Joomla.getOptions) {
136+
if (Joomla && Joomla.getOptions) {
138137
// Get the elements/configurations from the PHP
139138
const modals = Joomla.getOptions('bootstrap.modal');
140139
// Initialise the elements

build/media_source/vendor/bootstrap/js/nojquerymode.es6.js

Lines changed: 0 additions & 7 deletions
This file was deleted.

build/media_source/vendor/bootstrap/js/popover.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Popover from '../../../../../node_modules/bootstrap/js/src/popover';
32
import Tooltip from '../../../../../node_modules/bootstrap/js/src/tooltip';
43

54
window.bootstrap = window.bootstrap || {};
65
window.bootstrap.Popover = Popover;
76
window.bootstrap.Tooltip = Tooltip;
87

9-
if (nojQueryMode && Joomla && Joomla.getOptions) {
8+
if (Joomla && Joomla.getOptions) {
109
// Get the elements/configurations from the PHP
1110
const tooltips = Joomla.getOptions('bootstrap.tooltip');
1211
const popovers = Joomla.getOptions('bootstrap.popover');

build/media_source/vendor/bootstrap/js/scrollspy.es6.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,9 @@
1-
import nojQueryMode from './nojquerymode.es6';
21
import Scrollspy from '../../../../../node_modules/bootstrap/js/src/scrollspy';
32

43
window.bootstrap = window.bootstrap || {};
54
window.bootstrap.Scrollspy = Scrollspy;
65

7-
if (nojQueryMode && Joomla && Joomla.getOptions) {
6+
if (Joomla && Joomla.getOptions) {
87
// Get the elements/configurations from the PHP
98
const scrollspys = Joomla.getOptions('bootstrap.scrollspy');
109
// Initialise the elements

0 commit comments

Comments
 (0)