github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 14:07:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

removed sugar.js, port functionality to moment and underscore.js

Browse Source 
bring in latest ace from local so we don't mess up with https
This commit is contained in:
Sam
2013-06-11 06:48:50 +10:00
parent eed5875505
commit fa8a84f20c
211 changed files with 1773 additions and 8914 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/admin/models/report.js
View File

@ -5,7 +5,7 @@ Discourse.Report = Discourse.Model.extend({
valueAt: function(numDaysAgo) {
if (this.data) {
var wantedDate = Date.create(numDaysAgo + ' days ago', 'en').format('{yyyy}-{MM}-{dd}');
var wantedDate = moment().subtract('days', numDaysAgo).format('YYYY-MM-DD');
var item = this.data.find( function(d, i, arr) { return d.x === wantedDate; } );
if (item) {
return item.y;
@ -16,11 +16,11 @@ Discourse.Report = Discourse.Model.extend({
sumDays: function(startDaysAgo, endDaysAgo) {
if (this.data) {
var earliestDate = Date.create(endDaysAgo + ' days ago', 'en').beginningOfDay();
var latestDate = Date.create(startDaysAgo + ' days ago', 'en').beginningOfDay();
var earliestDate = moment().subtract('days', endDaysAgo).startOf('day');
var latestDate = moment().subtract('days',startDaysAgo).startOf('day');
var d, sum = 0;
this.data.each(function(datum){
d = Date.create(datum.x);
_.each(this.data,function(datum){
d = moment(datum.x);
if(d >= earliestDate && d <= latestDate) {
sum += datum.y;
}