Events were not being sorted - it was only working because they were being sent from the server in the correct order.

Author: William Becker

public/js/collections/event_locations.js

@@ -75,9 +75,9 @@ define([
     handleResults: function (results) {
       this.queryPending = false;
       results = this.combineEventsAtTheSamePlace(_.cloneDeep(results));
-
       var oldResultsAsKeys = _.map(this.lastResults, this.makeKey, this);
       var newResultsAsKeys = _.map(results, this.makeKey, this);
+
       var toRemove = _.difference(oldResultsAsKeys, newResultsAsKeys);
       var toRender = _.difference(newResultsAsKeys, oldResultsAsKeys);
 
@@ -111,7 +111,7 @@ define([
         location.sort(function (a, b) {
           a = new Date(a.start_date).getTime();
           b = new Date(b.start_date).getTime();
-          return (a - b) / Math.abs(a - b);
+          return a > b ? 1 : (a === b ? 0 : -1);
         });
       });
       return locations;

test/webapp/collections/event_locations.js

@@ -95,7 +95,6 @@ define(
           ]
         );
       });
-      it("should sort things right - the order looks wrong below");
       it("should sort the events within the location by the date of the start_time", function () {
         var result = this.events.combineEventsAtTheSamePlace([{
           location: [[10, -20]],
@@ -112,13 +111,13 @@ define(
             [
               {
                 location: [[10, -20]],
-                start_date: "1900-01-03 00:02"
+                start_date: "1900-01-01 00:00"
               }, {
                 location: [[10, -20]],
                 start_date: "1900-01-02 00:01"
               }, {
                 location: [[10, -20]],
-                start_date: "1900-01-01 00:00"
+                start_date: "1900-01-03 00:02"
               }
             ]
           ]
@@ -161,37 +160,37 @@ define(
           [
             {
               location: [[10, -20]],
-              start_date: "1900-01-01 00:00"
+              start_date: "1900-01-01T00:00:00.000Z"
             }, {
               location: [[10, -20]],
-              start_date: "1900-01-01 00:01"
+              start_date: "1900-01-01T00:01:00.000Z"
             }
           ],
           [
             {
               location: [[10, -21]],
-              start_date: "1900-01-01 00:01"
+              start_date: "1900-01-01T00:01:00.000Z"
             }
           ]
         ];
 
         this.events.handleResults([{
           location: [[10, -20]],
-          start_date: "1900-01-01 00:00"
+          start_date: "1900-01-01T00:00:00.000Z"
         }, {
           location: [[10, -20]],
-          start_date: "1900-01-01 00:01"
+          start_date: "1900-01-01T00:01:00.000Z"
         }, {
           location: [[10, -22]],
-          start_date: "1900-01-01 00:01"
+          start_date: "1900-01-01T00:01:00.000Z"
         }]);
 
         //todo: why this mismatching double arrays around location?
         this.lastReset[0].should.eql([JSON.stringify({
           location: [10, -21],
           events: [{
             location: [[10, -21]],
-            start_date: "1900-01-01 00:01"
+            start_date: "1900-01-01T00:01:00.000Z"
           }]
         })]);
 
@@ -201,37 +200,37 @@ define(
           [
             {
               location: [[10, -20]],
-              start_date: "1900-01-01 00:00"
+              start_date: "1900-01-01T00:00:00.000Z"
             }, {
               location: [[10, -20]],
-              start_date: "1900-01-01 00:01"
+              start_date: "1900-01-01T00:01:00.000Z"
             }
           ],
           [
             {
               location: [[10, -21]],
-              start_date: "1900-01-01 00:01"
+              start_date: "1900-01-01T00:01:00.000Z"
             }
           ]
         ];
 
         this.events.handleResults([{
           location: [[10, -20]],
-          start_date: "1900-01-01 00:00"
+          start_date: "1900-01-01T00:00:00.000Z"
         }, {
           location: [[10, -20]],
-          start_date: "1900-01-01 00:01"
+          start_date: "1900-01-01T00:01:00.000Z"
         }, {
           location: [[10, -22]],
-          start_date: "1900-01-01 00:01"
+          start_date: "1900-01-01T00:01:00.000Z"
         }]);
 
         //todo: why this mismatching double arrays around location?
         this.lastReset[1].should.eql([JSON.stringify({
           location: [10, -22],
           events: [{
             location: [[10, -22]],
-            start_date: "1900-01-01 00:01"
+            start_date: "1900-01-01T00:01:00.000Z"
           }]
         })]);
       });