diff --git a/src/components/views/context_menus/TopLeftMenu.js b/src/components/views/context_menus/TopLeftMenu.js
new file mode 100644
index 0000000000..ec3120cfea
--- /dev/null
+++ b/src/components/views/context_menus/TopLeftMenu.js
@@ -0,0 +1,53 @@
+/*
+Copyright 2018 New Vector Ltd
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+import React from 'react';
+import dis from '../../../dispatcher';
+import { _t } from '../../../languageHandler';
+
+export class TopLeftMenu extends React.Component {
+
+ constructor() {
+ super();
+ this.openSettings = this.openSettings.bind(this);
+ this.signOut = this.signOut.bind(this);
+ }
+
+ render() {
+ return
;
+ }
+
+ openSettings() {
+ dis.dispatch({action: 'view_user_settings'});
+ this.closeMenu();
+ }
+
+ signOut() {
+ dis.dispatch({action: 'logout'});
+ this.closeMenu();
+ }
+
+ closeMenu() {
+ if (this.props.onFinished) this.props.onFinished();
+ }
+}
diff --git a/src/components/views/messages/DateSeparator.js b/src/components/views/messages/DateSeparator.js
index a0ea704502..c72ed2517a 100644
--- a/src/components/views/messages/DateSeparator.js
+++ b/src/components/views/messages/DateSeparator.js
@@ -56,6 +56,6 @@ export default class DateSeparator extends React.Component {
}
render() {
- return
{ this.getLabel() }
;
+ return
{ this.getLabel() }
;
}
}
diff --git a/src/components/views/messages/SenderProfile.js b/src/components/views/messages/SenderProfile.js
index 0f767675e2..a40addf0d1 100644
--- a/src/components/views/messages/SenderProfile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -23,6 +23,7 @@ import sdk from '../../../index';
import Flair from '../elements/Flair.js';
import FlairStore from '../../../stores/FlairStore';
import { _t } from '../../../languageHandler';
+import {hashCode} from '../../../utils/FormattingUtils';
export default React.createClass({
displayName: 'SenderProfile',
@@ -96,6 +97,7 @@ export default React.createClass({
render() {
const EmojiText = sdk.getComponent('elements.EmojiText');
const {mxEvent} = this.props;
+ const colorNumber = hashCode(mxEvent.getSender()) % 8;
const name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
const {msgtype} = mxEvent.getContent();
@@ -119,7 +121,7 @@ export default React.createClass({
// Name + flair
const nameFlair =
-
+
{ nameElem }
{ flair }
diff --git a/src/utils/FormattingUtils.js b/src/utils/FormattingUtils.js
index a27851951f..435b33ac5d 100644
--- a/src/utils/FormattingUtils.js
+++ b/src/utils/FormattingUtils.js
@@ -37,3 +37,24 @@ export function formatCount(count) {
export function formatCryptoKey(key) {
return key.match(/.{1,4}/g).join(" ");
}
+/**
+ * calculates a numeric hash for a given string
+ *
+ * @param {string} str string to hash
+ *
+ * @return {number}
+ */
+export function hashCode(str) {
+ let hash = 0;
+ let i;
+ let chr;
+ if (str.length === 0) {
+ return hash;
+ }
+ for (i = 0; i < str.length; i++) {
+ chr = str.charCodeAt(i);
+ hash = ((hash << 5) - hash) + chr;
+ hash |= 0;
+ }
+ return Math.abs(hash);
+}
-