From: Alexander Ebert <ebert@woltlab.com>
Date: Sat, 28 Sep 2013 10:32:56 +0000 (+0200)
Subject: Fixed date/time picker
X-Git-Tag: 2.0.0_Beta_10~6^2~3
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=65dd3bae69aec07eefb0a9af1f0afb24ea0a8e9a;p=GitHub%2FWoltLab%2FWCF.git

Fixed date/time picker

Fixes #1519
---

diff --git a/com.woltlab.wcf/templates/headInclude.tpl b/com.woltlab.wcf/templates/headInclude.tpl
index 6d2edaa025..e74ca760fc 100644
--- a/com.woltlab.wcf/templates/headInclude.tpl
+++ b/com.woltlab.wcf/templates/headInclude.tpl
@@ -38,8 +38,8 @@
 	//]]>
 </script>
 {/if}
-<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable.min.js?v={@$__wcfVersion}"></script>
-<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker.min.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.nestedSortable{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
+<script data-relocate="true" src="{@$__wcf->getPath()}js/3rdParty/jquery-ui.timepicker{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script data-relocate="true" src="{@$__wcf->getPath()}js/WCF{if !ENABLE_DEBUG_MODE}.min{/if}.js?v={@$__wcfVersion}"></script>
 <script data-relocate="true">
 	//<![CDATA[
diff --git a/wcfsetup/install/files/js/WCF.js b/wcfsetup/install/files/js/WCF.js
index 47a9c8c482..d47e9b0775 100755
--- a/wcfsetup/install/files/js/WCF.js
+++ b/wcfsetup/install/files/js/WCF.js
@@ -2647,7 +2647,7 @@ WCF.Date.Picker = {
 		// simply continue :)	- Alex
 		var $__log = $.timepicker.log;
 		$.timepicker.log = function(error) {
-			if (error.indexOf('Error parsing the date/time string: Unexpected literal at position') == -1) {
+			if (error.indexOf('Error parsing the date/time string: Unexpected literal at position') == -1 && error.indexOf('Error parsing the date/time string: Unknown name at position') == -1) {
 				$__log(error);
 			}
 		};
@@ -2676,8 +2676,8 @@ WCF.Date.Picker = {
 		// L	Whether it's a leap year
 		var $replacementTable = {
 			// time
-			'a': ' tt',
-			'A': ' TT',
+			'a': 'tt',
+			'A': 'TT',
 			'g': 'h',
 			'G': 'H',
 			'h': 'hh',
@@ -2730,6 +2730,8 @@ WCF.Date.Picker = {
 			
 			return part1 + part2;
 		});
+		
+		console.debug(this._dateFormat + " " + this._timeFormat);
 	},
 	
 	/**
@@ -2786,7 +2788,7 @@ WCF.Date.Picker = {
 			
 			// format default date
 			if ($inputValue) {
-				$input.datepicker('setDate', new Date($inputValue));
+				$input.datepicker('setDate', new $inputValue);
 			}
 			
 			// bug workaround: setDate creates the widget but unfortunately doesn't hide it...
@@ -2854,7 +2856,7 @@ WCF.Date.Picker = {
 			
 			// format default date
 			if ($inputValue) {
-				$input.removeClass('hasDatepicker').datetimepicker('setDate', new Date($inputValue));
+				$input.removeClass('hasDatepicker').datetimepicker('setDate', $inputValue);
 			}
 			
 			// bug workaround: setDate creates the widget but unfortunately doesn't hide it...