From 7846d49403841dc374a055136d6fa4486a076d84 Mon Sep 17 00:00:00 2001 From: Kegan Dougal Date: Thu, 26 Nov 2015 13:45:04 +0000 Subject: [PATCH] Add missing deps; Move stuff in 'views' to have functional descriptors --- src/Avatar.js | 53 +++++++++++++++++++ .../views/{ => avatars}/MemberAvatar.js | 2 +- .../views/{ => avatars}/RoomAvatar.js | 0 src/components/views/login/CasLogin.js | 2 +- 4 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 src/Avatar.js rename src/components/views/{ => avatars}/MemberAvatar.js (99%) rename src/components/views/{ => avatars}/RoomAvatar.js (100%) diff --git a/src/Avatar.js b/src/Avatar.js new file mode 100644 index 0000000000..afc5e9dd6d --- /dev/null +++ b/src/Avatar.js @@ -0,0 +1,53 @@ +/* +Copyright 2015 OpenMarket 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. +*/ + +'use strict'; + +var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); + +module.exports = { + avatarUrlForMember: function(member, width, height, resizeMethod) { + var url = member.getAvatarUrl( + MatrixClientPeg.get().getHomeserverUrl(), + width, + height, + resizeMethod + ); + if (!url) { + // 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 : ''); + } + return url; + }, + + defaultAvatarUrlForString: function(s) { + var total = 0; + for (var i = 0; i < s.length; ++i) { + total += s.charCodeAt(i); + } + switch (total % 3) { + case 0: + return "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAIAAAADnC86AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADRJREFUeNrszQENADAIACB9QjNbxSKP4eagAFnTseHFErFYLBaLxWKxWCwWi8Vi8cX4CzAABSwCRWJw31gAAAAASUVORK5CYII="; + case 1: + return "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAIAAAADnC86AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADRJREFUeNrszQENADAIACB9chOaxgCP4eagAFk9seHFErFYLBaLxWKxWCwWi8Vi8cX4CzAAtKMCks/JG8MAAAAASUVORK5CYII="; + case 2: + return "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAIAAAADnC86AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADRJREFUeNrszQENADAIACB9YzNayQCP4eagADldseHFErFYLBaLxWKxWCwWi8Vi8cX4CzAAyiACeHwPiu4AAAAASUVORK5CYII="; + } + } +} + diff --git a/src/components/views/MemberAvatar.js b/src/components/views/avatars/MemberAvatar.js similarity index 99% rename from src/components/views/MemberAvatar.js rename to src/components/views/avatars/MemberAvatar.js index 9a7b171221..8cfeaa98d2 100644 --- a/src/components/views/MemberAvatar.js +++ b/src/components/views/avatars/MemberAvatar.js @@ -17,7 +17,7 @@ limitations under the License. 'use strict'; var React = require('react'); -var Avatar = require('../../../../Avatar'); +var Avatar = require('../../Avatar'); var MatrixClientPeg = require('../../MatrixClientPeg'); module.exports = React.createClass({ diff --git a/src/components/views/RoomAvatar.js b/src/components/views/avatars/RoomAvatar.js similarity index 100% rename from src/components/views/RoomAvatar.js rename to src/components/views/avatars/RoomAvatar.js diff --git a/src/components/views/login/CasLogin.js b/src/components/views/login/CasLogin.js index 8a45fa0643..9380db9788 100644 --- a/src/components/views/login/CasLogin.js +++ b/src/components/views/login/CasLogin.js @@ -16,7 +16,7 @@ limitations under the License. 'use strict'; -var MatrixClientPeg = require("../../MatrixClientPeg"); +var MatrixClientPeg = require("../../../MatrixClientPeg"); var React = require('react'); var url = require("url");