Merge pull request #1953 from Eonasdan/master

fix
Eonasdan · Dec 31, 2016 · 6050b7e · 6050b7e
2 parents 6384819 + dad92a9
commit 6050b7e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 5 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -188,7 +188,8 @@ module.exports = function (grunt) {
         grunt.task.run([
             'bump_version:' + version,
             'build:travis',
-            'docs'
+            'docs',
+            'nugetpack'
         ]);
     });
 };
diff --git a/build/js/bootstrap-datetimepicker.min.js b/build/js/bootstrap-datetimepicker.min.js
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
   "require": {
     "robloach/component-installer": "*",
     "components/jquery": ">=1.9.1",
-    "moment": ">=2.10.5"
+    "moment/moment": ">=2.10.5"
   },
   "extra": {
     "component": {

diff --git a/docs/Options.md b/docs/Options.md
@@ -206,7 +206,7 @@ Takes a `boolean`. If set to `false` the picker will display similar to `sideByS
 ### locale
 
 	Default: moment.locale()
-    Accepts: string, moment.local('locale')
+    Accepts: string, moment.locale('locale')
 
 See [momentjs](https://github.com/moment/moment/tree/develop/locale) for valid locales.
 

diff --git a/src/js/bootstrap-datetimepicker.js b/src/js/bootstrap-datetimepicker.js
@@ -947,6 +947,7 @@
 
                 input.blur();
 
+                currentViewMode = 0;
                 viewDate = date.clone();
 
                 return picker;
@@ -958,7 +959,7 @@
 
             parseInputDate = function (inputDate) {
                 if (options.parseInputDate === undefined) {
-                    if (!moment.isMoment(inputDate)) {
+                    if (!moment.isMoment(inputDate) || inputDate instanceof Date) {
                         inputDate = getMoment(inputDate);
                     }
                 } else {