From f317bc66ee6481eadea2f56c6824f0fbeafc0604 Mon Sep 17 00:00:00 2001
From: Matthias Schmidt <gravatronics@live.com>
Date: Sat, 20 Jun 2015 15:09:17 +0200
Subject: [PATCH] Move date picker initialization to Bootstrap.js

---
 .../install/files/js/WoltLab/WCF/ACP/Bootstrap.js |  3 +--
 .../install/files/js/WoltLab/WCF/Bootstrap.js     | 15 +++++++++------
 .../files/js/WoltLab/WCF/BootstrapFrontend.js     |  5 ++---
 3 files changed, 12 insertions(+), 11 deletions(-)

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 <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 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();
-- 
2.20.1