Merge pull request #52 from teamsnap/fix-sort-null

Account for null sort value

Author: matthopson

lib/teamsnap.js

@@ -387,7 +387,7 @@ exports.getAssignmentSort = function(reverse) {
         valueA = _this.memberName(itemA.member, reverse).toLowerCase();
         valueB = _this.memberName(itemB.member, reverse).toLowerCase();
       }
-      if (typeof valueA.localeCompare === 'function') {
+      if (typeof (valueA != null ? valueA.localeCompare : void 0) === 'function') {
         return valueA.localeCompare(valueB);
       } else {
         if (valueA === valueB) {
@@ -1693,7 +1693,7 @@ exports.getMemberSort = function(reverse) {
         valueA = _this.memberName(itemA, reverse, true).toLowerCase();
         valueB = _this.memberName(itemB, reverse, true).toLowerCase();
       }
-      if (typeof valueA.localeCompare === 'function') {
+      if (typeof (valueA != null ? valueA.localeCompare : void 0) === 'function') {
         return valueA.localeCompare(valueB);
       } else {
         if (valueA === valueB) {
@@ -4715,7 +4715,7 @@ TeamSnap.prototype.getNameSort = function() {
         valueB = itemB.id;
       }
     }
-    if (typeof valueA.localeCompare === 'function') {
+    if (typeof (valueA != null ? valueA.localeCompare : void 0) === 'function') {
       return valueA.localeCompare(valueB);
     } else {
       if (valueA === valueB) {
@@ -4750,7 +4750,7 @@ TeamSnap.prototype.getDefaultSort = function() {
         valueB = itemB.id;
       }
     }
-    if (typeof valueA.localeCompare === 'function') {
+    if (typeof (valueA != null ? valueA.localeCompare : void 0) === 'function') {
       return valueA.localeCompare(valueB);
     } else {
       if (valueA === valueB) {
@@ -4942,7 +4942,7 @@ ref = require('./model'), Collection = ref.Collection, Item = ref.Item;
 require('./errors');
 
 TeamSnap = (function() {
-  TeamSnap.prototype.version = '1.4.1';
+  TeamSnap.prototype.version = '1.5.1';
 
   TeamSnap.prototype.promises = promises;
 

lib/teamsnap.min.js

@@ -1,6 +1,6 @@
 {
   "name": "teamsnap.js",
-  "version": "1.5.0",
+  "version": "1.5.1",
   "description": "A JavaScript library for using the TeamSnap API.",
   "author": "Jacob Wright with TeamSnap (http://www.teamsnap.com)",
   "homepage": "https://github.com/teamsnap/teamsnap-javascript-sdk",

package.json

@@ -51,7 +51,7 @@ exports.getAssignmentSort = (reverse) ->
       valueA = @memberName(itemA.member, reverse).toLowerCase()
       valueB = @memberName(itemB.member, reverse).toLowerCase()
     # Let's try to use `localeCompare()` if available
-    if typeof valueA.localeCompare is 'function'
+    if typeof valueA?.localeCompare is 'function'
       valueA.localeCompare valueB
     else
       if valueA is valueB then 0

src/collections/assignments.coffee

@@ -116,7 +116,7 @@ exports.getMemberSort = (reverse) ->
       valueA = @memberName(itemA, reverse, true).toLowerCase()
       valueB = @memberName(itemB, reverse, true).toLowerCase()
     # Let's try to use `localeCompare()` if available
-    if typeof valueA.localeCompare is 'function'
+    if typeof valueA?.localeCompare is 'function'
       valueA.localeCompare valueB
     else
       if valueA is valueB then 0

src/collections/members.coffee

@@ -98,7 +98,7 @@ TeamSnap::getNameSort = ->
         valueA = itemA.id
         valueB = itemB.id
     # Let's try to use `localeCompare()` if available
-    if typeof valueA.localeCompare is 'function'
+    if typeof valueA?.localeCompare is 'function'
       valueA.localeCompare valueB
     else
       if valueA is valueB then 0
@@ -122,7 +122,7 @@ TeamSnap::getDefaultSort = ->
         valueA = itemA.id
         valueB = itemB.id
     # Let's try to use `localeCompare()` if available
-    if typeof valueA.localeCompare is 'function'
+    if typeof valueA?.localeCompare is 'function'
       valueA.localeCompare valueB
     else
       if valueA is valueB then 0

src/sdk.coffee

@@ -3,7 +3,7 @@ promises = require './promises'
 require './errors'
 
 class TeamSnap
-  version: '1.5.0'
+  version: '1.5.1'
   promises: promises
   when: promises.when
   TeamSnap: TeamSnap