Merge branch 'vector' into voip

Conflicts:
	src/ComponentBroker.js

src/controllers/atoms/EditableText.js

@@ -0,0 +1,68 @@
+/*
+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: {
+        onValueChanged: React.PropTypes.func,
+        initalValue: React.PropTypes.string,
+    },
+
+    Phases: {
+        Display: "display",
+        Edit: "edit",
+    },
+
+    getDefaultProps: function() {
+        return {
+            onValueChanged: function() {},
+            initalValue: '',
+        };
+    },
+
+    getInitialState: function() {
+        return {
+            value: this.props.initalValue,
+            phase: this.Phases.Display,
+        }
+    },
+
+    getValue: function() {
+        return this.state.value;
+    },
+
+    setValue: function(val) {
+        this.setState({
+            value: val,
+            phase: this.Phases.Display,
+        });
+
+        this.onValueChanged();
+    },
+
+    cancelEdit: function() {
+        this.setState({
+            phase: this.Phases.Display,
+        });
+    },
+
+    onValueChanged: function() {
+        this.props.onValueChanged(this.state.value);
+    },
+};

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;
+    },
+};