OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

remove react-loader (not that the controller should be rendering spinners in the first place :(

pull/21833/head
Matthew Hodgson 2015-11-10 18:25:10 +00:00
parent d4549e60cc
commit 02ad2b5152
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package.json
View File

@ -28,8 +28,7 @@
"optimist": "^0.6.1", "optimist": "^0.6.1",
"q": "^1.4.1", "q": "^1.4.1",
"react": "^0.14.2", "react": "^0.14.2",
"react-dom": "^0.14.2", "react-dom": "^0.14.2"
"react-loader": "^1.4.0"
}, },
"//deps": "The loader packages are here because webpack in a project that depends on us needs them in this package's node_modules folder", "//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", "//depsbuglink": "https://github.com/webpack/webpack/issues/1472",

5
src/controllers/molecules/MemberInfo.js
View File

@ -30,7 +30,6 @@ var MatrixClientPeg = require("../../MatrixClientPeg");
var dis = require("../../dispatcher"); var dis = require("../../dispatcher");
var Modal = require("../../Modal"); var Modal = require("../../Modal");
var sdk = require('../../index'); var sdk = require('../../index');
var Loader = require("react-loader");
module.exports = { module.exports = {
componentDidMount: function() { componentDidMount: function() {
@ -227,7 +226,9 @@ module.exports = {
onFinished: function(should_leave) { onFinished: function(should_leave) {
if (should_leave) { if (should_leave) {
var d = MatrixClientPeg.get().leave(roomId); 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); var modal = Modal.createDialog(Loader);
d.then(function() { d.then(function() {

3
src/controllers/molecules/MemberTile.js
View File

@ -19,7 +19,6 @@ limitations under the License.
var dis = require("../../dispatcher"); var dis = require("../../dispatcher");
var Modal = require("../../Modal"); var Modal = require("../../Modal");
var sdk = require('../../index.js'); var sdk = require('../../index.js');
var Loader = require("react-loader");
var MatrixClientPeg = require("../../MatrixClientPeg"); var MatrixClientPeg = require("../../MatrixClientPeg");
@ -39,6 +38,8 @@ module.exports = {
if (should_leave) { if (should_leave) {
var d = MatrixClientPeg.get().leave(roomId); 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); var modal = Modal.createDialog(Loader);
d.then(function() { d.then(function() {