github
/
AdminLTE
mirror of https://github.com/ColorlibHQ/AdminLTE
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #459 from suvjunmd/momentjs 

Fixed Moment.js deprecation warning
pull/454/merge
Abdullah Almsaeed 2015-05-27 14:07:23 +03:00
parent a0b752343d f6c3fb88d1
commit 1bccec3bca
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dist/js/pages/dashboard.js vendored
View File

@ -33,13 +33,13 @@ $(function () {
{ {
ranges: { ranges: {
'Today': [moment(), moment()], 'Today': [moment(), moment()],
'Yesterday': [moment().subtract('days', 1), moment().subtract('days', 1)], 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract('days', 6), moment()], 'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract('days', 29), moment()], 'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')], 'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')] 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}, },
startDate: moment().subtract('days', 29), startDate: moment().subtract(29, 'days'),
endDate: moment() endDate: moment()
}, },
function (start, end) { function (start, end) {

10
pages/forms/advanced.html
View File

@ -940,13 +940,13 @@
{ {
ranges: { ranges: {
'Today': [moment(), moment()], 'Today': [moment(), moment()],
'Yesterday': [moment().subtract('days', 1), moment().subtract('days', 1)], 'Yesterday': [moment().subtract(1, 'days'), moment().subtract(1, 'days')],
'Last 7 Days': [moment().subtract('days', 6), moment()], 'Last 7 Days': [moment().subtract(6, 'days'), moment()],
'Last 30 Days': [moment().subtract('days', 29), moment()], 'Last 30 Days': [moment().subtract(29, 'days'), moment()],
'This Month': [moment().startOf('month'), moment().endOf('month')], 'This Month': [moment().startOf('month'), moment().endOf('month')],
'Last Month': [moment().subtract('month', 1).startOf('month'), moment().subtract('month', 1).endOf('month')] 'Last Month': [moment().subtract(1, 'month').startOf('month'), moment().subtract(1, 'month').endOf('month')]
}, },
startDate: moment().subtract('days', 29), startDate: moment().subtract(29, 'days'),
endDate: moment() endDate: moment()
}, },
function (start, end) { function (start, end) {