osr-plastic/osr-discourse-src
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

TRIVIAL: fix deprecations due to momentjs upgrade

Browse Source
This commit is contained in:
Régis Hanol
2014-08-20 22:22:58 +02:00
parent 33de48dc0c
commit 5b1785157d
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/assets/javascripts/admin/models/email_preview.js
+1 -1
View File
@@ -12,7 +12,7 @@ Discourse.EmailPreview.reopenClass({
findDigest: function(lastSeenAt) {
if (Em.isEmpty(lastSeenAt)) {
lastSeenAt = moment().subtract('days',7).format('YYYY-MM-DD');
lastSeenAt = moment().subtract(7, 'days').format('YYYY-MM-DD');
}
return Discourse.ajax("/admin/email/preview-digest.json", {
app/assets/javascripts/admin/models/report.js
+3 -3
View File
@@ -5,7 +5,7 @@ Discourse.Report = Discourse.Model.extend({
valueAt: function(numDaysAgo) {
if (this.data) {
var wantedDate = moment().subtract('days', numDaysAgo).format('YYYY-MM-DD');
var wantedDate = moment().subtract(numDaysAgo, 'days').format('YYYY-MM-DD');
var item = this.data.find( function(d) { return d.x === wantedDate; } );
if (item) {
return item.y;
@@ -16,8 +16,8 @@ Discourse.Report = Discourse.Model.extend({
sumDays: function(startDaysAgo, endDaysAgo) {
if (this.data) {
var earliestDate = moment().subtract('days', endDaysAgo).startOf('day');
var latestDate = moment().subtract('days',startDaysAgo).startOf('day');
var earliestDate = moment().subtract(endDaysAgo, 'days').startOf('day');
var latestDate = moment().subtract(startDaysAgo, 'days').startOf('day');
var d, sum = 0;
_.each(this.data,function(datum){
d = moment(datum.x);