Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes
This commit is contained in:
@@ -32,7 +32,7 @@ export function avatarUrlForMember(member, width, height, resizeMethod) {
|
||||
// member can be null here currently since on invites, the JS SDK
|
||||
// does not have enough info to build a RoomMember object for
|
||||
// the inviter.
|
||||
url = this.defaultAvatarUrlForString(member ? member.userId : '');
|
||||
url = defaultAvatarUrlForString(member ? member.userId : '');
|
||||
}
|
||||
return url;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ class Skinner {
|
||||
// components have to be functions.
|
||||
const validType = typeof comp === 'function';
|
||||
if (!validType) {
|
||||
throw new Error(`Not a valid component: ${name}.`);
|
||||
throw new Error(`Not a valid component: ${name} (type = ${typeof(comp)}).`);
|
||||
}
|
||||
return comp;
|
||||
}
|
||||
|
||||
@@ -77,7 +77,7 @@ export function doesRoomHaveUnreadMessages(room) {
|
||||
// that counts and we can stop looking because the user's read
|
||||
// this and everything before.
|
||||
return false;
|
||||
} else if (!shouldHideEvent(ev) && this.eventTriggersUnreadCount(ev)) {
|
||||
} else if (!shouldHideEvent(ev) && eventTriggersUnreadCount(ev)) {
|
||||
// We've found a message that counts before we hit
|
||||
// the user's read receipt, so this room is definitely unread.
|
||||
return true;
|
||||
|
||||
@@ -336,6 +336,10 @@ export function getLanguagesFromBrowser() {
|
||||
return [navigator.userLanguage || "en"];
|
||||
}
|
||||
|
||||
export function getLanguageFromBrowser() {
|
||||
return getLanguagesFromBrowser()[0];
|
||||
}
|
||||
|
||||
/**
|
||||
* Turns a language string, normalises it,
|
||||
* (see normalizeLanguageKey) into an array of language strings
|
||||
|
||||
Reference in New Issue
Block a user