Commit b7d6c884 authored by Daniel Sattler's avatar Daniel Sattler Committed by Anja Leichsenring
Browse files

[BUGFIX] Register Bootstrap JavaScript as AMD Module

Set jQuery as dependency for the Bootstrap JavaScript file if it is loaded
via RequireJS. The Bootstrap file can still  be used without RequireJS.

Also add "bootstrap" as dependency for all backend JS file which need Boostrap.

Resolves: #66097
Releases: master
Change-Id: I5869394e5c635cea7f56c799fd9322bf245341a4
Reviewed-on: http://review.typo3.org/38306

Reviewed-by: default avatarMarkus Klein <klein.t3@reelworx.at>
Reviewed-by: Benni Mack's avatarBenjamin Mack <benni@typo3.org>
Tested-by: Benni Mack's avatarBenjamin Mack <benni@typo3.org>
Reviewed-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
Tested-by: Anja Leichsenring's avatarAnja Leichsenring <aleichsenring@ab-softlab.de>
parent 83eab774
This diff is collapsed.
This diff is collapsed.
......@@ -14,7 +14,7 @@
/**
* API for context help.
*/
define('TYPO3/CMS/Backend/ContextHelp', ['jquery', 'TYPO3/CMS/Backend/Popover'], function($) {
define('TYPO3/CMS/Backend/ContextHelp', ['jquery', 'TYPO3/CMS/Backend/Popover', 'bootstrap'], function($) {
/**
* The main ContextHelp object
......
......@@ -15,7 +15,7 @@
* Task that periodically checks if a blocking event in the backend occurred and
* displays a proper dialog to the user.
*/
define('TYPO3/CMS/Backend/LoginRefresh', ['jquery'], function($) {
define('TYPO3/CMS/Backend/LoginRefresh', ['jquery', 'bootstrap'], function($) {
var LoginRefresh = {
identifier: {
loginrefresh: 't3-modal-loginrefresh',
......
......@@ -15,7 +15,7 @@
* API for modal windows powered by Twitter Bootstrap.
* This module depends on TYPO3/CMS/Backend/Notification due to top.TYPO3.Severity.
*/
define('TYPO3/CMS/Backend/Modal', ['jquery', 'TYPO3/CMS/Backend/Notification'], function($) {
define('TYPO3/CMS/Backend/Modal', ['jquery', 'TYPO3/CMS/Backend/Notification', 'bootstrap'], function($) {
/**
* The main object of the modal API
......
......@@ -14,7 +14,7 @@
/**
* API for popover windows powered by Twitter Bootstrap.
*/
define('TYPO3/CMS/Backend/Popover', ['jquery'], function($) {
define('TYPO3/CMS/Backend/Popover', ['jquery', 'bootstrap'], function($) {
/**
* the main popover object
......
......@@ -15,7 +15,7 @@
* This class handle the tabs in the TYPO3 backend.
* It stores the last active tab and open it again after a reload,
*/
define('TYPO3/CMS/Backend/Tabs', ['jquery', 'TYPO3/CMS/Backend/Storage'], function ($) {
define('TYPO3/CMS/Backend/Tabs', ['jquery', 'TYPO3/CMS/Backend/Storage', 'bootstrap'], function ($) {
/**
* Tabs helper
......
......@@ -14,7 +14,7 @@
/**
* API for tooltip windows powered by Twitter Bootstrap.
*/
define('TYPO3/CMS/Backend/Tooltip', ['jquery'], function($) {
define('TYPO3/CMS/Backend/Tooltip', ['jquery', 'bootstrap'], function($) {
/**
* The main tooltip object
......
......@@ -1590,7 +1590,7 @@ class PageRenderer implements \TYPO3\CMS\Core\SingletonInterface {
'datatables' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/jquery.dataTables',
'nprogress' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/nprogress',
'moment' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/moment/moment',
'twbs' => $this->backPath . 'contrib/twbs/bootstrap.min',
'bootstrap' => $this->backPath . 'contrib/twbs/bootstrap.min',
'twbs/bootstrap-datetimepicker' => $this->backPath . 'sysext/core/Resources/Public/JavaScript/Contrib/bootstrap-datetimepicker',
);
// get all extensions that are loaded
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment