jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix: Incorrect default date in dialog

Browse Source
This commit is contained in:
Gary Sharp
2014-02-13 15:26:10 +11:00
parent 7bdbeb6a82
commit a6a65c54c7
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/ClientSource/Scripts/Modules/Disco-PropertyChangeHelpers.js
+5 -5
View File
@@ -101,7 +101,7 @@ if (!document.DiscoFunctions.DateChangeUserHelper) {
if (dateOnly) { if (dateOnly) {
DateField.datepicker({ DateField.datepicker({
defaultDate: new Date(), defaultDate: new Date(),
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -116,7 +116,7 @@ if (!document.DiscoFunctions.DateChangeUserHelper) {
DateField.datetimepicker({ DateField.datetimepicker({
defaultDate: new Date(), defaultDate: new Date(),
ampm: true, ampm: true,
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -166,7 +166,7 @@ if (!document.DiscoFunctions.DateChangeHelper) {
if (dateOnly) { if (dateOnly) {
DateField.datepicker({ DateField.datepicker({
defaultDate: new Date(), defaultDate: new Date(),
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -181,7 +181,7 @@ if (!document.DiscoFunctions.DateChangeHelper) {
DateField.datetimepicker({ DateField.datetimepicker({
defaultDate: new Date(), defaultDate: new Date(),
ampm: true, ampm: true,
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -309,7 +309,7 @@ if (!document.DiscoFunctions.DateDialogCreateUpdater)
dialogDateBox.datetimepicker('setDate', new Date()); dialogDateBox.datetimepicker('setDate', new Date());
if (MinDate) if (MinDate)
dialogDateBox.datetimepicker('option', 'minDate', MinDate); dialogDateBox.datetimepicker('option', 'minDate', moment(minDate).toDate());
else else
dialogDateBox.datetimepicker('option', 'minDate', null); dialogDateBox.datetimepicker('option', 'minDate', null);
Disco.Web/ClientSource/Scripts/Modules/Disco-PropertyChangeHelpers.min.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/Disco-PropertyChangeHelpers.min.js.map
+2 -2
View File
File diff suppressed because one or more lines are too long
Disco.Web/ClientSource/Scripts/Modules/Disco-PropertyChangeHelpers/disco.propertychangehelpers.js
+5 -5
View File
@@ -100,7 +100,7 @@ if (!document.DiscoFunctions.DateChangeUserHelper) {
if (dateOnly) { if (dateOnly) {
DateField.datepicker({ DateField.datepicker({
defaultDate: new Date(), defaultDate: new Date(),
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -115,7 +115,7 @@ if (!document.DiscoFunctions.DateChangeUserHelper) {
DateField.datetimepicker({ DateField.datetimepicker({
defaultDate: new Date(), defaultDate: new Date(),
ampm: true, ampm: true,
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -165,7 +165,7 @@ if (!document.DiscoFunctions.DateChangeHelper) {
if (dateOnly) { if (dateOnly) {
DateField.datepicker({ DateField.datepicker({
defaultDate: new Date(), defaultDate: new Date(),
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -180,7 +180,7 @@ if (!document.DiscoFunctions.DateChangeHelper) {
DateField.datetimepicker({ DateField.datetimepicker({
defaultDate: new Date(), defaultDate: new Date(),
ampm: true, ampm: true,
minDate: minDate, minDate: moment(minDate).toDate(),
changeYear: true, changeYear: true,
changeMonth: true, changeMonth: true,
dateFormat: 'yy/mm/dd', dateFormat: 'yy/mm/dd',
@@ -308,7 +308,7 @@ if (!document.DiscoFunctions.DateDialogCreateUpdater)
dialogDateBox.datetimepicker('setDate', new Date()); dialogDateBox.datetimepicker('setDate', new Date());
if (MinDate) if (MinDate)
dialogDateBox.datetimepicker('option', 'minDate', MinDate); dialogDateBox.datetimepicker('option', 'minDate', moment(minDate).toDate());
else else
dialogDateBox.datetimepicker('option', 'minDate', null); dialogDateBox.datetimepicker('option', 'minDate', null);