Merge pull request Eonasdan#1172 from justinmcdaniel/development

Eonasdan · Eonasdan · commit 87c882b5948b · 2015-08-22T12:00:32.000-04:00
The defaultDate was not showing when using a placeholder.
diff --git a/src/js/bootstrap-datetimepicker.js b/src/js/bootstrap-datetimepicker.js
@@ -1761,7 +1761,7 @@
 
             options.defaultDate = parsedDate;
 
-            if (options.defaultDate && options.inline || (input.val().trim() === '' && input.attr('placeholder') === undefined)) {
+            if ((options.defaultDate && options.inline) || input.val().trim() === '') {
                 setValue(options.defaultDate);
             }
             return picker;

Original file line number	Diff line number	Diff line change
`@@ -1761,7 +1761,7 @@`
`1761`	`1761`
`1762`	`1762`	`options.defaultDate = parsedDate;`
`1763`	`1763`
`1764`		`- if (options.defaultDate && options.inline \|\| (input.val().trim() === '' && input.attr('placeholder') === undefined)) {`
	`1764`	`+ if ((options.defaultDate && options.inline) \|\| input.val().trim() === '') {`
`1765`	`1765`	`setValue(options.defaultDate);`
`1766`	`1766`	`}`
`1767`	`1767`	`return picker;`