Merge branch 'travis/sourcemaps' into travis/babel7-wp-es6-fixes

This commit is contained in:
Travis Ralston
2020-01-08 14:42:01 -07:00
13 changed files with 42 additions and 21 deletions

View File

@@ -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;
}

View File

@@ -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;
}

View File

@@ -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;

View File

@@ -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