diff --git a/app/assets/javascripts/admin/models/email_preview.js b/app/assets/javascripts/admin/models/email_preview.js
index 648e489d6ab..b754095812c 100644
--- a/app/assets/javascripts/admin/models/email_preview.js
+++ b/app/assets/javascripts/admin/models/email_preview.js
@@ -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", {
diff --git a/app/assets/javascripts/admin/models/report.js b/app/assets/javascripts/admin/models/report.js
index 940f8b0e714..a182d846813 100644
--- a/app/assets/javascripts/admin/models/report.js
+++ b/app/assets/javascripts/admin/models/report.js
@@ -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);
diff --git a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6 b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
index fbcb2eb154c..a83d2bb93d5 100644
--- a/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
+++ b/app/assets/javascripts/admin/routes/admin-dashboard.js.es6
@@ -15,7 +15,7 @@ export default Discourse.Route.extend({
},
fetchDashboardData: function(c) {
- if( !c.get('dashboardFetchedAt') || moment().subtract('minutes', 30).toDate() > c.get('dashboardFetchedAt') ) {
+ if( !c.get('dashboardFetchedAt') || moment().subtract(30, 'minutes').toDate() > c.get('dashboardFetchedAt') ) {
c.set('dashboardFetchedAt', new Date());
Discourse.AdminDashboard.find().then(function(d) {
if( Discourse.SiteSettings.version_checks ){
@@ -41,14 +41,14 @@ export default Discourse.Route.extend({
});
}
- if( !c.get('problemsFetchedAt') || moment().subtract('minute',c.problemsCheckMinutes).toDate() > c.get('problemsFetchedAt') ) {
+ if( !c.get('problemsFetchedAt') || moment().subtract(c.problemsCheckMinutes, 'minutes').toDate() > c.get('problemsFetchedAt') ) {
c.set('problemsFetchedAt', new Date());
c.loadProblems();
}
},
fetchGithubCommits: function(c) {
- if( !c.get('commitsCheckedAt') || moment().subtract('hour',1).toDate() > c.get('commitsCheckedAt') ) {
+ if( !c.get('commitsCheckedAt') || moment().subtract(1, 'hour').toDate() > c.get('commitsCheckedAt') ) {
c.set('commitsCheckedAt', new Date());
c.set('githubCommits', Discourse.GithubCommit.findAll());
}
diff --git a/app/assets/javascripts/admin/routes/admin_email_preview_digest_route.js b/app/assets/javascripts/admin/routes/admin_email_preview_digest_route.js
index b2616ba1aed..511b56bbfec 100644
--- a/app/assets/javascripts/admin/routes/admin_email_preview_digest_route.js
+++ b/app/assets/javascripts/admin/routes/admin_email_preview_digest_route.js
@@ -17,7 +17,7 @@ Discourse.AdminEmailPreviewDigestRoute = Discourse.Route.extend({
var controller = this.controllerFor('adminEmailPreviewDigest');
controller.setProperties({
model: model,
- lastSeen: moment().subtract('days',7).format('YYYY-MM-DD'),
+ lastSeen: moment().subtract(7, 'days').format('YYYY-MM-DD'),
showHtml: true
});
}
diff --git a/test/javascripts/lib/formatter-test.js.es6 b/test/javascripts/lib/formatter-test.js.es6
index 0a1b2ace45f..0bcd609f067 100644
--- a/test/javascripts/lib/formatter-test.js.es6
+++ b/test/javascripts/lib/formatter-test.js.es6
@@ -29,7 +29,7 @@ var formatDays = function(days) {
};
var shortDate = function(days){
- return moment().subtract('days', days).format('D MMM');
+ return moment().subtract(days, 'days').format('D MMM');
};
test("formating medium length dates", function() {
@@ -40,7 +40,7 @@ test("formating medium length dates", function() {
};
var shortDateYear = function(days){
- return moment().subtract('days', days).format('D MMM YYYY');
+ return moment().subtract(days, 'days').format('D MMM YYYY');
};
leaveAgo = true;
@@ -81,7 +81,7 @@ test("formating medium length dates", function() {
test("formating tiny dates", function() {
var shortDateYear = function(days){
- return moment().subtract('days', days).format("MMM 'YY");
+ return moment().subtract(days, 'days').format("MMM 'YY");
};
format = "tiny";
@@ -144,7 +144,7 @@ test("formating tiny dates", function() {
module("Discourse.Formatter");
test("autoUpdatingRelativeAge", function() {
- var d = moment().subtract('days',1).toDate();
+ var d = moment().subtract(1, 'day').toDate();
var $elem = $(Discourse.Formatter.autoUpdatingRelativeAge(d));
equal($elem.data('format'), "tiny");
diff --git a/test/javascripts/models/report-test.js.es6 b/test/javascripts/models/report-test.js.es6
index 58d8e9ca78b..7ac9e2c9b91 100644
--- a/test/javascripts/models/report-test.js.es6
+++ b/test/javascripts/models/report-test.js.es6
@@ -4,7 +4,7 @@ function reportWithData(data) {
return Discourse.Report.create({
type: 'topics',
data: _.map(data, function(val, index) {
- return {x: moment().subtract("days", index).format('YYYY-MM-DD'), y: val};
+ return { x: moment().subtract(index, "days").format('YYYY-MM-DD'), y: val };
})
});
}
diff --git a/test/javascripts/models/version-check-test.js.es6 b/test/javascripts/models/version-check-test.js.es6
index b03102a53af..c0e6d3e8b25 100644
--- a/test/javascripts/models/version-check-test.js.es6
+++ b/test/javascripts/models/version-check-test.js.es6
@@ -5,14 +5,14 @@ test('dataIsOld', function() {
equal(Discourse.VersionCheck.create(args).get('dataIsOld'), expected, message);
};
- dataIsOld({updated_at: moment().subtract('hours', 2).toJSON()}, false, '2 hours ago');
- dataIsOld({updated_at: moment().subtract('hours', 49).toJSON()}, true, '49 hours ago');
- dataIsOld({updated_at: moment().subtract('hours', 2).toJSON(), version_check_pending: true}, true, 'version check pending');
+ dataIsOld({updated_at: moment().subtract(2, 'hours').toJSON()}, false, '2 hours ago');
+ dataIsOld({updated_at: moment().subtract(49, 'hours').toJSON()}, true, '49 hours ago');
+ dataIsOld({updated_at: moment().subtract(2, 'hours').toJSON(), version_check_pending: true}, true, 'version check pending');
});
test('staleData', function() {
var updatedAt = function(hoursAgo) {
- return moment().subtract('hours', hoursAgo).toJSON();
+ return moment().subtract(hoursAgo, 'hours').toJSON();
};
var staleData = function(args, expected, message) {
equal(Discourse.VersionCheck.create(args).get('staleData'), expected, message);