Working skin stuff, minus css

src/controllers/organisms/RoomList.js

@@ -20,9 +20,7 @@ var React = require("react");
 var MatrixClientPeg = require("../../MatrixClientPeg");
 var RoomListSorter = require("../../RoomListSorter");
 
-var ComponentBroker = require('../../ComponentBroker');
-
-var RoomTile = ComponentBroker.get("molecules/RoomTile");
+var sdk = require('../../index');
 
 module.exports = {
     componentWillMount: function() {
@@ -100,16 +98,17 @@ module.exports = {
     },
 
     makeRoomTiles: function() {
-        var that = this;
+        var RoomTile = sdk.getComponent('molecules.RoomTile');
+        var self = this;
         return this.state.roomList.map(function(room) {
-            var selected = room.roomId == that.props.selectedRoom;
+            var selected = room.roomId == self.props.selectedRoom;
             return (
                 <RoomTile
                     room={room}
                     key={room.roomId}
                     selected={selected}
-                    unread={that.state.activityMap[room.roomId] === 1}
-                    highlight={that.state.activityMap[room.roomId] === 2}
+                    unread={self.state.activityMap[room.roomId] === 1}
+                    highlight={self.state.activityMap[room.roomId] === 2}
                 />
             );
         });

src/controllers/organisms/RoomView.js

@@ -26,12 +26,7 @@ var dis = require("../../dispatcher");
 var PAGINATE_SIZE = 20;
 var INITIAL_SIZE = 100;
 
-var ComponentBroker = require('../../ComponentBroker');
-
-var tileTypes = {
-    'm.room.message': ComponentBroker.get('molecules/MessageTile'),
-    'm.room.member': ComponentBroker.get('molecules/MRoomMemberTile')
-};
+var sdk = require('../../index');
 
 module.exports = {
     getInitialState: function() {
@@ -220,6 +215,11 @@ module.exports = {
     },
 
     getEventTiles: function() {
+        var tileTypes = {
+            'm.room.message': sdk.getComponent('molecules.MessageTile'),
+            'm.room.member': sdk.getComponent('molecules.MRoomMemberTile')
+        };
+
         var ret = [];
         var count = 0;
 

src/controllers/pages/MatrixChat.js

@@ -21,9 +21,7 @@ var RoomListSorter = require("../../RoomListSorter");
 
 var dis = require("../../dispatcher");
 
-var ComponentBroker = require('../../ComponentBroker');
-
-var Notifier = ComponentBroker.get('organisms/Notifier');
+var sdk = require('../../index');
 
 module.exports = {
     getInitialState: function() {
@@ -62,6 +60,7 @@ module.exports = {
 
     onAction: function(payload) {
         var roomIndexDelta = 1;
+        var Notifier = sdk.getComponent('organisms.Notifier');
 
         switch (payload.action) {
             case 'logout':
@@ -141,8 +140,10 @@ module.exports = {
     },
 
     startMatrixClient: function() {
+        var Notifier = sdk.getComponent('organisms.Notifier');
+
         var cli = MatrixClientPeg.get();
-        var that = this;
+        var self = this;
         cli.on('syncComplete', function() {
             var firstRoom = null;
             if (cli.getRooms() && cli.getRooms().length) {
@@ -150,7 +151,7 @@ module.exports = {
                     cli.getRooms()
                 )[0].roomId;
             }
-            that.setState({ready: true, currentRoom: firstRoom});
+            self.setState({ready: true, currentRoom: firstRoom});
             dis.dispatch({action: 'focus_composer'});
         });
         Notifier.start();

src/controllers/templates/Login.js

@@ -22,8 +22,6 @@ var MatrixClientPeg = require("../../MatrixClientPeg");
 var Matrix = require("matrix-js-sdk");
 var dis = require("../../dispatcher");
 
-var ComponentBroker = require("../../ComponentBroker");
-
 module.exports = {
     getInitialState: function() {
         return {

src/controllers/templates/Register.js

@@ -22,8 +22,6 @@ var MatrixClientPeg = require("../../MatrixClientPeg");
 var Matrix = require("matrix-js-sdk");
 var dis = require("../../dispatcher");
 
-var ComponentBroker = require("../../ComponentBroker");
-
 module.exports = {
     FieldErrors: {
         PasswordMismatch: 'PasswordMismatch',