From: Matthias Schmidt Date: Sat, 20 Jun 2015 13:09:17 +0000 (+0200) Subject: Move date picker initialization to Bootstrap.js X-Git-Tag: 3.0.0_Beta_1~2260 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f317bc66ee6481eadea2f56c6824f0fbeafc0604;p=GitHub%2FWoltLab%2FWCF.git Move date picker initialization to Bootstrap.js --- diff --git a/wcfsetup/install/files/js/WoltLab/WCF/ACP/Bootstrap.js b/wcfsetup/install/files/js/WoltLab/WCF/ACP/Bootstrap.js index 2efb780554..1243c441e8 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/ACP/Bootstrap.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/ACP/Bootstrap.js @@ -6,7 +6,7 @@ * @license GNU Lesser General Public License * @module WoltLab/WCF/ACP/Bootstrap */ -define(['WoltLab/WCF/Bootstrap', 'WoltLab/WCF/Date/Picker'], function(Bootstrap, DatePicker) { +define(['WoltLab/WCF/Bootstrap'], function(Bootstrap) { "use strict"; /** @@ -22,7 +22,6 @@ define(['WoltLab/WCF/Bootstrap', 'WoltLab/WCF/Date/Picker'], function(Bootstrap, */ setup: function(options) { Bootstrap.setup(); - DatePicker.init(); } }; diff --git a/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js b/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js index cc9ac288f6..58937bb102 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/Bootstrap.js @@ -10,14 +10,16 @@ */ define( [ - 'favico', 'enquire', 'perfect-scrollbar', 'WoltLab/WCF/Date/Time/Relative', - 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu', 'WoltLab/WCF/UI/FlexibleMenu', - 'UI/Dialog', 'WoltLab/WCF/UI/Tooltip', 'WoltLab/WCF/Language', 'WoltLab/WCF/Environment' + 'favico', 'enquire', 'perfect-scrollbar', 'WoltLab/WCF/Date/Time/Relative', + 'UI/SimpleDropdown', 'WoltLab/WCF/UI/Mobile', 'WoltLab/WCF/UI/TabMenu', 'WoltLab/WCF/UI/FlexibleMenu', + 'UI/Dialog', 'WoltLab/WCF/UI/Tooltip', 'WoltLab/WCF/Language', 'WoltLab/WCF/Environment', + 'WoltLab/WCF/Date/Picker' ], function( - favico, enquire, perfectScrollbar, DateTimeRelative, - UISimpleDropdown, UIMobile, UITabMenu, UIFlexibleMenu, - UIDialog, UITooltip, Language, Environment + favico, enquire, perfectScrollbar, DateTimeRelative, + UISimpleDropdown, UIMobile, UITabMenu, UIFlexibleMenu, + UIDialog, UITooltip, Language, Environment, + DatePicker ) { "use strict"; @@ -43,6 +45,7 @@ define( Environment.setup(); DateTimeRelative.setup(); + DatePicker.init(); UISimpleDropdown.setup(); UIMobile.setup(); diff --git a/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js b/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js index 306f026821..b223f21115 100644 --- a/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js +++ b/wcfsetup/install/files/js/WoltLab/WCF/BootstrapFrontend.js @@ -9,11 +9,11 @@ define( [ 'Ajax', 'WoltLab/WCF/Bootstrap', 'WoltLab/WCF/Controller/Sitemap', 'WoltLab/WCF/Controller/Style/Changer', - 'WoltLab/WCF/Controller/Popover', 'WoltLab/WCF/Date/Picker' + 'WoltLab/WCF/Controller/Popover' ], function( Ajax, Bootstrap, ControllerSitemap, ControllerStyleChanger, - ControllerPopover, DatePicker + ControllerPopover ) { "use strict"; @@ -31,7 +31,6 @@ define( Bootstrap.setup(); ControllerSitemap.setup(); - DatePicker.init(); if (options.styleChanger) { ControllerStyleChanger.setup();