diff --git a/package-lock.json b/package-lock.json index 3de1baac556..e25db4410e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "angular-material-source", - "version": "1.1.23", + "version": "1.1.24", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -418,7 +418,7 @@ "ansi-colors": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-1.1.0.tgz", - "integrity": "sha1-Y3S03V1HGP884npnGjscrQdxMqk=", + "integrity": "sha512-SFKX67auSNoVR38N3L+nvsPjOE0bybKTYbkf5tRvushrAPQ9V75huw0ZxBkKVeRU9kqH3d6HA4xTckbwZ4ixmA==", "dev": true, "requires": { "ansi-wrap": "^0.1.0" @@ -4119,7 +4119,7 @@ "function-bind": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", - "integrity": "sha1-pWiZ0+o8m6uHS7l3O3xe3pL0iV0=", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==", "dev": true }, "functional-red-black-tree": { @@ -11698,7 +11698,7 @@ "sax": { "version": "1.2.4", "resolved": "https://registry.npmjs.org/sax/-/sax-1.2.4.tgz", - "integrity": "sha1-KBYjTiN4vdxOU1T6tcqold9xANk=", + "integrity": "sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==", "dev": true }, "scss-tokenizer": { diff --git a/package.json b/package.json index 67270ead29e..98840c5b889 100644 --- a/package.json +++ b/package.json @@ -132,4 +132,4 @@ "node": ">=10", "npm": ">=6" } -} \ No newline at end of file +} diff --git a/src/components/datepicker/js/dateUtil.js b/src/components/datepicker/js/dateUtil.js index ef42a0f3fb5..b848d1e0e2a 100644 --- a/src/components/datepicker/js/dateUtil.js +++ b/src/components/datepicker/js/dateUtil.js @@ -310,8 +310,8 @@ } /** - * @param {Date} value - * @return {boolean|boolean} + * @param {Date} value date in local timezone + * @return {Date} date with local timezone removed */ function removeLocalTzAndReparseDate(value) { var dateValue, formattedDate; diff --git a/src/components/datepicker/js/datepickerDirective.js b/src/components/datepicker/js/datepickerDirective.js index 99efc62406f..48dedf72d06 100644 --- a/src/components/datepicker/js/datepickerDirective.js +++ b/src/components/datepicker/js/datepickerDirective.js @@ -1001,7 +1001,7 @@ var self = this; var timezone = this.$mdUtil.getModelOption(this.ngModelCtrl, 'timezone'); - if (this.dateUtil.isValidDate(value)) { + if (this.dateUtil.isValidDate(value) && timezone != null) { this.date = this.dateUtil.removeLocalTzAndReparseDate(value); } else { this.date = value;