Skip to content

ng-change compatibility #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ng-change compatibility #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions demoApp/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@

<md-card flex layout="column" layout-align="center center">
<span class="md-headline">12 Hour Time</span>
<md-time-picker ng-model="time.twelve" message="message"></md-time-picker>
<md-time-picker ng-model="time.twelve" message="message" ng-change="timeChanged()"></md-time-picker>
{{'Hours: ' + time.twelve.getHours()}}<br>
{{'Minutes: ' + time.twelve.getMinutes()}}
</md-card>

<md-card flex layout="column" layout-align="center center">
<span class="md-headline">24 Hour Time</span>
<md-time-picker ng-model="time.twentyfour" message="message" no-meridiem no-auto-switch></md-time-picker>
<md-time-picker ng-model="time.twentyfour" ng-change="timeChanged()" message="message" no-meridiem no-auto-switch></md-time-picker>
{{'Hours: ' + time.twentyfour.getHours()}}<br>
{{'Minutes: ' + time.twentyfour.getMinutes()}}
</md-card>
Expand Down
18 changes: 13 additions & 5 deletions dist/md-time-picker.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,12 @@

return {

restrict: 'E',
restrict: 'EA',
scope: {
type: '@',
message: '@',
ngModel: '=',
ngChange: '&',
readOnly: '<', // true or false
mandatory: '<' // true or false
},
Expand Down Expand Up @@ -167,20 +168,23 @@
$scope.time[$scope.type] = next;
updateTime(parseInt(next));
$rootScope.$emit('mdpTimePickerUpdated');
if ($scope.ngChange) $scope.ngChange();
}

$scope.decrease = function() {
var next = decrease($scope.time[$scope.type], $scope.min, $scope.max, $scope.type);
$scope.time[$scope.type] = next;
updateTime(parseInt(next));
$rootScope.$emit('mdpTimePickerUpdated');
if ($scope.ngChange) $scope.ngChange();
}

$scope.handleInput = function(blur) {
var next = handleInput($scope.time[$scope.type], $scope.max, blur, $scope.type);
$scope.time[$scope.type] = next;
updateTime(parseInt(next));
$rootScope.$emit('mdpTimePickerUpdated');
if ($scope.ngChange) $scope.ngChange();
}

$scope.handleKeypress = function(ev) {
Expand All @@ -202,6 +206,7 @@
message: '@',
readOnly: '<', // true or false
ngModel: '=',
ngChange: '&',
mandatory: '<' // true or false
},
template: '<md-input-container md-no-float>' +
Expand Down Expand Up @@ -242,11 +247,12 @@
if ($scope.meridiem === 'AM') $scope.$parent.$parent.ngModel.setHours(hours-12);
else $scope.$parent.$parent.ngModel.setHours(hours+12);
$rootScope.$emit('mdpTimePickerUpdated');
if ($scope.ngChange) $scope.ngChange();
}

var removeListener = $scope.$on('mdpTimePickerModalUpdated', setMeridiem);
$scope.$on('$destroy', removeListener);

}]

}
Expand All @@ -261,6 +267,7 @@
scope: {
message: '<',
ngModel: '=',
ngChange: '&',
readOnly: '<', // true or false
mandatory: '<' // true or false
},
Expand All @@ -271,10 +278,10 @@
'</md-icon>' +
'<div class="md-ripple-container"></div>' +
'</button>' +
'<md-hours-minutes type="HH" ng-model="ngModel" message="{{message.hour}}" read-only="readOnly" mandatory="mandatory"></md-hours-minutes>' +
'<md-hours-minutes type="HH" ng-model="ngModel" ng-change="ngChange()" message="{{message.hour}}" read-only="readOnly" mandatory="mandatory"></md-hours-minutes>' +
'<span class="time-colon">:</span>' +
'<md-hours-minutes type="MM" ng-model="ngModel" message="{{message.minute}}" read-only="readOnly" mandatory="mandatory"></md-hours-minutes>' +
'<md-meridiem ng-if="!noMeridiem" ng-model="ngModel" message="{{message.meridiem}}" read-only="readOnly" mandatory="mandatory"></md-meridiem>' +
'<md-hours-minutes type="MM" ng-model="ngModel" ng-change="ngChange()" message="{{message.minute}}" read-only="readOnly" mandatory="mandatory"></md-hours-minutes>' +
'<md-meridiem ng-if="!noMeridiem" ng-model="ngModel" ng-change="ngChange()" message="{{message.meridiem}}" read-only="readOnly" mandatory="mandatory"></md-meridiem>' +
'</ng-form>',
controller: ["$scope", "$rootScope", "$mdpTimePicker", "$attrs", function($scope, $rootScope, $mdpTimePicker, $attrs) {

Expand All @@ -298,6 +305,7 @@
$scope.ngModel.setMinutes(time.getMinutes());
$scope.$broadcast('mdpTimePickerModalUpdated');
$rootScope.$emit('mdpTimePickerUpdated');
if ($scope.ngChange) $scope.ngChange();
});

}
Expand Down