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

bring in latest ace from local so we don't mess up with https

Author: SamSaffron

app/assets/javascripts/admin/controllers/admin_dashboard_controller.js

@@ -9,7 +9,7 @@
 Discourse.AdminDashboardController = Ember.Controller.extend({
   loading: true,
   versionCheck: null,
-  problemsCheckInterval: '1 minute ago',
+  problemsCheckMinutes: 1,
 
   foundProblems: function() {
     return(Discourse.User.current('admin') && this.get('problems') && this.get('problems').length > 0);
@@ -33,9 +33,9 @@ Discourse.AdminDashboardController = Ember.Controller.extend({
       c.set('problems', d.problems);
       c.set('loadingProblems', false);
       if( d.problems && d.problems.length > 0 ) {
-        c.problemsCheckInterval = '1 minute ago';
+        c.problemsCheckInterval = 1;
       } else {
-        c.problemsCheckInterval = '10 minutes ago';
+        c.problemsCheckInterval = 10;
       }
     });
   },

app/assets/javascripts/admin/controllers/admin_users_list_controller.js

@@ -20,7 +20,7 @@ Discourse.AdminUsersListController = Ember.ArrayController.extend(Discourse.Pres
   **/
   selectAllChanged: function() {
     var _this = this;
-    this.get('content').each(function(user) {
+    _.each(this.get('content'),function(user) {
       user.set('selected', _this.get('selectAll'));
     });
   }.observes('selectAll'),

app/assets/javascripts/admin/models/admin_user.js

@@ -76,9 +76,9 @@ Discourse.AdminUser = Discourse.User.extend({
   }).property('admin', 'moderator'),
 
   banDuration: (function() {
-    var banned_at = Date.create(this.banned_at);
-    var banned_till = Date.create(this.banned_till);
-    return banned_at.short() + " - " + banned_till.short();
+    var banned_at = moment(this.banned_at);
+    var banned_till = moment(this.banned_till);
+    return banned_at.format('L') + " - " + banned_till.format('L');
   }).property('banned_till', 'banned_at'),
 
   ban: function() {

app/assets/javascripts/admin/models/email_log.js

@@ -21,7 +21,7 @@ Discourse.EmailLog.reopenClass({
     Discourse.ajax("/admin/email/logs.json", {
       data: { filter: filter }
     }).then(function(logs) {
-      logs.each(function(log) {
+      _.each(logs,function(log) {
         result.pushObject(Discourse.EmailLog.create(log));
       });
     });

app/assets/javascripts/admin/models/flagged_post.js

@@ -12,8 +12,8 @@ Discourse.FlaggedPost = Discourse.Post.extend({
     var r,
       _this = this;
     r = [];
-    this.post_actions.each(function(a) {
-      return r.push(_this.userLookup[a.user_id]);
+    _.each(this.post_actions, function(action) {
+      r.push(_this.userLookup[action.user_id]);
     });
     return r;
   }.property(),
@@ -22,12 +22,12 @@ Discourse.FlaggedPost = Discourse.Post.extend({
     var r,
       _this = this;
     r = [];
-    this.post_actions.each(function(a) {
-      if (a.message) {
-        return r.push({
-          user: _this.userLookup[a.user_id],
-          message: a.message,
-          permalink: a.permalink
+    _.each(this.post_actions,function(action) {
+      if (action.message) {
+        r.push({
+          user: _this.userLookup[action.user_id],
+          message: action.message,
+          permalink: action.permalink
         });
       }
     });
@@ -69,11 +69,11 @@ Discourse.FlaggedPost.reopenClass({
     result.set('loading', true);
     Discourse.ajax("/admin/flags/" + filter + ".json").then(function(data) {
       var userLookup = {};
-      data.users.each(function(u) {
-        userLookup[u.id] = Discourse.User.create(u);
+      _.each(data.users,function(user) {
+        userLookup[user.id] = Discourse.User.create(user);
       });
-      data.posts.each(function(p) {
-        var f = Discourse.FlaggedPost.create(p);
+      _.each(data.posts,function(post) {
+        var f = Discourse.FlaggedPost.create(post);
         f.userLookup = userLookup;
         result.pushObject(f);
       });

app/assets/javascripts/admin/models/github_commit.js

@@ -20,7 +20,7 @@ Discourse.GithubCommit = Discourse.Model.extend({
   }.property("sha"),
 
   timeAgo: function() {
-    return Date.create(this.get('commit.committer.date')).relative();
+    return Discourse.Formatter.relativeAge(new Date(this.get('commit.committer.date'), {format: 'medium', leaveAgo: true}));
   }.property("commit.committer.date")
 });
 
@@ -32,10 +32,10 @@ Discourse.GithubCommit.reopenClass({
       type: 'get',
       data: { per_page: 40 }
     }).then(function (response) {
-      response.data.each(function(commit) {
+      _.each(response.data,function(commit) {
         result.pushObject( Discourse.GithubCommit.create(commit) );
       });
     });
     return result;
   }
-});
+});

app/assets/javascripts/admin/models/group.js

@@ -15,7 +15,7 @@ Discourse.Group = Discourse.Model.extend({
       var group = this;
       Discourse.ajax('/admin/groups/' + this.get('id') + '/users').then(function(payload){
         var users = Em.A()
-        payload.each(function(user){
+        _.each(payload,function(user){
           users.addObject(Discourse.User.create(user));
         });
         group.set('users', users)
@@ -28,7 +28,7 @@ Discourse.Group = Discourse.Model.extend({
     var users = this.get('users');
     var usernames = "";
     if(users) {
-      usernames = $.map(users, function(user){
+      usernames = _.map(users, function(user){
         return user.get('username');
       }).join(',')
     }
@@ -82,7 +82,7 @@ Discourse.Group.reopenClass({
     var list = Discourse.SelectableArray.create();
 
     Discourse.ajax("/admin/groups.json").then(function(groups){
-      groups.each(function(group){
+      _.each(groups,function(group){
         list.addObject(Discourse.Group.create(group));
       });
     });

app/assets/javascripts/admin/models/report.js

@@ -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;
         }

app/assets/javascripts/admin/models/site_customization.js

@@ -23,7 +23,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
     var _this = this;
     if(!this.originals) return false;
 
-    var changed = this.trackedProperties.any(function(p) {
+    var changed = _.some(this.trackedProperties,function(p) {
       return _this.originals[p] !== _this.get(p);
     });
 
@@ -38,8 +38,8 @@ Discourse.SiteCustomization = Discourse.Model.extend({
   startTrackingChanges: function() {
     var _this = this;
     var originals = {};
-    this.trackedProperties.each(function(p) {
-      originals[p] = _this.get(p);
+    _.each(this.trackedProperties,function(prop) {
+      originals[prop] = _this.get(prop);
       return true;
     });
     this.set('originals', originals);
@@ -90,7 +90,7 @@ Discourse.SiteCustomization = Discourse.Model.extend({
 var SiteCustomizations = Ember.ArrayProxy.extend({
   selectedItemChanged: function() {
     var selected = this.get('selectedItem');
-    return this.get('content').each(function(i) {
+    _.each(this.get('content'),function(i) {
       return i.set('selected', selected === i);
     });
   }.observes('selectedItem')
@@ -101,7 +101,7 @@ Discourse.SiteCustomization.reopenClass({
     var customizations = SiteCustomizations.create({ content: [], loading: true });
     Discourse.ajax("/admin/site_customizations").then(function (data) {
       if (data) {
-        data.site_customizations.each(function(c) {
+        _.each(data.site_customizations,function(c) {
           customizations.pushObject(Discourse.SiteCustomization.create(c.site_customizations));
         });
       }

app/assets/javascripts/admin/models/site_setting.js

@@ -91,7 +91,7 @@ Discourse.SiteSetting.reopenClass({
   findAll: function() {
     var result = Em.A();
     Discourse.ajax("/admin/site_settings").then(function (settings) {
-      settings.site_settings.each(function(s) {
+      _.each(settings.site_settings,function(s) {
         s.originalValue = s.value;
         result.pushObject(Discourse.SiteSetting.create(s));
       });