summaryrefslogtreecommitdiffstats
path: root/webapp/utils
diff options
context:
space:
mode:
Diffstat (limited to 'webapp/utils')
-rw-r--r--webapp/utils/async_client.jsx6
-rw-r--r--webapp/utils/utils.jsx10
2 files changed, 8 insertions, 8 deletions
diff --git a/webapp/utils/async_client.jsx b/webapp/utils/async_client.jsx
index f4faba934..2ecb0f07d 100644
--- a/webapp/utils/async_client.jsx
+++ b/webapp/utils/async_client.jsx
@@ -132,7 +132,7 @@ export function getMyChannelMembers() {
(err) => {
callTracker.getChannelsUnread = 0;
dispatchError(err, 'getMyChannelMembers');
- reject();
+ reject(new Error('Unable to getMyChannelMembers'));
}
);
});
@@ -161,7 +161,7 @@ export function getMyChannelMembersForTeam(teamId) {
(err) => {
callTracker[`getMyChannelMembers${teamId}`] = 0;
dispatchError(err, 'getMyChannelMembersForTeam');
- reject();
+ reject(new Error('Unable to getMyChannelMembersForTeam'));
}
);
});
@@ -303,7 +303,7 @@ export function getChannelMember(channelId, userId) {
(err) => {
callTracker[`getChannelMember${channelId}${userId}`] = 0;
dispatchError(err, 'getChannelMember');
- reject();
+ reject(new Error('Unable to getChannelMeber'));
}
);
});
diff --git a/webapp/utils/utils.jsx b/webapp/utils/utils.jsx
index 34573a2e5..b4afc65b3 100644
--- a/webapp/utils/utils.jsx
+++ b/webapp/utils/utils.jsx
@@ -179,7 +179,7 @@ export function displayTime(ticks, utc) {
ampm = ' PM';
}
- hours = hours % 12;
+ hours %= 12;
if (!hours) {
hours = '12';
}
@@ -1217,7 +1217,7 @@ export function isValidPassword(password) {
error = true;
}
- errorId = errorId + 'Lowercase';
+ errorId += 'Lowercase';
}
if (global.window.mm_config.PasswordRequireUppercase === 'true') {
@@ -1225,7 +1225,7 @@ export function isValidPassword(password) {
error = true;
}
- errorId = errorId + 'Uppercase';
+ errorId += 'Uppercase';
}
if (global.window.mm_config.PasswordRequireNumber === 'true') {
@@ -1233,7 +1233,7 @@ export function isValidPassword(password) {
error = true;
}
- errorId = errorId + 'Number';
+ errorId += 'Number';
}
if (global.window.mm_config.PasswordRequireSymbol === 'true') {
@@ -1241,7 +1241,7 @@ export function isValidPassword(password) {
error = true;
}
- errorId = errorId + 'Symbol';
+ errorId += 'Symbol';
}
minimumLength = global.window.mm_config.PasswordMinimumLength;