fixed regression: date does not respect initial value on lang change,…

… if no dateFormat is set initially via option
ethanresnick · Jul 24, 2012 · 49ede5c · 49ede5c
1 parent abde730
commit 49ede5c
Show file tree

Hide file tree

Showing 14 changed files with 113 additions and 88 deletions.
diff --git a/demos/js-webshim/dev/shims/combos/18.js b/demos/js-webshim/dev/shims/combos/18.js
@@ -1533,7 +1533,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 						e.stopImmediatePropagation();
 					}
 				})
-				.datepicker($.extend({
+				.datepicker($.extend(true, {
 					onClose: function(){
 						if(focusedOut && datePicker.not(':focus')){
 							resetFocusHandler();
@@ -1903,7 +1903,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 			langObj: $.datepicker.regional, 
 			module: 'form-number-date-ui', 
 			callback: function(langObj){
-				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(defaultDatepicker, langObj, options.datepicker));
+				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(true, defaultDatepicker, langObj, options.datepicker));
 			}
 		});
 		$(document).unbind('jquery-uiReady.langchange input-widgetsReady.langchange');
@@ -2083,6 +2083,9 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 	webshims.addReady(function(context, elem){
 		$(document).bind('jquery-uiReady.initinputui input-widgetsReady.initinputui', function(e){
 			if($.datepicker || $.fn.slider){
+				if($.datepicker && !defaultDatepicker.dateFormat){
+					defaultDatepicker.dateFormat = $.datepicker._defaults.dateFormat;
+				}
 				replaceInputUI(context, elem);
 			}
 			if($.datepicker && $.fn.slider){

diff --git a/demos/js-webshim/dev/shims/combos/6.js b/demos/js-webshim/dev/shims/combos/6.js
@@ -599,7 +599,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 						e.stopImmediatePropagation();
 					}
 				})
-				.datepicker($.extend({
+				.datepicker($.extend(true, {
 					onClose: function(){
 						if(focusedOut && datePicker.not(':focus')){
 							resetFocusHandler();
@@ -969,7 +969,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 			langObj: $.datepicker.regional, 
 			module: 'form-number-date-ui', 
 			callback: function(langObj){
-				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(defaultDatepicker, langObj, options.datepicker));
+				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(true, defaultDatepicker, langObj, options.datepicker));
 			}
 		});
 		$(document).unbind('jquery-uiReady.langchange input-widgetsReady.langchange');
@@ -1149,6 +1149,9 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 	webshims.addReady(function(context, elem){
 		$(document).bind('jquery-uiReady.initinputui input-widgetsReady.initinputui', function(e){
 			if($.datepicker || $.fn.slider){
+				if($.datepicker && !defaultDatepicker.dateFormat){
+					defaultDatepicker.dateFormat = $.datepicker._defaults.dateFormat;
+				}
 				replaceInputUI(context, elem);
 			}
 			if($.datepicker && $.fn.slider){

diff --git a/demos/js-webshim/dev/shims/combos/7.js b/demos/js-webshim/dev/shims/combos/7.js
@@ -873,7 +873,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 						e.stopImmediatePropagation();
 					}
 				})
-				.datepicker($.extend({
+				.datepicker($.extend(true, {
 					onClose: function(){
 						if(focusedOut && datePicker.not(':focus')){
 							resetFocusHandler();
@@ -1243,7 +1243,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 			langObj: $.datepicker.regional, 
 			module: 'form-number-date-ui', 
 			callback: function(langObj){
-				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(defaultDatepicker, langObj, options.datepicker));
+				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(true, defaultDatepicker, langObj, options.datepicker));
 			}
 		});
 		$(document).unbind('jquery-uiReady.langchange input-widgetsReady.langchange');
@@ -1423,6 +1423,9 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 	webshims.addReady(function(context, elem){
 		$(document).bind('jquery-uiReady.initinputui input-widgetsReady.initinputui', function(e){
 			if($.datepicker || $.fn.slider){
+				if($.datepicker && !defaultDatepicker.dateFormat){
+					defaultDatepicker.dateFormat = $.datepicker._defaults.dateFormat;
+				}
 				replaceInputUI(context, elem);
 			}
 			if($.datepicker && $.fn.slider){

diff --git a/demos/js-webshim/dev/shims/form-number-date-ui.js b/demos/js-webshim/dev/shims/form-number-date-ui.js
@@ -216,7 +216,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 						e.stopImmediatePropagation();
 					}
 				})
-				.datepicker($.extend({
+				.datepicker($.extend(true, {
 					onClose: function(){
 						if(focusedOut && datePicker.not(':focus')){
 							resetFocusHandler();
@@ -586,7 +586,7 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 			langObj: $.datepicker.regional, 
 			module: 'form-number-date-ui', 
 			callback: function(langObj){
-				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(defaultDatepicker, langObj, options.datepicker));
+				$('input.hasDatepicker').filter('.input-date, .input-datetime-local-date').datepicker('option', $.extend(true, defaultDatepicker, langObj, options.datepicker));
 			}
 		});
 		$(document).unbind('jquery-uiReady.langchange input-widgetsReady.langchange');
@@ -766,6 +766,9 @@ jQuery.webshims.register('form-number-date-ui', function($, webshims, window, do
 	webshims.addReady(function(context, elem){
 		$(document).bind('jquery-uiReady.initinputui input-widgetsReady.initinputui', function(e){
 			if($.datepicker || $.fn.slider){
+				if($.datepicker && !defaultDatepicker.dateFormat){
+					defaultDatepicker.dateFormat = $.datepicker._defaults.dateFormat;
+				}
 				replaceInputUI(context, elem);
 			}
 			if($.datepicker && $.fn.slider){