Merge branch 'master' of github.com:matrix-org/matrix-react-sdk into vector

src/ComponentBroker.js

@@ -61,6 +61,9 @@ if (0) {
 require('../skins/base/views/atoms/LogoutButton');
 require('../skins/base/views/atoms/EnableNotificationsButton');
 require('../skins/base/views/atoms/MessageTimestamp');
+require('../skins/base/views/atoms/create_room/CreateRoomButton');
+require('../skins/base/views/atoms/create_room/RoomNameTextbox');
+require('../skins/base/views/atoms/create_room/Presets');
 require('../skins/base/views/molecules/MatrixToolbar');
 require('../skins/base/views/molecules/RoomTile');
 require('../skins/base/views/molecules/MessageTile');
@@ -82,6 +85,8 @@ require('../skins/base/views/organisms/RoomList');
 require('../skins/base/views/organisms/RoomView');
 require('../skins/base/views/templates/Login');
 require('../skins/base/views/organisms/Notifier');
+require('../skins/base/views/organisms/CreateRoom');
+require('../skins/base/views/molecules/UserSelector');
 // new for vector
 require('../skins/base/views/organisms/LeftPanel');
 require('../skins/base/views/organisms/RightPanel');

src/controllers/atoms/create_room/CreateRoomButton.js

@@ -0,0 +1,35 @@
+/*
+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');
+
+module.exports = {
+    propTypes: {
+        onCreateRoom: React.PropTypes.func,
+    },
+
+    getDefaultProps: function() {
+        return {
+            onCreateRoom: function() {},
+        };
+    },
+
+    onClick: function() {
+        this.props.onCreateRoom();
+    },
+};

src/controllers/atoms/create_room/Presets.js

@@ -0,0 +1,41 @@
+/*
+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');
+
+module.exports = {
+    propTypes: {
+        default_preset: React.PropTypes.string
+    },
+
+    getDefaultProps: function() {
+        return {
+            default_preset: 'private_chat',
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            preset: this.props.default_preset,
+        }
+    },
+
+    getPreset: function() {
+        return this.state.preset;
+    },
+};

src/controllers/atoms/create_room/RoomNameTextbox.js

@@ -0,0 +1,41 @@
+/*
+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');
+
+module.exports = {
+    propTypes: {
+        default_name: React.PropTypes.string
+    },
+
+    getDefaultProps: function() {
+        return {
+            default_name: '',
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            room_name: this.props.default_name,
+        }
+    },
+
+    getName: function() {
+        return this.state.room_name;
+    },
+};

src/controllers/molecules/UserSelector.js

@@ -0,0 +1,57 @@
+/*
+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');
+
+module.exports = {
+    propTypes: {
+        initially_selected: React.PropTypes.arrayOf(React.PropTypes.string),
+    },
+
+    getDefaultProps: function() {
+        return {
+            initially_selected: [],
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            selected_users: this.props.initially_selected,
+        }
+    },
+
+    addUser: function(user_id) {
+        if (this.state.selected_users.indexOf(user_id == -1)) {
+            this.setState({
+                selected_users: this.state.selected_users.concat([user_id]),
+            });
+        }
+    },
+
+    removeUser: function(user_id) {
+        this.setState({
+            selected_users: this.state.selected_users.filter(function(e) {
+                return e != user_id;
+            }),
+        });
+    },
+
+    getUserIds: function() {
+        return this.state.selected_users;
+    }
+};

src/controllers/organisms/CreateRoom.js

@@ -0,0 +1,92 @@
+/*
+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 MatrixClientPeg = require("../../MatrixClientPeg");
+
+module.exports = {
+    propTypes: {
+        onRoomCreated: React.PropTypes.func,
+    },
+
+    phases: {
+        CONFIG: "CONFIG",  // We're waiting for user to configure and hit create.
+        CREATING: "CREATING",  // We're sending the request.
+        CREATED: "CREATED",  // We successfully created the room.
+        ERROR: "ERROR",  // There was an error while trying to create room.
+    },
+
+    getDefaultProps: function() {
+        return {
+            onRoomCreated: function() {},
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            phase: this.phases.CONFIG,
+            error_string: "",
+        };
+    },
+
+    onCreateRoom: function() {
+        var options = {};
+
+        var room_name = this.getName();
+        if (room_name) {
+            options.name = room_name;
+        }
+
+        var preset = this.getPreset();
+        if (preset) {
+            options.preset = preset;
+        }
+
+        var invited_users = this.getInvitedUsers();
+        if (invited_users) {
+            options.invite = invited_users;
+        }
+
+        var cli = MatrixClientPeg.get();
+        if (!cli) {
+            // TODO: Error.
+            console.error("Cannot create room: No matrix client.");
+            return;
+        }
+
+        var deferred = MatrixClientPeg.get().createRoom(options);
+
+        this.setState({
+            phase: this.phases.CREATING,
+        });
+
+        var self = this;
+
+        deferred.then(function () {
+            self.setState({
+                phase: self.phases.CREATED,
+            });
+            self.props.onRoomCreated();
+        }, function(err) {
+            self.setState({
+                phase: self.phases.ERROR,
+                error_string: err.toString(),
+            });
+        });
+    }
+};