Merge pull request #113 from esripdx/dev

[dev] >> [master] merge for final 1.0.3 release

Author: Ryan Arana

.gitignore

@@ -12,4 +12,3 @@ debug.out
 coverage/
 config.json
 npm-debug.log
-build/

CHANGELOG.md

@@ -6,6 +6,7 @@
 * zoom to extent of all requests when loading a bin
 * catch invalid request URLs
 * fix double-reporting pageview analytics bug (bump angulartics to 0.16.4)
+* use angular date filter to normalize dates across browsers
 
 # 1.0.2
 * refactor services

static/app/js/filters.js

@@ -33,33 +33,33 @@
     };
   }])
 
-  // prettyDate
-  // ----------
-  // turns a unix timestamp into a localized date and time string
-
-  .filter('prettyTime', [function () {
-    return function (ts) {
-      return new Date(ts * 1000).toLocaleTimeString();
-    };
+  // makeDate
+  // --------
+  // turns a unix timestamp into a javascript Date object
+
+  .filter('makeDate', [function () {
+      return function (ts) {
+          return new Date(ts * 1000);
+      };
   }])
 
   // prettyDate
   // ----------
   // turns a unix timestamp into a localized date and time string
 
-  .filter('prettyDate', [function () {
+  .filter('prettyTime', ['$filter', function ($filter) {
     return function (ts) {
-      return new Date(ts * 1000).toLocaleDateString();
+      return $filter('date')(new Date(ts * 1000), 'hh:mm:ss a');
     };
   }])
 
-  // prettyDateTime
-  // --------------
+  // prettyDate
+  // ----------
   // turns a unix timestamp into a localized date and time string
 
-  .filter('prettyDateTime', [function () {
+  .filter('prettyDate', ['$filter', function ($filter) {
     return function (ts) {
-      return new Date(ts * 1000).toLocaleString();
+      return $filter('date')(new Date(ts * 1000), 'MM/dd/yyyy');
     };
   }])
 

static/app/partials/list.html

@@ -12,7 +12,6 @@
         </div>
         <div class="btn"
           data-toggle="tooltip" data-placement="bottom" title="date request was received">
-          <i class="glyphicon glyphicon-calendar"></i>
           {{item.timestamp | prettyDate}}
         </div>
       </div>

test/unit/filtersSpec.js

@@ -31,30 +31,6 @@ describe('filters', function() {
     }));
   });
 
-  describe('prettyDate', function() {
-    it('should turn a unix timestamp into a localized date string', inject(function(prettyDateFilter) {
-      var d = new Date();
-      var ts = Math.floor(d.getTime()/1000);
-      expect(prettyDateFilter(ts)).toBe(d.toLocaleDateString());
-    }));
-  });
-
-  describe('prettyTime', function() {
-    it('should turn a unix timestamp into a localized time string', inject(function(prettyTimeFilter) {
-      var d = new Date();
-      var ts = Math.floor(d.getTime()/1000);
-      expect(prettyTimeFilter(ts)).toBe(d.toLocaleTimeString());
-    }));
-  });
-
-  describe('prettyDateTime', function() {
-    it('should turn a unix timestamp into a localized time string', inject(function(prettyDateTimeFilter) {
-      var d = new Date();
-      var ts = Math.floor(d.getTime()/1000);
-      expect(prettyDateTimeFilter(ts)).toBe(d.toLocaleString());
-    }));
-  });
-
   describe('arrLength', function() {
     it('should return the proper length of a given array', inject(function(arrLengthFilter) {
       expect(arrLengthFilter([0,1,2])).toBe(3);