Skip to content

Commit 9216c29

Browse files
Merge branch 'master-local' into master-dist
2 parents ba77b22 + 2f50b65 commit 9216c29

File tree

50 files changed

+357
-245
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+357
-245
lines changed

dist/angular-patternfly.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,16 +3319,23 @@ angular.module('patternfly.form').directive('pfDatepicker', function () {
33193319
element.datepicker('update', $scope.date);
33203320

33213321
//Change happened on the date picker side. Update the underlying date model
3322-
element.datepicker($scope.date).on('changeDate', function (elem) {
3322+
element.datepicker($scope.date).on('changeDate clearDate', function (elem) {
33233323
$scope.$apply(function () {
33243324
$scope.date = elem.date;
33253325
});
33263326
});
33273327

33283328
//Update the date picker if there is a change on the date model
33293329
$scope.$watch('date', function (newValue, oldValue) {
3330+
var elemDate;
33303331
if (oldValue !== newValue) {
3331-
element.datepicker('update', newValue);
3332+
elemDate = element.datepicker('getDate');
3333+
if (!elemDate || !newValue || elemDate.getTime() !== newValue.getTime()) {
3334+
//Update date picker value only when there is a change
3335+
//to avoid resetting when a wrong date is typed
3336+
//into input.
3337+
element.datepicker('update', newValue);
3338+
}
33323339
}
33333340
});
33343341
}

dist/angular-patternfly.min.js

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/grunt-scripts/angular-animate.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* @license AngularJS v1.5.10
3-
* (c) 2010-2016 Google, Inc. http://angularjs.org
2+
* @license AngularJS v1.5.11
3+
* (c) 2010-2017 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
66
(function(window, angular) {'use strict';

dist/docs/grunt-scripts/angular-patternfly.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3319,16 +3319,23 @@ angular.module('patternfly.form').directive('pfDatepicker', function () {
33193319
element.datepicker('update', $scope.date);
33203320

33213321
//Change happened on the date picker side. Update the underlying date model
3322-
element.datepicker($scope.date).on('changeDate', function (elem) {
3322+
element.datepicker($scope.date).on('changeDate clearDate', function (elem) {
33233323
$scope.$apply(function () {
33243324
$scope.date = elem.date;
33253325
});
33263326
});
33273327

33283328
//Update the date picker if there is a change on the date model
33293329
$scope.$watch('date', function (newValue, oldValue) {
3330+
var elemDate;
33303331
if (oldValue !== newValue) {
3331-
element.datepicker('update', newValue);
3332+
elemDate = element.datepicker('getDate');
3333+
if (!elemDate || !newValue || elemDate.getTime() !== newValue.getTime()) {
3334+
//Update date picker value only when there is a change
3335+
//to avoid resetting when a wrong date is typed
3336+
//into input.
3337+
element.datepicker('update', newValue);
3338+
}
33323339
}
33333340
});
33343341
}

dist/docs/grunt-scripts/angular-sanitize.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/**
2-
* @license AngularJS v1.5.10
3-
* (c) 2010-2016 Google, Inc. http://angularjs.org
2+
* @license AngularJS v1.5.11
3+
* (c) 2010-2017 Google, Inc. http://angularjs.org
44
* License: MIT
55
*/
66
(function(window, angular) {'use strict';

0 commit comments

Comments
 (0)