From 02ad2b515202781879db2b86dde5f6e6cb7321fb Mon Sep 17 00:00:00 2001
From: Matthew Hodgson <matthew@matrix.org>
Date: Tue, 10 Nov 2015 18:25:10 +0000
Subject: [PATCH] remove react-loader (not that the controller should be
 rendering spinners in the first place :(

---
 package.json                            | 3 +--
 src/controllers/molecules/MemberInfo.js | 5 +++--
 src/controllers/molecules/MemberTile.js | 3 ++-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 4eef79a98f..2da20805c1 100644
--- a/package.json
+++ b/package.json
@@ -28,8 +28,7 @@
     "optimist": "^0.6.1",
     "q": "^1.4.1",
     "react": "^0.14.2",
-    "react-dom": "^0.14.2",
-    "react-loader": "^1.4.0"
+    "react-dom": "^0.14.2"
   },
   "//deps": "The loader packages are here because webpack in a project that depends on us needs them in this package's node_modules folder",
   "//depsbuglink": "https://github.com/webpack/webpack/issues/1472",
diff --git a/src/controllers/molecules/MemberInfo.js b/src/controllers/molecules/MemberInfo.js
index 23ae2e5fb1..d822a87f48 100644
--- a/src/controllers/molecules/MemberInfo.js
+++ b/src/controllers/molecules/MemberInfo.js
@@ -30,7 +30,6 @@ var MatrixClientPeg = require("../../MatrixClientPeg");
 var dis = require("../../dispatcher");
 var Modal = require("../../Modal");
 var sdk = require('../../index');
-var Loader = require("react-loader");
 
 module.exports = {
     componentDidMount: function() {
@@ -227,7 +226,9 @@ module.exports = {
             onFinished: function(should_leave) {
                 if (should_leave) {
                     var d = MatrixClientPeg.get().leave(roomId);
-
+                    
+                    // FIXME: controller shouldn't be loading a view :(
+                    var Loader = sdk.getComponent("atoms.Spinner");
                     var modal = Modal.createDialog(Loader);
 
                     d.then(function() {
diff --git a/src/controllers/molecules/MemberTile.js b/src/controllers/molecules/MemberTile.js
index 53cae43ccd..222ebca145 100644
--- a/src/controllers/molecules/MemberTile.js
+++ b/src/controllers/molecules/MemberTile.js
@@ -19,7 +19,6 @@ limitations under the License.
 var dis = require("../../dispatcher");
 var Modal = require("../../Modal");
 var sdk = require('../../index.js');
-var Loader = require("react-loader");
 
 var MatrixClientPeg = require("../../MatrixClientPeg");
 
@@ -39,6 +38,8 @@ module.exports = {
                 if (should_leave) {
                     var d = MatrixClientPeg.get().leave(roomId);
 
+                    // FIXME: controller shouldn't be loading a view :(
+                    var Loader = sdk.getComponent("atoms.Spinner");
                     var modal = Modal.createDialog(Loader);
 
                     d.then(function() {