Skip to content

Commit bb8e4cd

Browse files
committed
Build 1.4.1
1 parent d38e033 commit bb8e4cd

File tree

2 files changed

+64
-48
lines changed

2 files changed

+64
-48
lines changed

lib/teamsnap.js

Lines changed: 61 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -387,18 +387,22 @@ exports.getAssignmentSort = function(reverse) {
387387
valueA = _this.memberName(itemA.member, reverse).toLowerCase();
388388
valueB = _this.memberName(itemB.member, reverse).toLowerCase();
389389
}
390-
if (valueA === valueB) {
391-
return 0;
392-
} else if (!valueA && valueB) {
393-
return 1;
394-
} else if (valueA && !valueB) {
395-
return -1;
396-
} else if (valueA > valueB) {
397-
return 1;
398-
} else if (valueA < valueB) {
399-
return -1;
390+
if (typeof valueA.localeCompare === 'function') {
391+
return valueA.localeCompare(valueB);
400392
} else {
401-
return 0;
393+
if (valueA === valueB) {
394+
return 0;
395+
} else if (!valueA && valueB) {
396+
return 1;
397+
} else if (valueA && !valueB) {
398+
return -1;
399+
} else if (valueA > valueB) {
400+
return 1;
401+
} else if (valueA < valueB) {
402+
return -1;
403+
} else {
404+
return 0;
405+
}
402406
}
403407
};
404408
})(this);
@@ -1675,18 +1679,22 @@ exports.getMemberSort = function(reverse) {
16751679
valueA = _this.memberName(itemA, reverse, true).toLowerCase();
16761680
valueB = _this.memberName(itemB, reverse, true).toLowerCase();
16771681
}
1678-
if (valueA === valueB) {
1679-
return 0;
1680-
} else if (!valueA && valueB) {
1681-
return 1;
1682-
} else if (valueA && !valueB) {
1683-
return -1;
1684-
} else if (valueA > valueB) {
1685-
return 1;
1686-
} else if (valueA < valueB) {
1687-
return -1;
1682+
if (typeof valueA.localeCompare === 'function') {
1683+
return valueA.localeCompare(valueB);
16881684
} else {
1689-
return 0;
1685+
if (valueA === valueB) {
1686+
return 0;
1687+
} else if (!valueA && valueB) {
1688+
return 1;
1689+
} else if (valueA && !valueB) {
1690+
return -1;
1691+
} else if (valueA > valueB) {
1692+
return 1;
1693+
} else if (valueA < valueB) {
1694+
return -1;
1695+
} else {
1696+
return 0;
1697+
}
16901698
}
16911699
};
16921700
})(this);
@@ -4658,18 +4666,22 @@ TeamSnap.prototype.getNameSort = function() {
46584666
valueB = itemB.id;
46594667
}
46604668
}
4661-
if (valueA === valueB) {
4662-
return 0;
4663-
} else if (!valueA && valueB) {
4664-
return 1;
4665-
} else if (valueA && !valueB) {
4666-
return -1;
4667-
} else if (valueA > valueB) {
4668-
return 1;
4669-
} else if (valueA < valueB) {
4670-
return -1;
4669+
if (typeof valueA.localeCompare === 'function') {
4670+
return valueA.localeCompare(valueB);
46714671
} else {
4672-
return 0;
4672+
if (valueA === valueB) {
4673+
return 0;
4674+
} else if (!valueA && valueB) {
4675+
return 1;
4676+
} else if (valueA && !valueB) {
4677+
return -1;
4678+
} else if (valueA > valueB) {
4679+
return 1;
4680+
} else if (valueA < valueB) {
4681+
return -1;
4682+
} else {
4683+
return 0;
4684+
}
46734685
}
46744686
};
46754687
};
@@ -4689,18 +4701,22 @@ TeamSnap.prototype.getDefaultSort = function() {
46894701
valueB = itemB.id;
46904702
}
46914703
}
4692-
if (valueA === valueB) {
4693-
return 0;
4694-
} else if (!valueA && valueB) {
4695-
return 1;
4696-
} else if (valueA && !valueB) {
4697-
return -1;
4698-
} else if (valueA > valueB) {
4699-
return 1;
4700-
} else if (valueA < valueB) {
4701-
return -1;
4704+
if (typeof valueA.localeCompare === 'function') {
4705+
return valueA.localeCompare(valueB);
47024706
} else {
4703-
return 0;
4707+
if (valueA === valueB) {
4708+
return 0;
4709+
} else if (!valueA && valueB) {
4710+
return 1;
4711+
} else if (valueA && !valueB) {
4712+
return -1;
4713+
} else if (valueA > valueB) {
4714+
return 1;
4715+
} else if (valueA < valueB) {
4716+
return -1;
4717+
} else {
4718+
return 0;
4719+
}
47044720
}
47054721
};
47064722
};
@@ -4875,7 +4891,7 @@ ref = require('./model'), Collection = ref.Collection, Item = ref.Item;
48754891
require('./errors');
48764892

48774893
TeamSnap = (function() {
4878-
TeamSnap.prototype.version = '1.4.0';
4894+
TeamSnap.prototype.version = '1.4.1';
48794895

48804896
TeamSnap.prototype.promises = promises;
48814897

0 commit comments

Comments
 (0)