Skip to content

Commit

Permalink
Support for AngularJS 1.6.x
Browse files Browse the repository at this point in the history
  • Loading branch information
hexadecy committed Jan 31, 2017
1 parent 9a8b036 commit fc51fca
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 13 deletions.
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Originally designed for Bootstrap Material, this has been modified to work with

| Date | Author | Description |
| ----------------- | ----------------- | ------------------------------------------------------ |
| 2017-01-30 | hexadecy | Add support only for angular 1.5.x - 1.6.x ($onInit) |
| 2015-11-12 | logbon72 | Adapted plugin for Angular Material |
| 2015-10-19 | benletchford | Fixed not being able to tab into input |
| 2015-10-19 | drblue | Fixed erroneous package.json-file |
Expand Down
6 changes: 3 additions & 3 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,9 @@ <h2>
</md-card>
</md-content>

<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.7/angular.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.7/angular-animate.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.4.7/angular-aria.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.1/angular.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.1/angular-animate.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.6.1/angular-aria.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/angular-material/1.1.1/angular-material.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.17.1/moment-with-locales.min.js"></script>
<script type="text/javascript"
Expand Down
7 changes: 3 additions & 4 deletions js/angular-material-datetimepicker.js
Original file line number Diff line number Diff line change
Expand Up @@ -599,8 +599,8 @@ angular.module(moduleName)
},
bindToController: true,
controllerAs: 'cal',
controller: ['$scope',
function ($scope) {
controller: ['$scope', function ($scope) {
this.$onInit = function() {
var calendar = this,
picker = this.picker,
days = [];
Expand Down Expand Up @@ -709,9 +709,8 @@ angular.module(moduleName)

return m && today.date() === m.date() && today.month() === m.month() && today.year() === m.year();
}

}
],
}],
template: '<md-virtual-repeat-container md-top-index="cal.topIndex" class="months">' +
'<div md-virtual-repeat="idx in ::cal.months" md-auto-shrink md-item-size="' + ITEM_HEIGHT + '">' +
' <div mdc-datetime-picker-calendar-month idx="idx"></div>' +
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@
"homepage": "http://logbon72.github.io/angular-material-datetimepicker/",
"main": "js/angular-material-datetimepicker.js",
"dependencies": {
"angular": "^1.5.10",
"angular-animate": "^1.5.10",
"angular-aria": "^1.5.10",
"angular": "^1.6.1",
"angular-animate": "^1.6.1",
"angular-aria": "^1.6.1",
"angular-material": "^1.1.1",
"moment": "^2.17.1"
},
Expand Down
6 changes: 3 additions & 3 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
# yarn lockfile v1


angular-animate@^1.5.10:
angular-animate@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/angular-animate/-/angular-animate-1.6.1.tgz#19e3b82b7392e2bbdd83af33c0af0d85437f3a14"

angular-aria@^1.5.10:
angular-aria@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/angular-aria/-/angular-aria-1.6.1.tgz#0fcbf1152b4c26e8671daddea7443a1b983434b9"

angular-material@^1.1.1:
version "1.1.2"
resolved "https://registry.yarnpkg.com/angular-material/-/angular-material-1.1.2.tgz#7a5aeebaa350bba8e97c68804b994cfd60c3d125"

angular@^1.5.10:
angular@^1.6.1:
version "1.6.1"
resolved "https://registry.yarnpkg.com/angular/-/angular-1.6.1.tgz#a7b6d763a74c157325692619e97257e69d9b6a27"

Expand Down

0 comments on commit fc51fca

Please sign in to comment.