Merge branch 'develop' into matthew/redesign

src/skins/vector/views/molecules/EventAsTextTile.js

@@ -19,22 +19,22 @@ limitations under the License.
 var React = require('react');
 
 var EventAsTextTileController = require('matrix-react-sdk/lib/controllers/molecules/EventAsTextTile')
-var sdk = require('matrix-react-sdk')
 var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
 
 module.exports = React.createClass({
     displayName: 'EventAsTextTile',
     mixins: [EventAsTextTileController],
 
-    render: function() {
-        var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
-        var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
+    statics: {
+        needsSenderProfile: function() {
+            return false;
+        }
+    },
 
+    render: function() {
         var text = TextForEvent.textForEvent(this.props.mxEvent);
         if (text == null || text.length == 0) return null;
 
-        var timestamp = this.props.last ? <MessageTimestamp ts={this.props.mxEvent.getTs()} /> : null;
-        var avatar = this.props.mxEvent.sender ? <MemberAvatar member={this.props.mxEvent.sender} /> : null;
         return (
             <div className="mx_EventAsTextTile">
                 {TextForEvent.textForEvent(this.props.mxEvent)}

src/skins/vector/views/molecules/EventTile.js

@@ -114,8 +114,10 @@ module.exports = React.createClass({
                     </div>
                 );
             }
+            if (EventTileType.needsSenderProfile()) {
                 sender = <SenderProfile mxEvent={this.props.mxEvent} aux={aux} />;
             }
+        }
         return (
             <div className={classes}>
                 { avatar }

src/skins/vector/views/molecules/MessageTile.js

@@ -28,6 +28,12 @@ module.exports = React.createClass({
     displayName: 'MessageTile',
     mixins: [MessageTileController],
 
+    statics: {
+        needsSenderProfile: function() {
+            return true;
+        }
+    },
+
     render: function() {
         var UnknownMessageTile = sdk.getComponent('molecules.UnknownMessageTile');
 

webpack.config.js

@@ -20,7 +20,8 @@ module.exports = {
             // removed which gives a tree with matrix-react-sdk and vector
             // trees smashed together, but this fixes everything being under
             // various levels of '.' and '..'
-            return info.resourcePath.replace(/^[\/\.]*/, '');
+            // Also, sometimes the resource path is absolute.
+            return path.relative(process.cwd(), info.resourcePath).replace(/^[\/\.]*/, '');
         }
     },
     resolve: {