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 2efb780554167917fa02136a1193ee923a574e90..1243c441e8ae225516a4a491b66285cd97dc2401 100644 (file)
--- 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 <http://opensource.org/licenses/lgpl-license.php>
  * @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 cc9ac288f658b9c236e696adf00cdad490304596..58937bb102852ed590c919a3ea4ba1b0ce9b6f37 100644 (file)
--- 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 306f0268213e5c7e23029f87f34ae4666b8a3ea6..b223f21115a21b051dde3f1b0a0a3d7c01ff50e5 100644 (file)
--- 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();