Move avatars into their own components so I can add functionality like custom default avatars and onerror sources without having to add it in 13 separate places. Add the aforementioned features.

skins/base/views/atoms/MemberAvatar.js

@@ -0,0 +1,34 @@
+/*
+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 React = require('react');
+
+var MemberAvatarController = require("../../../../src/controllers/atoms/MemberAvatar");
+
+module.exports = React.createClass({
+    displayName: 'MemberAvatar',
+    mixins: [MemberAvatarController],
+
+    render: function() {
+        return (
+            <img className="mx_MemberAvatar" src={this.state.imageUrl}
+                onerror={this.onError}
+                width={this.props.width} height={this.props.height} />
+        );
+    }
+});

skins/base/views/atoms/RoomAvatar.js

@@ -0,0 +1,34 @@
+/*
+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 React = require('react');
+
+var RoomAvatarController = require("../../../../src/controllers/atoms/RoomAvatar");
+
+module.exports = React.createClass({
+    displayName: 'RoomAvatar',
+    mixins: [RoomAvatarController],
+
+    render: function() {
+        return (
+            <img className="mx_RoomAvatar" src={this.state.imageUrl} onerror={this.onError}
+                width={this.props.width} height={this.props.height}
+            />
+        );
+    }
+});