- position.right = props.right + 8;
- }
-
- var className = 'mx_ContextualMenu_wrapper';
-
- // FIXME: If a menu uses getDefaultProps it clobbers the onFinished
- // property set here so you can't close the menu from a button click!
- var menu = (
-
diff --git a/src/skins/vector/views/pages/CompatibilityPage.js b/src/components/structures/CompatibilityPage.js
similarity index 100%
rename from src/skins/vector/views/pages/CompatibilityPage.js
rename to src/components/structures/CompatibilityPage.js
diff --git a/src/skins/vector/views/organisms/LeftPanel.js b/src/components/structures/LeftPanel.js
similarity index 81%
rename from src/skins/vector/views/organisms/LeftPanel.js
rename to src/components/structures/LeftPanel.js
index 96d48e0e15..aaab8084d4 100644
--- a/src/skins/vector/views/organisms/LeftPanel.js
+++ b/src/components/structures/LeftPanel.js
@@ -22,6 +22,7 @@ var HTML5Backend = require('react-dnd-html5-backend');
var sdk = require('matrix-react-sdk')
var dis = require('matrix-react-sdk/lib/dispatcher');
+var VectorConferenceHandler = require('../../VectorConferenceHandler');
var CallHandler = require("matrix-react-sdk/lib/CallHandler");
var LeftPanel = React.createClass({
@@ -84,9 +85,9 @@ var LeftPanel = React.createClass({
},
render: function() {
- var RoomList = sdk.getComponent('organisms.RoomList');
- var BottomLeftMenu = sdk.getComponent('molecules.BottomLeftMenu');
- var IncomingCallBox = sdk.getComponent('molecules.voip.IncomingCallBox');
+ var RoomList = sdk.getComponent('rooms.RoomList');
+ var BottomLeftMenu = sdk.getComponent('structures.BottomLeftMenu');
+ var IncomingCallBox = sdk.getComponent('voip.IncomingCallBox');
var collapseButton;
var classes = "mx_LeftPanel";
@@ -100,8 +101,12 @@ var LeftPanel = React.createClass({
var callPreview;
if (this.state.showCallElement) {
- var CallView = sdk.getComponent('molecules.voip.CallView');
- callPreview =
+
);
diff --git a/src/skins/vector/views/organisms/RightPanel.js b/src/components/structures/RightPanel.js
similarity index 90%
rename from src/skins/vector/views/organisms/RightPanel.js
rename to src/components/structures/RightPanel.js
index feebcfeba5..f4f0a8f332 100644
--- a/src/skins/vector/views/organisms/RightPanel.js
+++ b/src/components/structures/RightPanel.js
@@ -68,6 +68,11 @@ module.exports = React.createClass({
if (this.state.phase == this.Phase.MemberList && member.roomId === this.props.roomId) {
this.forceUpdate();
}
+ else if (this.state.phase === this.Phase.MemberInfo && member.roomId === this.props.roomId &&
+ member.userId === this.state.member.userId) {
+ // refresh the member info (e.g. new power level)
+ this.forceUpdate();
+ }
},
onAction: function(payload) {
@@ -94,7 +99,7 @@ module.exports = React.createClass({
},
render: function() {
- var MemberList = sdk.getComponent('organisms.MemberList');
+ var MemberList = sdk.getComponent('rooms.MemberList');
var buttonGroup;
var panel;
@@ -122,12 +127,12 @@ module.exports = React.createClass({
buttonGroup =
;
@@ -137,7 +142,7 @@ module.exports = React.createClass({
panel = { this.props.collapsed ? '' : this.props.label }
-
{ subList }
diff --git a/src/skins/vector/views/organisms/ViewSource.js b/src/components/structures/ViewSource.js
similarity index 100%
rename from src/skins/vector/views/organisms/ViewSource.js
rename to src/components/structures/ViewSource.js
diff --git a/src/skins/vector/views/atoms/ImageView.js b/src/components/views/elements/ImageView.js
similarity index 91%
rename from src/skins/vector/views/atoms/ImageView.js
rename to src/components/views/elements/ImageView.js
index a842f7c855..741524be86 100644
--- a/src/skins/vector/views/atoms/ImageView.js
+++ b/src/components/views/elements/ImageView.js
@@ -20,7 +20,7 @@ var React = require('react');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var DateUtils = require('../../../../DateUtils');
+var DateUtils = require('matrix-react-sdk/lib/DateUtils');
var filesize = require('filesize');
module.exports = React.createClass({
@@ -30,7 +30,8 @@ module.exports = React.createClass({
onFinished: React.PropTypes.func.isRequired
},
- // XXX: keyboard shortcuts for managing dialogs should be done by the modal dialog base class somehow, surely...
+ // XXX: keyboard shortcuts for managing dialogs should be done by the modal
+ // dialog base class somehow, surely...
componentDidMount: function() {
document.addEventListener("keydown", this.onKeyDown);
},
@@ -54,7 +55,7 @@ module.exports = React.createClass({
).done(function() {
if (self.props.onFinished) self.props.onFinished();
}, function(e) {
- var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
+ var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
// display error message stating you couldn't delete this.
var code = e.errcode || e.statusCode;
Modal.createDialog(ErrorDialog, {
@@ -104,6 +105,11 @@ module.exports = React.createClass({
res = ", " + style.width + "x" + style.height + "px";
}
+ var size;
+ if (this.props.mxEvent.getContent().info && this.props.mxEvent.getContent().info.size) {
+ size = filesize(this.props.mxEvent.getContent().info.size);
+ }
+
return (
- 
+ 
{ membersBadge }
{ membersHighlight }
+
{ membersBadge }
{ membersHighlight }
- 
+ 
{ filesHighlight }
+
{ filesHighlight }
{ this.props.collapsed ? '' : this.props.label }
- 
+
{ subList }
@@ -123,7 +129,7 @@ module.exports = React.createClass({
Download this file
- ({ filesize(this.props.mxEvent.getContent().info.size) }{ res }) + { size } { res }
- ({ filesize(this.props.mxEvent.getContent().info.size) }{ res }) + { size } { res }
diff --git a/src/skins/vector/views/atoms/Spinner.js b/src/components/views/elements/Spinner.js
similarity index 100%
rename from src/skins/vector/views/atoms/Spinner.js
rename to src/components/views/elements/Spinner.js
diff --git a/src/skins/vector/views/molecules/MatrixToolbar.js b/src/components/views/globals/MatrixToolbar.js
similarity index 83%
rename from src/skins/vector/views/molecules/MatrixToolbar.js
rename to src/components/views/globals/MatrixToolbar.js
index 5b613f563d..7b953c4a84 100644
--- a/src/skins/vector/views/molecules/MatrixToolbar.js
+++ b/src/components/views/globals/MatrixToolbar.js
@@ -17,30 +17,28 @@ limitations under the License.
'use strict';
var React = require('react');
-
+var Notifier = require("matrix-react-sdk/lib/Notifier");
var sdk = require('matrix-react-sdk')
module.exports = React.createClass({
displayName: 'MatrixToolbar',
hideToolbar: function() {
- var Notifier = sdk.getComponent('organisms.Notifier');
Notifier.setToolbarHidden(true);
},
onClick: function() {
- var Notifier = sdk.getComponent('organisms.Notifier');
Notifier.setEnabled(true);
},
render: function() {
return (
);
}
diff --git a/src/skins/vector/views/organisms/ErrorDialog.js b/src/components/views/login/VectorCustomServerDialog.js
similarity index 53%
rename from src/skins/vector/views/organisms/ErrorDialog.js
rename to src/components/views/login/VectorCustomServerDialog.js
index 992ea05054..22c188cc7a 100644
--- a/src/skins/vector/views/organisms/ErrorDialog.js
+++ b/src/components/views/login/VectorCustomServerDialog.js
@@ -14,38 +14,37 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
-'use strict';
-
-/*
- * Usage:
- * Modal.createDialog(ErrorDialog, {
- * title: "some text", (default: "Error")
- * description: "some more text",
- * button: "Button Text",
- * onClose: someFunction,
- * focus: true|false (default: true)
- * });
- */
-
-var React = require('react');
-var ErrorDialogController = require('matrix-react-sdk/lib/controllers/organisms/ErrorDialog')
+var React = require("react");
module.exports = React.createClass({
- displayName: 'ErrorDialog',
- mixins: [ErrorDialogController],
+ displayName: 'VectorCustomServerDialog',
+ statics: {
+ replaces: 'CustomServerDialog',
+ },
render: function() {
return (
diff --git a/src/skins/vector/views/molecules/EventAsTextTile.js b/src/components/views/login/VectorLoginFooter.js
similarity index 60%
rename from src/skins/vector/views/molecules/EventAsTextTile.js
rename to src/components/views/login/VectorLoginFooter.js
index ec644a4ec4..2b2f1ae827 100644
--- a/src/skins/vector/views/molecules/EventAsTextTile.js
+++ b/src/components/views/login/VectorLoginFooter.js
@@ -18,26 +18,20 @@ limitations under the License.
var React = require('react');
-var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
-
module.exports = React.createClass({
- displayName: 'EventAsTextTile',
-
+ displayName: 'VectorLoginFooter',
statics: {
- needsSenderProfile: function() {
- return false;
- }
+ replaces: 'LoginFooter',
},
render: function() {
- var text = TextForEvent.textForEvent(this.props.mxEvent);
- if (text == null || text.length == 0) return null;
-
return (
-
+ 
- {this.props.title}
+ Custom Server Options
- {this.props.description}
+
+ You can use the custom server options to log into other Matrix
+ servers by specifying a different Home server URL.
+
+ This allows you to use Vector with an existing Matrix account on + a different Home server. +
+
+ You can also set a custom Identity server but this will affect + people's ability to find you if you use a server in a group other + than the main Matrix.org group. +
+ This allows you to use Vector with an existing Matrix account on + a different Home server. +
+
+ You can also set a custom Identity server but this will affect + people's ability to find you if you use a server in a group other + than the main Matrix.org group. +
-
- {TextForEvent.textForEvent(this.props.mxEvent)}
+
);
- },
+ }
});
-
diff --git a/src/skins/vector/views/atoms/voip/VideoFeed.js b/src/components/views/login/VectorLoginHeader.js
similarity index 75%
rename from src/skins/vector/views/atoms/voip/VideoFeed.js
rename to src/components/views/login/VectorLoginHeader.js
index 9cf28d1ba4..61b04267fc 100644
--- a/src/skins/vector/views/atoms/voip/VideoFeed.js
+++ b/src/components/views/login/VectorLoginHeader.js
@@ -19,13 +19,16 @@ limitations under the License.
var React = require('react');
module.exports = React.createClass({
- displayName: 'VideoFeed',
+ displayName: 'VectorLoginHeader',
+ statics: {
+ replaces: 'LoginHeader',
+ },
render: function() {
return (
-
+
+ 
+
);
- },
+ }
});
-
diff --git a/src/skins/vector/views/molecules/DateSeparator.js b/src/components/views/messages/DateSeparator.js
similarity index 100%
rename from src/skins/vector/views/molecules/DateSeparator.js
rename to src/components/views/messages/DateSeparator.js
diff --git a/src/skins/vector/views/atoms/MessageTimestamp.js b/src/components/views/messages/MessageTimestamp.js
similarity index 93%
rename from src/skins/vector/views/atoms/MessageTimestamp.js
rename to src/components/views/messages/MessageTimestamp.js
index 5795e55657..b4b7546e50 100644
--- a/src/skins/vector/views/atoms/MessageTimestamp.js
+++ b/src/components/views/messages/MessageTimestamp.js
@@ -17,7 +17,7 @@ limitations under the License.
'use strict';
var React = require('react');
-var DateUtils = require('../../../../DateUtils');
+var DateUtils = require('matrix-react-sdk/lib/DateUtils');
module.exports = React.createClass({
displayName: 'MessageTimestamp',
diff --git a/src/skins/vector/views/molecules/MEmoteTile.js b/src/components/views/messages/SenderProfile.js
similarity index 72%
rename from src/skins/vector/views/molecules/MEmoteTile.js
rename to src/components/views/messages/SenderProfile.js
index de2d93650b..ef0173d975 100644
--- a/src/skins/vector/views/molecules/MEmoteTile.js
+++ b/src/components/views/messages/SenderProfile.js
@@ -18,19 +18,20 @@ limitations under the License.
var React = require('react');
-var MEmoteTileController = require('matrix-react-sdk/lib/controllers/molecules/MEmoteTile')
-
module.exports = React.createClass({
- displayName: 'MEmoteTile',
- mixins: [MEmoteTileController],
+ displayName: 'SenderProfile',
render: function() {
var mxEvent = this.props.mxEvent;
- var content = mxEvent.getContent();
var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
+
+ var msgtype = mxEvent.getContent().msgtype;
+ if (msgtype && msgtype == 'm.emote') {
+ name = ''; // emote message must include the name so don't duplicate it
+ }
return (
-
- * {name} {content.body}
+
+ {name} { this.props.aux }
);
},
diff --git a/src/skins/vector/views/molecules/BottomLeftMenuTile.js b/src/components/views/rooms/BottomLeftMenuTile.js
similarity index 95%
rename from src/skins/vector/views/molecules/BottomLeftMenuTile.js
rename to src/components/views/rooms/BottomLeftMenuTile.js
index 8c28058d10..2535490fea 100644
--- a/src/skins/vector/views/molecules/BottomLeftMenuTile.js
+++ b/src/components/views/rooms/BottomLeftMenuTile.js
@@ -41,7 +41,7 @@ module.exports = React.createClass({
label =
+ { this.props.label }
;
}
else if (this.state.hover) {
- var RoomTooltip = sdk.getComponent("molecules.RoomTooltip");
+ var RoomTooltip = sdk.getComponent("rooms.RoomTooltip");
label =
Resend
);
}
- else {
+
+ if (!eventStatus) { // sent
redactButton = (
Redact
);
}
+
+ if (eventStatus === "queued" || eventStatus === "not_sent") {
+ cancelButton = (
+
+ Cancel Sending
+
+ );
+ }
+
viewSourceButton = (
View Source
@@ -86,6 +103,7 @@ module.exports = React.createClass({
;
- }
-*/
-
- var myUserId = MatrixClientPeg.get().credentials.userId;
- var me = this.props.room.currentState.members[myUserId];
- var classes = classNames({
- 'mx_RoomTile': true,
- 'mx_RoomTile_selected': this.props.selected,
- 'mx_RoomTile_unread': this.props.unread,
- 'mx_RoomTile_highlight': this.props.highlight,
- 'mx_RoomTile_invited': (me && me.membership == 'invite'),
- });
-
- var name;
- if (this.props.isInvite) {
- name = this.props.room.getMember(myUserId).events.member.getSender();
- }
- else {
- // XXX: We should never display raw room IDs, but sometimes the room name js sdk gives is undefined
- name = this.props.room.name || this.props.room.roomId;
- }
-
- name = name.replace(":", ":\u200b"); // add a zero-width space to allow linewrapping after the colon
- var badge;
- if (this.props.highlight) {
- badge = ;
- }
- /*
- if (this.props.highlight) {
- badge = ;
- }
- else {
- nameCell = ;
- }
-
- var RoomAvatar = sdk.getComponent('atoms.RoomAvatar');
-
- // These props are injected by React DnD,
- // as defined by your `collect` function above:
- var isDragging = this.props.isDragging;
- var connectDragSource = this.props.connectDragSource;
- var connectDropTarget = this.props.connectDropTarget;
-
- return connectDragSource(connectDropTarget(
- ;
- continuation = false;
- }
- }
-
- if (i === 1) { // n.b. 1, not 0, as the 0th event is an m.room.create and so doesn't show on the timeline
- var ts1 = this.state.room.timeline[i].getTs();
- dateSeparator = 
-
- );
- }
- return (
-
- );
- }
-});
diff --git a/src/skins/vector/views/atoms/RoomAvatar.js b/src/skins/vector/views/atoms/RoomAvatar.js
deleted file mode 100644
index bdd28bad59..0000000000
--- a/src/skins/vector/views/atoms/RoomAvatar.js
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-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 RoomAvatarController = require('matrix-react-sdk/lib/controllers/atoms/RoomAvatar')
-
-module.exports = React.createClass({
- displayName: 'RoomAvatar',
- mixins: [RoomAvatarController],
-
- getUrlList: function() {
- return [
- this.roomAvatarUrl(),
- this.getOneToOneAvatar(),
- this.getFallbackAvatar()
- ];
- },
-
- getFallbackAvatar: function() {
- var images = [ '76cfa6', '50e2c2', 'f4c371' ];
- var total = 0;
- for (var i = 0; i < this.props.room.roomId.length; ++i) {
- total += this.props.room.roomId.charCodeAt(i);
- }
- return 'img/' + images[total % images.length] + '.png';
- },
-
- render: function() {
- var style = {
- width: this.props.width,
- height: this.props.height,
- };
-
- // XXX: recalculates fallback avatar constantly
- if (this.state.imageUrl === this.getFallbackAvatar()) {
- var initial;
- if (this.props.room.name[0])
- initial = this.props.room.name[0].toUpperCase();
- if ((initial === '@' || initial === '#') && this.props.room.name[1])
- initial = this.props.room.name[1].toUpperCase();
-
- return (
-
-
-
-
- );
- }
- else {
- return
- }
-
- }
-});
diff --git a/src/skins/vector/views/atoms/create_room/CreateRoomButton.js b/src/skins/vector/views/atoms/create_room/CreateRoomButton.js
deleted file mode 100644
index 2fc9d057a0..0000000000
--- a/src/skins/vector/views/atoms/create_room/CreateRoomButton.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-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 CreateRoomButtonController = require('matrix-react-sdk/lib/controllers/atoms/create_room/CreateRoomButton')
-
-module.exports = React.createClass({
- displayName: 'CreateRoomButton',
- mixins: [CreateRoomButtonController],
-
- render: function() {
- return (
-
- );
- }
-});
diff --git a/src/skins/vector/views/atoms/create_room/Presets.js b/src/skins/vector/views/atoms/create_room/Presets.js
deleted file mode 100644
index a098a7d7e8..0000000000
--- a/src/skins/vector/views/atoms/create_room/Presets.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-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 PresetsController = require('matrix-react-sdk/lib/controllers/atoms/create_room/Presets')
-
-module.exports = React.createClass({
- displayName: 'CreateRoomPresets',
- mixins: [PresetsController],
-
- onValueChanged: function(ev) {
- this.props.onChange(ev.target.value)
- },
-
- render: function() {
- return (
-
- );
- }
-});
diff --git a/src/skins/vector/views/atoms/create_room/RoomAlias.js b/src/skins/vector/views/atoms/create_room/RoomAlias.js
deleted file mode 100644
index 0a8cadc888..0000000000
--- a/src/skins/vector/views/atoms/create_room/RoomAlias.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-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 RoomAliasController = require('matrix-react-sdk/lib/controllers/atoms/create_room/RoomAlias')
-
-module.exports = React.createClass({
- displayName: 'RoomAlias',
- mixins: [RoomAliasController],
-
- onValueChanged: function(ev) {
- this.props.onChange(ev.target.value);
- },
-
- onFocus: function(ev) {
- var target = ev.target;
- var curr_val = ev.target.value;
-
- if (this.props.homeserver) {
- if (curr_val == "") {
- setTimeout(function() {
- target.value = "#:" + this.props.homeserver;
- target.setSelectionRange(1, 1);
- }, 0);
- } else {
- var suffix = ":" + this.props.homeserver;
- setTimeout(function() {
- target.setSelectionRange(
- curr_val.startsWith("#") ? 1 : 0,
- curr_val.endsWith(suffix) ? (target.value.length - suffix.length) : target.value.length
- );
- }, 0);
- }
- }
- },
-
- onBlur: function(ev) {
- var curr_val = ev.target.value;
-
- if (this.props.homeserver) {
- if (curr_val == "#:" + this.props.homeserver) {
- ev.target.value = "";
- return;
- }
-
- if (curr_val != "") {
- var new_val = ev.target.value;
- var suffix = ":" + this.props.homeserver;
- if (!curr_val.startsWith("#")) new_val = "#" + new_val;
- if (!curr_val.endsWith(suffix)) new_val = new_val + suffix;
- ev.target.value = new_val;
- }
- }
- },
-
- render: function() {
- return (
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/ChangeAvatar.js b/src/skins/vector/views/molecules/ChangeAvatar.js
deleted file mode 100644
index 7afac77fd5..0000000000
--- a/src/skins/vector/views/molecules/ChangeAvatar.js
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-var ChangeAvatarController = require('matrix-react-sdk/lib/controllers/molecules/ChangeAvatar')
-
-module.exports = React.createClass({
- displayName: 'ChangeAvatar',
- mixins: [ChangeAvatarController],
-
- onFileSelected: function(ev) {
- this.avatarSet = true;
- this.setAvatarFromFile(ev.target.files[0]);
- },
-
- onError: function(error) {
- this.setState({
- errorText: "Failed to upload profile picture!"
- });
- },
-
- render: function() {
- var RoomAvatar = sdk.getComponent('atoms.RoomAvatar');
- var avatarImg;
- // Having just set an avatar we just display that since it will take a little
- // time to propagate through to the RoomAvatar.
- if (this.props.room && !this.avatarSet) {
- avatarImg = 
;
- }
-
- switch (this.state.phase) {
- case this.Phases.Display:
- case this.Phases.Error:
- return (
-
- );
- }
- }
-});
diff --git a/src/skins/vector/views/molecules/ChangePassword.js b/src/skins/vector/views/molecules/ChangePassword.js
deleted file mode 100644
index b1d8f28e6f..0000000000
--- a/src/skins/vector/views/molecules/ChangePassword.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
-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 ChangePasswordController = require('matrix-react-sdk/lib/controllers/molecules/ChangePassword')
-
-module.exports = React.createClass({
- displayName: 'ChangePassword',
- mixins: [ChangePasswordController],
-
- onClickChange: function() {
- var old_password = this.refs.old_input.value;
- var new_password = this.refs.new_input.value;
- var confirm_password = this.refs.confirm_input.value;
- if (new_password != confirm_password) {
- this.setState({
- state: this.Phases.Error,
- errorString: "Passwords don't match"
- });
- } else if (new_password == '' || old_password == '') {
- this.setState({
- state: this.Phases.Error,
- errorString: "Passwords can't be empty"
- });
- } else {
- this.changePassword(old_password, new_password);
- }
- },
-
- render: function() {
- switch (this.state.phase) {
- case this.Phases.Edit:
- case this.Phases.Error:
- return (
- 
-
-
-
- );
- } else if (content.body) {
- return (
-
- Image '{content.body}' cannot be displayed.
-
- );
- } else {
- return (
-
- This image cannot be displayed.
-
- );
- }
- },
-});
diff --git a/src/skins/vector/views/molecules/MNoticeTile.js b/src/skins/vector/views/molecules/MNoticeTile.js
deleted file mode 100644
index a0cedb1ddd..0000000000
--- a/src/skins/vector/views/molecules/MNoticeTile.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-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 sanitizeHtml = require('sanitize-html');
-
-var MNoticeTileController = require('matrix-react-sdk/lib/controllers/molecules/MNoticeTile')
-
-var allowedAttributes = sanitizeHtml.defaults.allowedAttributes;
-allowedAttributes['font'] = ['color'];
-var sanitizeHtmlParams = {
- allowedTags: sanitizeHtml.defaults.allowedTags.concat([ 'font' ]),
- allowedAttributes: allowedAttributes,
-};
-
-module.exports = React.createClass({
- displayName: 'MNoticeTile',
- mixins: [MNoticeTileController],
-
- // FIXME: this entire class is copy-pasted from MTextTile :(
- render: function() {
- var content = this.props.mxEvent.getContent();
- var originalBody = content.body;
- var body;
-
- if (this.props.searchTerm) {
- var lastOffset = 0;
- var bodyList = [];
- var k = 0;
- var offset;
-
- // XXX: rather than searching for the search term in the body,
- // we should be looking at the match delimiters returned by the FTS engine
- if (content.format === "org.matrix.custom.html") {
- var safeBody = sanitizeHtml(content.formatted_body, sanitizeHtmlParams);
- var safeSearchTerm = sanitizeHtml(this.props.searchTerm, sanitizeHtmlParams);
- while ((offset = safeBody.indexOf(safeSearchTerm, lastOffset)) >= 0) {
- // FIXME: we need to apply the search highlighting to only the text elements of HTML, which means
- // hooking into the sanitizer parser rather than treating it as a string. Otherwise
- // the act of highlighting a or whatever will break the HTML badly.
- bodyList.push();
- bodyList.push();
- lastOffset = offset + safeSearchTerm.length;
- }
- bodyList.push();
- }
- else {
- while ((offset = originalBody.indexOf(this.props.searchTerm, lastOffset)) >= 0) {
- bodyList.push({ originalBody.substring(lastOffset, offset) });
- bodyList.push({ this.props.searchTerm });
- lastOffset = offset + this.props.searchTerm.length;
- }
- bodyList.push({ originalBody.substring(lastOffset) });
- }
- body = bodyList;
- }
- else {
- if (content.format === "org.matrix.custom.html") {
- var safeBody = sanitizeHtml(content.formatted_body, sanitizeHtmlParams);
- body = ;
- }
- else {
- body = originalBody;
- }
- }
-
- return (
-
- { body }
-
- );
- },
-});
-
diff --git a/src/skins/vector/views/molecules/MRoomMemberTile.js b/src/skins/vector/views/molecules/MRoomMemberTile.js
deleted file mode 100644
index 0048306d39..0000000000
--- a/src/skins/vector/views/molecules/MRoomMemberTile.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
-
-module.exports = React.createClass({
- displayName: 'MRoomMemberTile',
-
- getMemberEventText: function() {
- return TextForEvent.textForEvent(this.props.mxEvent);
- },
-
- render: function() {
- // XXX: for now, just cheekily borrow the css from message tile...
- var timestamp = this.props.last ? 
: null;
-
- var nameClass = "mx_MemberTile_name";
- if (zalgo.test(name)) {
- nameClass += " mx_MemberTile_zalgo";
- }
-
- var nameEl;
- if (this.state.hover) {
- var presence;
- // FIXME: make presence data update whenever User.presence changes...
- var active = this.props.member.user ? ((Date.now() - (this.props.member.user.lastPresenceTs - this.props.member.user.lastActiveAgo)) || -1) : -1;
- if (active >= 0) {
- presence = 
- }
- header =
-
- This allows you to use Vector with an existing Matrix account on a different Home server.
-
- You can also set a custom Identity server but this will affect people's ability to find you - if you use a server in a group other than the main Matrix.org group. - , - button: "Dismiss", - focus: true, - }); - }, - - render: function() { - return ( -
:
- null;
-
- var RoomSubList = sdk.getComponent('organisms.RoomSubList');
- var self = this;
-
- return (
-
-
- );
- }
-});
-
diff --git a/src/skins/vector/views/organisms/RoomView.js b/src/skins/vector/views/organisms/RoomView.js
deleted file mode 100644
index e569a35387..0000000000
--- a/src/skins/vector/views/organisms/RoomView.js
+++ /dev/null
@@ -1,323 +0,0 @@
-/*
-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 ReactDOM = require('react-dom');
-
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var dis = require('matrix-react-sdk/lib/dispatcher');
-
-var sdk = require('matrix-react-sdk')
-var classNames = require("classnames");
-var filesize = require('filesize');
-
-var GeminiScrollbar = require('react-gemini-scrollbar');
-var RoomViewController = require('../../../../controllers/organisms/RoomView')
-
-module.exports = React.createClass({
- displayName: 'RoomView',
- mixins: [RoomViewController],
-
- onSettingsClick: function() {
- this.setState({editingRoomSettings: true});
- },
-
- onSaveClick: function() {
- this.setState({
- editingRoomSettings: false,
- uploadingRoomSettings: true,
- });
-
- var new_name = this.refs.header.getRoomName();
- var new_topic = this.refs.room_settings.getTopic();
- var new_join_rule = this.refs.room_settings.getJoinRules();
- var new_history_visibility = this.refs.room_settings.getHistoryVisibility();
- var new_power_levels = this.refs.room_settings.getPowerLevels();
-
- this.uploadNewState(
- new_name,
- new_topic,
- new_join_rule,
- new_history_visibility,
- new_power_levels
- );
- },
-
- onCancelClick: function() {
- this.setState(this.getInitialState());
- },
-
- onRejectButtonClicked: function(ev) {
- var self = this;
- this.setState({
- rejecting: true
- });
- MatrixClientPeg.get().leave(this.props.roomId).done(function() {
- dis.dispatch({ action: 'view_next_room' });
- self.setState({
- rejecting: false
- });
- }, function(err) {
- console.error("Failed to reject invite: %s", err);
- self.setState({
- rejecting: false,
- rejectError: err
- });
- });
- },
-
- onSearchClick: function() {
- this.setState({ searching: true });
- },
-
- onConferenceNotificationClick: function() {
- dis.dispatch({
- action: 'place_call',
- type: "video",
- room_id: this.props.roomId
- });
- },
-
- getUnreadMessagesString: function() {
- if (!this.state.numUnreadMessages) {
- return "";
- }
- return this.state.numUnreadMessages + " new message" + (this.state.numUnreadMessages > 1 ? "s" : "");
- },
-
- scrollToBottom: function() {
- var scrollNode = this._getScrollNode();
- if (!scrollNode) return;
- scrollNode.scrollTop = scrollNode.scrollHeight;
- },
-
- render: function() {
- var RoomHeader = sdk.getComponent('molecules.RoomHeader');
- var MessageComposer = sdk.getComponent('molecules.MessageComposer');
- var CallView = sdk.getComponent("molecules.voip.CallView");
- var RoomSettings = sdk.getComponent("molecules.RoomSettings");
- var SearchBar = sdk.getComponent("molecules.SearchBar");
-
- if (!this.state.room) {
- if (this.props.roomId) {
- return (
- ;
- }
-
- var conferenceCallNotification = null;
- if (this.state.displayConfCallNotification) {
- var supportedText;
- if (!MatrixClientPeg.get().supportsVoip()) {
- supportedText = " (unsupported)";
- }
- conferenceCallNotification = (
-
- break;
- case this.PageTypes.CreateRoom:
- page_element =
- right_panel =
- break;
- case this.PageTypes.RoomDirectory:
- page_element =
- break;
- }
-
- // TODO: Fix duplication here and do conditionals like we do above
- if (Notifier.supportsDesktopNotifications() && !Notifier.isEnabled() && !Notifier.isToolbarHidden()) {
- return (
-
-
-
-
- #da532c
-
-
-
diff --git a/vector/index.html b/vector/index.html
index d86466797d..273cb4394f 100644
--- a/vector/index.html
+++ b/vector/index.html
@@ -3,27 +3,27 @@
Vector
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -42,5 +42,6 @@
+
{resendButton}
{redactButton}
+ {cancelButton}
{viewSourceButton}
);
diff --git a/src/skins/vector/views/molecules/RoomTile.js b/src/components/views/rooms/RoomDNDView.js
similarity index 64%
rename from src/skins/vector/views/molecules/RoomTile.js
rename to src/components/views/rooms/RoomDNDView.js
index 31dead455c..9b01629df2 100644
--- a/src/skins/vector/views/molecules/RoomTile.js
+++ b/src/components/views/rooms/RoomDNDView.js
@@ -19,13 +19,11 @@ limitations under the License.
var React = require('react');
var DragSource = require('react-dnd').DragSource;
var DropTarget = require('react-dnd').DropTarget;
-var classNames = require('classnames');
-
-var RoomTileController = require('matrix-react-sdk/lib/controllers/molecules/RoomTile')
+var dis = require("matrix-react-sdk/lib/dispatcher");
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-
-var sdk = require('matrix-react-sdk')
+var sdk = require('matrix-react-sdk');
+var RoomTile = require('matrix-react-sdk/lib/components/views/rooms/RoomTile');
/**
* Specifies the drag source contract.
@@ -69,7 +67,7 @@ var roomTileSource = {
if (monitor.didDrop() && item.targetList.props.editable) {
// if we moved lists, remove the old tag
- if (item.targetList !== item.originalList) {
+ if (item.targetList !== item.originalList && item.originalList.props.tagName) {
// commented out attempts to set a spinner on our target component as component is actually
// the original source component being dragged, not our target. To fix we just need to
// move all of this to endDrop in the target instead. FIXME later.
@@ -78,7 +76,7 @@ var roomTileSource = {
MatrixClientPeg.get().deleteRoomTag(item.room.roomId, item.originalList.props.tagName).finally(function() {
//component.state.set({ spinner: component.state.spinner-- });
}).fail(function(err) {
- var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
+ var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Failed to remove tag " + item.originalList.props.tagName + " from room",
description: err.toString()
@@ -97,7 +95,7 @@ var roomTileSource = {
MatrixClientPeg.get().setRoomTag(item.room.roomId, item.targetList.props.tagName, newOrder).finally(function() {
//component.state.set({ spinner: component.state.spinner-- });
}).fail(function(err) {
- var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
+ var ErrorDialog = sdk.getComponent("dialogs.ErrorDialog");
Modal.createDialog(ErrorDialog, {
title: "Failed to add tag " + item.targetList.props.tagName + " to room",
description: err.toString()
@@ -183,117 +181,6 @@ var roomTileTarget = {
},
};
-var RoomTile = React.createClass({
- displayName: 'RoomTile',
- mixins: [RoomTileController],
-
- propTypes: {
- connectDragSource: React.PropTypes.func.isRequired,
- connectDropTarget: React.PropTypes.func.isRequired,
- isDragging: React.PropTypes.bool.isRequired,
- room: React.PropTypes.object.isRequired,
- collapsed: React.PropTypes.bool.isRequired,
- selected: React.PropTypes.bool.isRequired,
- unread: React.PropTypes.bool.isRequired,
- highlight: React.PropTypes.bool.isRequired,
- isInvite: React.PropTypes.bool.isRequired,
- roomSubList: React.PropTypes.object.isRequired,
- },
-
- getInitialState: function() {
- return( { hover : false });
- },
-
- onMouseEnter: function() {
- this.setState( { hover : true });
- },
-
- onMouseLeave: function() {
- this.setState( { hover : false });
- },
-
- render: function() {
- // if (this.props.clientOffset) {
- // //console.log("room " + this.props.room.roomId + " has dropTarget clientOffset " + this.props.clientOffset.x + "," + this.props.clientOffset.y);
- // }
-
-/*
- if (this.props.room._dragging) {
- var RoomDropTarget = sdk.getComponent("molecules.RoomDropTarget");
- return !
;
- }
- else if (this.props.unread) {
- badge = 1
;
- }
- var nameCell;
- if (badge) {
- nameCell = {name}
{badge}
{name}
;
- }
- */
-
- var label;
- if (!this.props.collapsed) {
- var className = 'mx_RoomTile_name' + (this.props.isInvite ? ' mx_RoomTile_invite' : '');
- label = {name}
;
- }
- else if (this.state.hover) {
- var RoomTooltip = sdk.getComponent("molecules.RoomTooltip");
- label =
-
- ));
- }
-});
-
// Export the wrapped version, inlining the 'collect' functions
// to more closely resemble the ES7
module.exports =
@@ -313,4 +200,6 @@ DragSource('RoomTile', roomTileSource, function(connect, monitor) {
// You can ask the monitor about the current drag state:
isDragging: monitor.isDragging()
};
-})(RoomTile));
\ No newline at end of file
+})(RoomTile));
+
+module.exports.replaces = 'RoomTile';
diff --git a/src/skins/vector/views/molecules/RoomDropTarget.js b/src/components/views/rooms/RoomDropTarget.js
similarity index 100%
rename from src/skins/vector/views/molecules/RoomDropTarget.js
rename to src/components/views/rooms/RoomDropTarget.js
diff --git a/src/skins/vector/views/molecules/RoomTooltip.js b/src/components/views/rooms/RoomTooltip.js
similarity index 100%
rename from src/skins/vector/views/molecules/RoomTooltip.js
rename to src/components/views/rooms/RoomTooltip.js
diff --git a/src/skins/vector/views/molecules/SearchBar.js b/src/components/views/rooms/SearchBar.js
similarity index 57%
rename from src/skins/vector/views/molecules/SearchBar.js
rename to src/components/views/rooms/SearchBar.js
index 585b9a6d4a..e66f123609 100644
--- a/src/skins/vector/views/molecules/SearchBar.js
+++ b/src/components/views/rooms/SearchBar.js
@@ -19,6 +19,7 @@ limitations under the License.
var React = require('react');
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var sdk = require('matrix-react-sdk');
+var classNames = require('classnames');
module.exports = React.createClass({
displayName: 'SearchBar',
@@ -39,17 +40,29 @@ module.exports = React.createClass({
onSearchChange: function(e) {
if (e.keyCode === 13) { // on enter...
- this.props.onSearch(this.refs.search_term.value, this.state.scope);
+ this.onSearch();
}
+ if (e.keyCode === 27) { // escape...
+ this.props.onCancelClick();
+ }
+ },
+
+ onSearch: function() {
+ this.props.onSearch(this.refs.search_term.value, this.state.scope);
},
render: function() {
+ var searchButtonClasses = classNames({ mx_SearchBar_searchButton : true, mx_SearchBar_searching: this.props.searchInProgress });
+ var thisRoomClasses = classNames({ mx_SearchBar_button : true, mx_SearchBar_unselected : this.state.scope !== 'Room' });
+ var allRoomsClasses = classNames({ mx_SearchBar_button : true, mx_SearchBar_unselected : this.state.scope !== 'All' });
+
return (
-
- { label }
-
-
+ 
+ 
);
}
diff --git a/src/controllers/molecules/voip/CallView.js b/src/controllers/molecules/voip/CallView.js
deleted file mode 100644
index ab71214882..0000000000
--- a/src/controllers/molecules/voip/CallView.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-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 dis = require("matrix-react-sdk/lib/dispatcher");
-var CallHandler = require("matrix-react-sdk/lib/CallHandler");
-var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
-
-var VectorConferenceHandler = require('../../../modules/VectorConferenceHandler');
-
-/*
- * State vars:
- * this.state.call = MatrixCall|null
- *
- * Props:
- * this.props.room = Room (JS SDK)
- *
- * Internal state:
- * this._trackedRoom = (either from props.room or programatically set)
- */
-
-module.exports = {
-
- componentDidMount: function() {
- this.dispatcherRef = dis.register(this.onAction);
- this._trackedRoom = null;
- if (this.props.room) {
- this._trackedRoom = this.props.room;
- this.showCall(this._trackedRoom.roomId);
- }
- else {
- var call = CallHandler.getAnyActiveCall();
- if (call) {
- console.log(
- "Global CallView is now tracking active call in room %s",
- call.roomId
- );
- this._trackedRoom = MatrixClientPeg.get().getRoom(call.roomId);
- this.showCall(call.roomId);
- }
- }
- },
-
- componentWillUnmount: function() {
- dis.unregister(this.dispatcherRef);
- },
-
- onAction: function(payload) {
- // don't filter out payloads for room IDs other than props.room because
- // we may be interested in the conf 1:1 room
- if (payload.action !== 'call_state' || !payload.room_id) {
- return;
- }
- this.showCall(payload.room_id);
- },
-
- showCall: function(roomId) {
- var call = (
- CallHandler.getCallForRoom(roomId) ||
- VectorConferenceHandler.getConferenceCallForRoom(roomId)
- );
- if (call) {
- call.setLocalVideoElement(this.getVideoView().getLocalVideoElement());
- call.setRemoteVideoElement(this.getVideoView().getRemoteVideoElement());
- // give a separate element for audio stream playback - both for voice calls
- // and for the voice stream of screen captures
- call.setRemoteAudioElement(this.getVideoView().getRemoteAudioElement());
- }
- if (call && call.type === "video" && call.state !== 'ended') {
- // if this call is a conf call, don't display local video as the
- // conference will have us in it
- this.getVideoView().getLocalVideoElement().style.display = (
- call.confUserId ? "none" : "initial"
- );
- this.getVideoView().getRemoteVideoElement().style.display = "initial";
- }
- else {
- this.getVideoView().getLocalVideoElement().style.display = "none";
- this.getVideoView().getRemoteVideoElement().style.display = "none";
- dis.dispatch({action: 'video_fullscreen', fullscreen: false});
- }
- }
-};
-
diff --git a/src/controllers/organisms/RoomList.js b/src/controllers/organisms/RoomList.js
deleted file mode 100644
index 37d4a4e4a2..0000000000
--- a/src/controllers/organisms/RoomList.js
+++ /dev/null
@@ -1,201 +0,0 @@
-/*
-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 ReactDOM = require("react-dom");
-
-var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
-var RoomListSorter = require("matrix-react-sdk/lib/RoomListSorter");
-var dis = require("matrix-react-sdk/lib/dispatcher");
-
-var sdk = require('matrix-react-sdk');
-var VectorConferenceHandler = require("../../modules/VectorConferenceHandler");
-
-var HIDE_CONFERENCE_CHANS = true;
-
-module.exports = {
- getInitialState: function() {
- return {
- activityMap: null,
- lists: {},
- }
- },
-
- componentWillMount: function() {
- var cli = MatrixClientPeg.get();
- cli.on("Room", this.onRoom);
- cli.on("Room.timeline", this.onRoomTimeline);
- cli.on("Room.name", this.onRoomName);
- cli.on("Room.tags", this.onRoomTags);
- cli.on("RoomState.events", this.onRoomStateEvents);
- cli.on("RoomMember.name", this.onRoomMemberName);
-
- var s = this.getRoomLists();
- s.activityMap = {};
- this.setState(s);
- },
-
- componentDidMount: function() {
- this.dispatcherRef = dis.register(this.onAction);
- },
-
- onAction: function(payload) {
- switch (payload.action) {
- case 'view_tooltip':
- this.tooltip = payload.tooltip;
- this._repositionTooltip();
- if (this.tooltip) this.tooltip.style.display = 'block';
- break
- }
- },
-
- componentWillUnmount: function() {
- dis.unregister(this.dispatcherRef);
- if (MatrixClientPeg.get()) {
- MatrixClientPeg.get().removeListener("Room", this.onRoom);
- MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
- MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
- MatrixClientPeg.get().removeListener("RoomState.events", this.onRoomStateEvents);
- }
- },
-
- componentWillReceiveProps: function(newProps) {
- this.state.activityMap[newProps.selectedRoom] = undefined;
- this.setState({
- activityMap: this.state.activityMap
- });
- },
-
- onRoom: function(room) {
- this.refreshRoomList();
- },
-
- onRoomTimeline: function(ev, room, toStartOfTimeline) {
- if (toStartOfTimeline) return;
-
- var newState = this.getRoomLists();
- if (
- room.roomId != this.props.selectedRoom &&
- ev.getSender() != MatrixClientPeg.get().credentials.userId)
- {
- var hl = 1;
-
- var actions = MatrixClientPeg.get().getPushActionsForEvent(ev);
- if (actions && actions.tweaks && actions.tweaks.highlight) {
- hl = 2;
- }
- // obviously this won't deep copy but this shouldn't be necessary
- var amap = this.state.activityMap;
- amap[room.roomId] = Math.max(amap[room.roomId] || 0, hl);
-
- newState.activityMap = amap;
- }
- this.setState(newState);
- },
-
- onRoomName: function(room) {
- this.refreshRoomList();
- },
-
- onRoomTags: function(event, room) {
- this.refreshRoomList();
- },
-
- onRoomStateEvents: function(ev, state) {
- setTimeout(this.refreshRoomList, 0);
- },
-
- onRoomMemberName: function(ev, member) {
- setTimeout(this.refreshRoomList, 0);
- },
-
- refreshRoomList: function() {
- // TODO: rather than bluntly regenerating and re-sorting everything
- // every time we see any kind of room change from the JS SDK
- // we could do incremental updates on our copy of the state
- // based on the room which has actually changed. This would stop
- // us re-rendering all the sublists every time anything changes anywhere
- // in the state of the client.
- this.setState(this.getRoomLists());
- },
-
- getRoomLists: function() {
- var s = { lists: {} };
-
- s.lists["m.invite"] = [];
- s.lists["m.favourite"] = [];
- s.lists["m.recent"] = [];
- s.lists["m.lowpriority"] = [];
- s.lists["m.archived"] = [];
-
- MatrixClientPeg.get().getRooms().forEach(function(room) {
- var me = room.getMember(MatrixClientPeg.get().credentials.userId);
-
- if (me && me.membership == "invite") {
- s.lists["m.invite"].push(room);
- }
- else {
- var shouldShowRoom = (
- me && (me.membership == "join")
- );
-
- // hiding conf rooms only ever toggles shouldShowRoom to false
- if (shouldShowRoom && HIDE_CONFERENCE_CHANS) {
- // we want to hide the 1:1 conf<->user room and not the group chat
- var joinedMembers = room.getJoinedMembers();
- if (joinedMembers.length === 2) {
- var otherMember = joinedMembers.filter(function(m) {
- return m.userId !== me.userId
- })[0];
- if (VectorConferenceHandler.isConferenceUser(otherMember)) {
- // console.log("Hiding conference 1:1 room %s", room.roomId);
- shouldShowRoom = false;
- }
- }
- }
-
- if (shouldShowRoom) {
- var tagNames = Object.keys(room.tags);
- if (tagNames.length) {
- for (var i = 0; i < tagNames.length; i++) {
- var tagName = tagNames[i];
- s.lists[tagName] = s.lists[tagName] || [];
- s.lists[tagNames[i]].push(room);
- }
- }
- else {
- s.lists["m.recent"].push(room);
- }
- }
- }
- });
-
- //console.log("calculated new roomLists; m.recent = " + s.lists["m.recent"]);
-
- // we actually apply the sorting to this when receiving the prop in RoomSubLists.
-
- return s;
- },
-
- _repositionTooltip: function(e) {
- if (this.tooltip && this.tooltip.parentElement) {
- var scroll = ReactDOM.findDOMNode(this);
- this.tooltip.style.top = (scroll.parentElement.offsetTop + this.tooltip.parentElement.offsetTop - scroll.children[2].scrollTop) + "px";
- }
- },
-};
diff --git a/src/controllers/organisms/RoomView.js b/src/controllers/organisms/RoomView.js
deleted file mode 100644
index e603198a72..0000000000
--- a/src/controllers/organisms/RoomView.js
+++ /dev/null
@@ -1,628 +0,0 @@
-/*
-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.
-*/
-
-var Matrix = require("matrix-js-sdk");
-var MatrixClientPeg = require("matrix-react-sdk/lib/MatrixClientPeg");
-var React = require("react");
-var ReactDOM = require("react-dom");
-var q = require("q");
-var ContentMessages = require("matrix-react-sdk/lib//ContentMessages");
-var WhoIsTyping = require("matrix-react-sdk/lib/WhoIsTyping");
-var Modal = require("matrix-react-sdk/lib/Modal");
-var sdk = require('matrix-react-sdk/lib/index');
-var CallHandler = require('matrix-react-sdk/lib/CallHandler');
-var VectorConferenceHandler = require('../../modules/VectorConferenceHandler');
-var Resend = require("../../Resend");
-
-var dis = require("matrix-react-sdk/lib/dispatcher");
-
-var PAGINATE_SIZE = 20;
-var INITIAL_SIZE = 20;
-
-module.exports = {
- getInitialState: function() {
- var room = this.props.roomId ? MatrixClientPeg.get().getRoom(this.props.roomId) : null;
- return {
- room: room,
- messageCap: INITIAL_SIZE,
- editingRoomSettings: false,
- uploadingRoomSettings: false,
- numUnreadMessages: 0,
- draggingFile: false,
- searching: false,
- searchResults: null,
- syncState: MatrixClientPeg.get().getSyncState(),
- hasUnsentMessages: this._hasUnsentMessages(room)
- }
- },
-
- componentWillMount: function() {
- this.dispatcherRef = dis.register(this.onAction);
- MatrixClientPeg.get().on("Room.timeline", this.onRoomTimeline);
- MatrixClientPeg.get().on("Room.name", this.onRoomName);
- MatrixClientPeg.get().on("RoomMember.typing", this.onRoomMemberTyping);
- MatrixClientPeg.get().on("RoomState.members", this.onRoomStateMember);
- MatrixClientPeg.get().on("sync", this.onSyncStateChange);
- this.atBottom = true;
- },
-
- componentWillUnmount: function() {
- if (this.refs.messagePanel) {
- var messagePanel = ReactDOM.findDOMNode(this.refs.messagePanel);
- messagePanel.removeEventListener('drop', this.onDrop);
- messagePanel.removeEventListener('dragover', this.onDragOver);
- messagePanel.removeEventListener('dragleave', this.onDragLeaveOrEnd);
- messagePanel.removeEventListener('dragend', this.onDragLeaveOrEnd);
- }
- dis.unregister(this.dispatcherRef);
- if (MatrixClientPeg.get()) {
- MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
- MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
- MatrixClientPeg.get().removeListener("RoomMember.typing", this.onRoomMemberTyping);
- MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
- MatrixClientPeg.get().removeListener("sync", this.onSyncStateChange);
- }
- },
-
- onAction: function(payload) {
- switch (payload.action) {
- case 'message_send_failed':
- case 'message_sent':
- this.setState({
- hasUnsentMessages: this._hasUnsentMessages(this.state.room)
- });
- case 'message_resend_started':
- this.setState({
- room: MatrixClientPeg.get().getRoom(this.props.roomId)
- });
- this.forceUpdate();
- break;
- case 'notifier_enabled':
- this.forceUpdate();
- break;
- case 'call_state':
- if (CallHandler.getCallForRoom(this.props.roomId)) {
- // Call state has changed so we may be loading video elements
- // which will obscure the message log.
- // scroll to bottom
- var scrollNode = this._getScrollNode();
- if (scrollNode) {
- scrollNode.scrollTop = scrollNode.scrollHeight;
- }
- }
-
- // possibly remove the conf call notification if we're now in
- // the conf
- this._updateConfCallNotification();
- break;
- }
- },
-
- _getScrollNode: function() {
- var panel = ReactDOM.findDOMNode(this.refs.messagePanel);
- if (!panel) return null;
-
- if (panel.classList.contains('gm-prevented')) {
- return panel;
- } else {
- return panel.children[2]; // XXX: Fragile!
- }
- },
-
- onSyncStateChange: function(state) {
- this.setState({
- syncState: state
- });
- },
-
- // MatrixRoom still showing the messages from the old room?
- // Set the key to the room_id. Sadly you can no longer get at
- // the key from inside the component, or we'd check this in code.
- /*componentWillReceiveProps: function(props) {
- },*/
-
- onRoomTimeline: function(ev, room, toStartOfTimeline) {
- if (!this.isMounted()) return;
-
- // ignore anything that comes in whilst paginating: we get one
- // event for each new matrix event so this would cause a huge
- // number of UI updates. Just update the UI when the paginate
- // call returns.
- if (this.state.paginating) return;
-
- // no point handling anything while we're waiting for the join to finish:
- // we'll only be showing a spinner.
- if (this.state.joining) return;
- if (room.roomId != this.props.roomId) return;
-
- var scrollNode = this._getScrollNode();
- if (scrollNode) {
- this.atBottom = (
- scrollNode.scrollHeight - scrollNode.scrollTop <=
- (scrollNode.clientHeight + 150) // 150?
- );
- }
-
- var currentUnread = this.state.numUnreadMessages;
- if (!toStartOfTimeline &&
- (ev.getSender() !== MatrixClientPeg.get().credentials.userId)) {
- // update unread count when scrolled up
- if (this.atBottom) {
- currentUnread = 0;
- }
- else {
- currentUnread += 1;
- }
- }
-
-
- this.setState({
- room: MatrixClientPeg.get().getRoom(this.props.roomId),
- numUnreadMessages: currentUnread
- });
-
- if (toStartOfTimeline && !this.state.paginating) {
- this.fillSpace();
- }
- },
-
- onRoomName: function(room) {
- if (room.roomId == this.props.roomId) {
- this.setState({
- room: room
- });
- }
- },
-
- onRoomMemberTyping: function(ev, member) {
- this.forceUpdate();
- },
-
- onRoomStateMember: function(ev, state, member) {
- if (member.roomId !== this.props.roomId ||
- member.userId !== VectorConferenceHandler.getConferenceUserIdForRoom(member.roomId)) {
- return;
- }
- this._updateConfCallNotification();
- },
-
- _hasUnsentMessages: function(room) {
- return this._getUnsentMessages(room).length > 0;
- },
-
- _getUnsentMessages: function(room) {
- if (!room) { return []; }
- // TODO: It would be nice if the JS SDK provided nicer constant-time
- // constructs rather than O(N) (N=num msgs) on this.
- return room.timeline.filter(function(ev) {
- return ev.status === Matrix.EventStatus.NOT_SENT;
- });
- },
-
- _updateConfCallNotification: function() {
- var room = MatrixClientPeg.get().getRoom(this.props.roomId);
- if (!room) return;
- var confMember = room.getMember(
- VectorConferenceHandler.getConferenceUserIdForRoom(this.props.roomId)
- );
-
- if (!confMember) {
- return;
- }
- var confCall = VectorConferenceHandler.getConferenceCallForRoom(confMember.roomId);
-
- // A conf call notification should be displayed if there is an ongoing
- // conf call but this cilent isn't a part of it.
- this.setState({
- displayConfCallNotification: (
- (!confCall || confCall.call_state === "ended") &&
- confMember.membership === "join"
- )
- });
- },
-
- componentDidMount: function() {
- if (this.refs.messagePanel) {
- var messagePanel = ReactDOM.findDOMNode(this.refs.messagePanel);
-
- messagePanel.addEventListener('drop', this.onDrop);
- messagePanel.addEventListener('dragover', this.onDragOver);
- messagePanel.addEventListener('dragleave', this.onDragLeaveOrEnd);
- messagePanel.addEventListener('dragend', this.onDragLeaveOrEnd);
-
- var messageWrapperScroll = this._getScrollNode();
-
- messageWrapperScroll.scrollTop = messageWrapperScroll.scrollHeight;
-
- this.fillSpace();
- }
-
- this._updateConfCallNotification();
- },
-
- componentDidUpdate: function() {
- if (!this.refs.messagePanel) return;
-
- var messageWrapperScroll = this._getScrollNode();
-
- if (this.state.paginating && !this.waiting_for_paginate) {
- var heightGained = messageWrapperScroll.scrollHeight - this.oldScrollHeight;
- messageWrapperScroll.scrollTop += heightGained;
- this.oldScrollHeight = undefined;
- if (!this.fillSpace()) {
- this.setState({paginating: false});
- }
- } else if (this.atBottom) {
- messageWrapperScroll.scrollTop = messageWrapperScroll.scrollHeight;
- if (this.state.numUnreadMessages !== 0) {
- this.setState({numUnreadMessages: 0});
- }
- }
- },
-
- fillSpace: function() {
- if (!this.refs.messagePanel) return;
- var messageWrapperScroll = this._getScrollNode();
- if (messageWrapperScroll.scrollTop < messageWrapperScroll.clientHeight && this.state.room.oldState.paginationToken) {
- this.setState({paginating: true});
-
- this.oldScrollHeight = messageWrapperScroll.scrollHeight;
-
- if (this.state.messageCap < this.state.room.timeline.length) {
- this.waiting_for_paginate = false;
- var cap = Math.min(this.state.messageCap + PAGINATE_SIZE, this.state.room.timeline.length);
- this.setState({messageCap: cap, paginating: true});
- } else {
- this.waiting_for_paginate = true;
- var cap = this.state.messageCap + PAGINATE_SIZE;
- this.setState({messageCap: cap, paginating: true});
- var self = this;
- MatrixClientPeg.get().scrollback(this.state.room, PAGINATE_SIZE).finally(function() {
- self.waiting_for_paginate = false;
- if (self.isMounted()) {
- self.setState({
- room: MatrixClientPeg.get().getRoom(self.props.roomId)
- });
- }
- // wait and set paginating to false when the component updates
- });
- }
-
- return true;
- }
- return false;
- },
-
- onResendAllClick: function() {
- var eventsToResend = this._getUnsentMessages(this.state.room);
- eventsToResend.forEach(function(event) {
- Resend.resend(event);
- });
- },
-
- onJoinButtonClicked: function(ev) {
- var self = this;
- MatrixClientPeg.get().joinRoom(this.props.roomId).then(function() {
- self.setState({
- joining: false,
- room: MatrixClientPeg.get().getRoom(self.props.roomId)
- });
- }, function(error) {
- self.setState({
- joining: false,
- joinError: error
- });
- });
- this.setState({
- joining: true
- });
- },
-
- onMessageListScroll: function(ev) {
- if (this.refs.messagePanel) {
- var messageWrapperScroll = this._getScrollNode();
- var wasAtBottom = this.atBottom;
- this.atBottom = messageWrapperScroll.scrollHeight - messageWrapperScroll.scrollTop <= messageWrapperScroll.clientHeight + 1;
- if (this.atBottom && !wasAtBottom) {
- this.forceUpdate(); // remove unread msg count
- }
- }
- if (!this.state.paginating) this.fillSpace();
- },
-
- onDragOver: function(ev) {
- ev.stopPropagation();
- ev.preventDefault();
-
- ev.dataTransfer.dropEffect = 'none';
-
- var items = ev.dataTransfer.items;
- if (items.length == 1) {
- if (items[0].kind == 'file') {
- this.setState({ draggingFile : true });
- ev.dataTransfer.dropEffect = 'copy';
- }
- }
- },
-
- onDrop: function(ev) {
- ev.stopPropagation();
- ev.preventDefault();
- this.setState({ draggingFile : false });
- var files = ev.dataTransfer.files;
- if (files.length == 1) {
- this.uploadFile(files[0]);
- }
- },
-
- onDragLeaveOrEnd: function(ev) {
- ev.stopPropagation();
- ev.preventDefault();
- this.setState({ draggingFile : false });
- },
-
- uploadFile: function(file) {
- this.setState({
- upload: {
- fileName: file.name,
- uploadedBytes: 0,
- totalBytes: file.size
- }
- });
- var self = this;
- ContentMessages.sendContentToRoom(
- file, this.props.roomId, MatrixClientPeg.get()
- ).progress(function(ev) {
- //console.log("Upload: "+ev.loaded+" / "+ev.total);
- self.setState({
- upload: {
- fileName: file.name,
- uploadedBytes: ev.loaded,
- totalBytes: ev.total
- }
- });
- }).finally(function() {
- self.setState({
- upload: undefined
- });
- }).done(undefined, function(error) {
- var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
- Modal.createDialog(ErrorDialog, {
- title: "Failed to upload file",
- description: error.toString()
- });
- });
- },
-
- getWhoIsTypingString: function() {
- return WhoIsTyping.whoIsTypingString(this.state.room);
- },
-
- onSearch: function(term, scope) {
- var filter;
- if (scope === "Room") { // FIXME: should be enum
- filter = {
- // XXX: it's unintuitive that the filter for searching doesn't have the same shape as the v2 filter API :(
- rooms: [
- this.props.roomId
- ]
- };
- }
-
- var self = this;
- MatrixClientPeg.get().search({
- body: {
- search_categories: {
- room_events: {
- search_term: term,
- filter: filter,
- order_by: "recent",
- event_context: {
- before_limit: 1,
- after_limit: 1,
- }
- }
- }
- }
- }).then(function(data) {
- self.setState({
- searchTerm: term,
- searchResults: data,
- });
- }, function(error) {
- var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
- Modal.createDialog(ErrorDialog, {
- title: "Search failed",
- description: error.toString()
- });
- });
- },
-
- getEventTiles: function() {
- var DateSeparator = sdk.getComponent('molecules.DateSeparator');
-
- var ret = [];
- var count = 0;
-
- var EventTile = sdk.getComponent('molecules.EventTile');
-
- if (this.state.searchResults) {
- // XXX: this dance is foul, due to the results API not returning sorted results
- var results = this.state.searchResults.search_categories.room_events.results;
- var eventIds = Object.keys(results);
- // XXX: todo: merge overlapping results somehow?
- // XXX: why doesn't searching on name work?
- var resultList = eventIds.map(function(key) { return results[key]; }); // .sort(function(a, b) { b.rank - a.rank });
- for (var i = 0; i < resultList.length; i++) {
- var ts1 = resultList[i].result.origin_server_ts;
- ret.push(This Room
- All Rooms
-
+ This Room
+ All Rooms
+
{this.state.value}
;
- } else {
- editable_el = {this.props.label}
;
- }
- } else if (this.state.phase == this.Phases.Edit) {
- editable_el = (
-
-
-
- );
- }
-
- return (
-
- {editable_el}
-
- );
- }
-});
diff --git a/src/skins/vector/views/atoms/EnableNotificationsButton.js b/src/skins/vector/views/atoms/EnableNotificationsButton.js
deleted file mode 100644
index edef9edc68..0000000000
--- a/src/skins/vector/views/atoms/EnableNotificationsButton.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-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 EnableNotificationsButtonController = require('matrix-react-sdk/lib/controllers/atoms/EnableNotificationsButton')
-
-module.exports = React.createClass({
- displayName: 'EnableNotificationsButton',
- mixins: [EnableNotificationsButtonController],
-
- render: function() {
- if (this.enabled()) {
- return (
-
- );
- } else {
- return (
-
- );
- }
- }
-});
diff --git a/src/skins/vector/views/atoms/LogoutButton.js b/src/skins/vector/views/atoms/LogoutButton.js
deleted file mode 100644
index 619160f61c..0000000000
--- a/src/skins/vector/views/atoms/LogoutButton.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-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 LogoutButtonController = require('matrix-react-sdk/lib/controllers/atoms/LogoutButton')
-
-module.exports = React.createClass({
- displayName: 'LogoutButton',
- mixins: [LogoutButtonController],
-
- render: function() {
- return (
-
- );
- }
-});
diff --git a/src/skins/vector/views/atoms/MemberAvatar.js b/src/skins/vector/views/atoms/MemberAvatar.js
deleted file mode 100644
index c8606cd72e..0000000000
--- a/src/skins/vector/views/atoms/MemberAvatar.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
-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 Avatar = require('../../../../Avatar');
-
-var MemberAvatarController = require('matrix-react-sdk/lib/controllers/atoms/MemberAvatar')
-
-module.exports = React.createClass({
- displayName: 'MemberAvatar',
- mixins: [MemberAvatarController],
-
- avatarUrlForMember: function(member) {
- return Avatar.avatarUrlForMember(
- member,
- this.props.member,
- this.props.width,
- this.props.height,
- this.props.resizeMethod
- );
- },
-
- skinnedDefaultAvatarUrl: function(member, width, height, resizeMethod) {
- return Avatar.defaultAvatarUrlForString(member.userId);
- },
-
- render: function() {
- // XXX: recalculates default avatar url constantly
- if (this.state.imageUrl === this.defaultAvatarUrl(this.props.member)) {
- var initial;
- if (this.props.member.name[0])
- initial = this.props.member.name[0].toUpperCase();
- if (initial === '@' && this.props.member.name[1])
- initial = this.props.member.name[1].toUpperCase();
-
- return (
-
-
-
-
- );
- case this.Phases.Uploading:
- var Loader = sdk.getComponent("atoms.Spinner");
- return (
-
- {avatarImg}
-
-
- Upload new:
-
- {this.state.errorText}
-
- {this.state.errorString}
- );
- } else {
- var EditableText = sdk.getComponent('atoms.EditableText');
- return (
-
-
- );
- case this.Phases.Uploading:
- var Loader = sdk.getComponent("atoms.Spinner");
- return (
-
-
- {this.state.errorString}
-
-
-
-
-
-
-
-
-
- );
- case this.Phases.Success:
- return (
-
-
- )
- }
- }
-});
diff --git a/src/skins/vector/views/molecules/EventTile.js b/src/skins/vector/views/molecules/EventTile.js
deleted file mode 100644
index c5cb81951b..0000000000
--- a/src/skins/vector/views/molecules/EventTile.js
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-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 classNames = require("classnames");
-
-var sdk = require('matrix-react-sdk')
-
-var EventTileController = require('matrix-react-sdk/lib/controllers/molecules/EventTile')
-var ContextualMenu = require('../../../../ContextualMenu');
-
-var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
-
-var eventTileTypes = {
- 'm.room.message': 'molecules.MessageTile',
- 'm.room.member' : 'molecules.EventAsTextTile',
- 'm.call.invite' : 'molecules.EventAsTextTile',
- 'm.call.answer' : 'molecules.EventAsTextTile',
- 'm.call.hangup' : 'molecules.EventAsTextTile',
- 'm.room.name' : 'molecules.EventAsTextTile',
- 'm.room.topic' : 'molecules.EventAsTextTile',
-};
-
-module.exports = React.createClass({
- displayName: 'EventTile',
- mixins: [EventTileController],
-
- statics: {
- haveTileForEvent: function(e) {
- if (eventTileTypes[e.getType()] == undefined) return false;
- if (eventTileTypes[e.getType()] == 'molecules.EventAsTextTile') {
- return TextForEvent.textForEvent(e) !== '';
- } else {
- return true;
- }
- }
- },
-
- getInitialState: function() {
- return {menu: false};
- },
-
- onEditClicked: function(e) {
- var MessageContextMenu = sdk.getComponent('molecules.MessageContextMenu');
- var buttonRect = e.target.getBoundingClientRect()
- var x = buttonRect.right;
- var y = buttonRect.top + (e.target.height / 2);
- var self = this;
- ContextualMenu.createMenu(MessageContextMenu, {
- mxEvent: this.props.mxEvent,
- left: x,
- top: y,
- onFinished: function() {
- self.setState({menu: false});
- }
- });
- this.setState({menu: true});
- },
-
- render: function() {
- var MessageTimestamp = sdk.getComponent('atoms.MessageTimestamp');
- var SenderProfile = sdk.getComponent('molecules.SenderProfile');
- var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
-
- var content = this.props.mxEvent.getContent();
- var msgtype = content.msgtype;
-
- var EventTileType = sdk.getComponent(eventTileTypes[this.props.mxEvent.getType()]);
- // This shouldn't happen: the caller should check we support this type
- // before trying to instantiate us
- if (!EventTileType) {
- throw new Error("Event type not supported");
- }
-
- var classes = classNames({
- mx_EventTile: true,
- mx_EventTile_sending: ['sending', 'queued'].indexOf(
- this.props.mxEvent.status
- ) !== -1,
- mx_EventTile_notSent: this.props.mxEvent.status == 'not_sent',
- mx_EventTile_highlight: this.shouldHighlight(),
- mx_EventTile_continuation: this.props.continuation,
- mx_EventTile_last: this.props.last,
- mx_EventTile_contextual: this.props.contextual,
- menu: this.state.menu,
- });
- var timestamp =
- Success!
-
-
-
-
-
-
- );
- }
- if (EventTileType.needsSenderProfile()) {
- sender =
- { avatar }
- { sender }
-
- );
- },
-});
diff --git a/src/skins/vector/views/molecules/MFileTile.js b/src/skins/vector/views/molecules/MFileTile.js
deleted file mode 100644
index 9180bd6b83..0000000000
--- a/src/skins/vector/views/molecules/MFileTile.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
-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 MFileTileController = require('matrix-react-sdk/lib/controllers/molecules/MFileTile')
-
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-
-module.exports = React.createClass({
- displayName: 'MFileTile',
- mixins: [MFileTileController],
-
- render: function() {
- var content = this.props.mxEvent.getContent();
- var cli = MatrixClientPeg.get();
-
- var httpUrl = cli.mxcUrlToHttp(content.url);
- var text = this.presentableTextForFile(content);
-
- if (httpUrl) {
- return (
-
-
-
- );
- } else {
- var extra = text ? ': '+text : '';
- return
- Invalid file{extra}
-
- }
- },
-});
diff --git a/src/skins/vector/views/molecules/MImageTile.js b/src/skins/vector/views/molecules/MImageTile.js
deleted file mode 100644
index 2f3b7a55db..0000000000
--- a/src/skins/vector/views/molecules/MImageTile.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-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 filesize = require('filesize');
-
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var Modal = require('matrix-react-sdk/lib/Modal');
-var sdk = require('matrix-react-sdk')
-
-module.exports = React.createClass({
- displayName: 'MImageTile',
-
- thumbHeight: function(fullWidth, fullHeight, thumbWidth, thumbHeight) {
- if (!fullWidth || !fullHeight) {
- // Cannot calculate thumbnail height for image: missing w/h in metadata. We can't even
- // log this because it's spammy
- return undefined;
- }
- if (fullWidth < thumbWidth && fullHeight < thumbHeight) {
- // no scaling needs to be applied
- return fullHeight;
- }
- var widthMulti = thumbWidth / fullWidth;
- var heightMulti = thumbHeight / fullHeight;
- if (widthMulti < heightMulti) {
- // width is the dominant dimension so scaling will be fixed on that
- return Math.floor(widthMulti * fullHeight);
- }
- else {
- // height is the dominant dimension so scaling will be fixed on that
- return Math.floor(heightMulti * fullHeight);
- }
- },
-
- onClick: function(ev) {
- if (ev.button == 0 && !ev.metaKey) {
- ev.preventDefault();
- var content = this.props.mxEvent.getContent();
- var httpUrl = MatrixClientPeg.get().mxcUrlToHttp(content.url);
- var ImageView = sdk.getComponent("atoms.ImageView");
- Modal.createDialog(ImageView, {
- src: httpUrl,
- width: content.info.w,
- height: content.info.h,
- mxEvent: this.props.mxEvent,
- }, "mx_Dialog_lightbox");
- }
- },
-
- render: function() {
- var content = this.props.mxEvent.getContent();
- var cli = MatrixClientPeg.get();
-
- var thumbHeight = null;
- if (content.info) thumbHeight = this.thumbHeight(content.info.w, content.info.h, 480, 360);
-
- var imgStyle = {};
- if (thumbHeight) imgStyle['height'] = thumbHeight;
-
- var thumbUrl = cli.mxcUrlToHttp(content.url, 480, 360);
- if (thumbUrl) {
- return (
-
-
-
- { timestamp }
- { editButton }
-
- 
- Download {text}
-
-
- );
- },
-});
-
diff --git a/src/skins/vector/views/molecules/MTextTile.js b/src/skins/vector/views/molecules/MTextTile.js
deleted file mode 100644
index 12bafa37ba..0000000000
--- a/src/skins/vector/views/molecules/MTextTile.js
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-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 sanitizeHtml = require('sanitize-html');
-
-var MTextTileController = require('matrix-react-sdk/lib/controllers/molecules/MTextTile')
-
-var allowedAttributes = sanitizeHtml.defaults.allowedAttributes;
-allowedAttributes['font'] = ['color'];
-var sanitizeHtmlParams = {
- allowedTags: sanitizeHtml.defaults.allowedTags.concat([ 'font' ]),
- allowedAttributes: allowedAttributes,
-};
-
-module.exports = React.createClass({
- displayName: 'MTextTile',
- mixins: [MTextTileController],
-
- // FIXME: this entire class is copy-pasted from MTextTile :(
- render: function() {
- var content = this.props.mxEvent.getContent();
- var originalBody = content.body;
- var body;
-
- if (this.props.searchTerm) {
- var lastOffset = 0;
- var bodyList = [];
- var k = 0;
- var offset;
-
- // XXX: rather than searching for the search term in the body,
- // we should be looking at the match delimiters returned by the FTS engine
- if (content.format === "org.matrix.custom.html") {
- var safeBody = sanitizeHtml(content.formatted_body, sanitizeHtmlParams);
- var safeSearchTerm = sanitizeHtml(this.props.searchTerm, sanitizeHtmlParams);
- while ((offset = safeBody.indexOf(safeSearchTerm, lastOffset)) >= 0) {
- // FIXME: we need to apply the search highlighting to only the text elements of HTML, which means
- // hooking into the sanitizer parser rather than treating it as a string. Otherwise
- // the act of highlighting a or whatever will break the HTML badly.
- bodyList.push();
- bodyList.push();
- lastOffset = offset + safeSearchTerm.length;
- }
- bodyList.push();
- }
- else {
- while ((offset = originalBody.indexOf(this.props.searchTerm, lastOffset)) >= 0) {
- bodyList.push({ originalBody.substring(lastOffset, offset) });
- bodyList.push({ this.props.searchTerm });
- lastOffset = offset + this.props.searchTerm.length;
- }
- bodyList.push({ originalBody.substring(lastOffset) });
- }
- body = bodyList;
- }
- else {
- if (content.format === "org.matrix.custom.html") {
- var safeBody = sanitizeHtml(content.formatted_body, sanitizeHtmlParams);
- body = ;
- }
- else {
- body = originalBody;
- }
- }
-
- return (
-
- { body }
-
- );
- },
-});
-
diff --git a/src/skins/vector/views/molecules/MemberInfo.js b/src/skins/vector/views/molecules/MemberInfo.js
deleted file mode 100644
index 24fa1e91a4..0000000000
--- a/src/skins/vector/views/molecules/MemberInfo.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-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('matrix-react-sdk/lib/MatrixClientPeg');
-var sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher');
-var MemberInfoController = require('matrix-react-sdk/lib/controllers/molecules/MemberInfo')
-
-// FIXME: this should probably be an organism, to match with MemberList, not a molecule
-
-module.exports = React.createClass({
- displayName: 'MemberInfo',
- mixins: [MemberInfoController],
-
- onCancel: function(e) {
- dis.dispatch({
- action: "view_user",
- member: null
- });
- },
-
- render: function() {
- var interactButton, kickButton, banButton, muteButton, giveModButton, spinner;
- if (this.props.member.userId === MatrixClientPeg.get().credentials.userId) {
- interactButton =
-
- { timestamp }
-
-
- { text }
-
- Leave room
;
- }
- else {
- interactButton = Start chat
;
- }
-
- if (this.state.creatingRoom) {
- var Loader = sdk.getComponent("atoms.Spinner");
- spinner =
- Kick
-
;
- }
- if (this.state.can.ban) {
- banButton =
- Ban
-
;
- }
- if (this.state.can.mute) {
- var muteLabel = this.state.muted ? "Unmute" : "Mute";
- muteButton =
- {muteLabel}
-
;
- }
- if (this.state.can.modifyLevel) {
- var giveOpLabel = this.state.isTargetMod ? "Revoke Mod" : "Make Mod";
- giveModButton =
- {giveOpLabel}
-
- }
-
- var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
- return (
-
-
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/MemberTile.js b/src/skins/vector/views/molecules/MemberTile.js
deleted file mode 100644
index 25ba3db94c..0000000000
--- a/src/skins/vector/views/molecules/MemberTile.js
+++ /dev/null
@@ -1,180 +0,0 @@
-/*
-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('matrix-react-sdk/lib/MatrixClientPeg');
-var sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher');
-var MemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MemberTile')
-
-// The Lato WOFF doesn't include sensible combining diacritics, so Chrome chokes on rendering them.
-// Revert to Arial when this happens, which on OSX works at least.
-var zalgo = /[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/;
-
-module.exports = React.createClass({
- displayName: 'MemberTile',
- mixins: [MemberTileController],
-
- shouldComponentUpdate: function(nextProps, nextState) {
- if (this.state.hover !== nextState.hover) return true;
- if (
- this.member_last_modified_time === undefined ||
- this.member_last_modified_time < nextProps.member.getLastModifiedTime()
- ) {
- return true
- }
- if (
- nextProps.member.user &&
- (this.user_last_modified_time === undefined ||
- this.user_last_modified_time < nextProps.member.user.getLastModifiedTime())
- ) {
- return true
- }
- return false;
- },
-
- mouseEnter: function(e) {
- this.setState({ 'hover': true });
- },
-
- mouseLeave: function(e) {
- this.setState({ 'hover': false });
- },
-
- onClick: function(e) {
- dis.dispatch({
- action: 'view_user',
- member: this.props.member,
- });
- },
-
- getDuration: function(time) {
- if (!time) return;
- var t = parseInt(time / 1000);
- var s = t % 60;
- var m = parseInt(t / 60) % 60;
- var h = parseInt(t / (60 * 60)) % 24;
- var d = parseInt(t / (60 * 60 * 24));
- if (t < 60) {
- if (t < 0) {
- return "0s";
- }
- return s + "s";
- }
- if (t < 60 * 60) {
- return m + "m";
- }
- if (t < 24 * 60 * 60) {
- return h + "h";
- }
- return d + "d ";
- },
-
- getPrettyPresence: function(user) {
- if (!user) return "Unknown";
- var presence = user.presence;
- if (presence === "online") return "Online";
- if (presence === "unavailable") return "Idle"; // XXX: is this actually right?
- if (presence === "offline") return "Offline";
- return "Unknown";
- },
-
- getPowerLabel: function() {
- var label = this.props.member.userId;
- if (this.state.isTargetMod) {
- label += " - Mod (" + this.props.member.powerLevelNorm + "%)";
- }
- return label;
- },
-
- render: function() {
- this.member_last_modified_time = this.props.member.getLastModifiedTime();
- if (this.props.member.user) {
- this.user_last_modified_time = this.props.member.user.getLastModifiedTime();
- }
-
- var isMyUser = MatrixClientPeg.get().credentials.userId == this.props.member.userId;
-
- var power;
- // if (this.props.member && this.props.member.powerLevelNorm > 0) {
- // var img = "img/p/p" + Math.floor(20 * this.props.member.powerLevelNorm / 100) + ".png";
- // power =
-
-
- { this.props.member.name }
-
- { this.props.member.userId }
-
-
- power: { this.props.member.powerLevelNorm }%
-
-
- {interactButton}
- {muteButton}
- {kickButton}
- {banButton}
- {giveModButton}
- {spinner}
-
- : null;
-
- var nameClass = "mx_MemberTile_name";
- if (zalgo.test(name)) {
- nameClass += " mx_MemberTile_zalgo";
- }
-
- var nameEl;
- if (this.state.hover) {
- var presence;
- // FIXME: make presence data update whenever User.presence changes...
- var active = this.props.member.user ? ((Date.now() - (this.props.member.user.lastPresenceTs - this.props.member.user.lastActiveAgo)) || -1) : -1;
- if (active >= 0) {
- presence = { this.getPrettyPresence(this.props.member.user) } { this.getDuration(active) } ago
;
- }
- else {
- presence = { this.getPrettyPresence(this.props.member.user) }
;
- }
-
- nameEl =
-
- 
-
- }
- else {
- nameEl =
-
- { name }
- { presence }
-
- { name }
-
- }
-
- var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
- return (
-
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/MessageComposer.js b/src/skins/vector/views/molecules/MessageComposer.js
deleted file mode 100644
index 2f0e7ac57f..0000000000
--- a/src/skins/vector/views/molecules/MessageComposer.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-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('matrix-react-sdk/lib/MatrixClientPeg');
-var MessageComposerController = require('matrix-react-sdk/lib/controllers/molecules/MessageComposer')
-
-var sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher')
-
-module.exports = React.createClass({
- displayName: 'MessageComposer',
- mixins: [MessageComposerController],
-
- onUploadClick: function(ev) {
- this.refs.uploadInput.click();
- },
-
- onUploadFileSelected: function(ev) {
- var files = ev.target.files;
- // MessageComposer shouldn't have to rely on it's parent passing in a callback to upload a file
- if (files && files.length > 0) {
- this.props.uploadFile(files[0]);
- }
- this.refs.uploadInput.value = null;
- },
-
- onCallClick: function(ev) {
- dis.dispatch({
- action: 'place_call',
- type: ev.shiftKey ? "screensharing" : "video",
- room_id: this.props.room.roomId
- });
- },
-
- render: function() {
- var me = this.props.room.getMember(MatrixClientPeg.get().credentials.userId);
- var uploadInputStyle = {display: 'none'};
- var MemberAvatar = sdk.getComponent('atoms.MemberAvatar');
- return (
-
-
- { nameEl }
-
-
- );
- },
-});
-
diff --git a/src/skins/vector/views/molecules/MessageTile.js b/src/skins/vector/views/molecules/MessageTile.js
deleted file mode 100644
index 6ea4441308..0000000000
--- a/src/skins/vector/views/molecules/MessageTile.js
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-
-var MessageTileController = require('matrix-react-sdk/lib/controllers/molecules/MessageTile')
-
-module.exports = React.createClass({
- displayName: 'MessageTile',
- mixins: [MessageTileController],
-
- statics: {
- needsSenderProfile: function() {
- return true;
- }
- },
-
- render: function() {
- var UnknownMessageTile = sdk.getComponent('molecules.UnknownMessageTile');
-
- var tileTypes = {
- 'm.text': sdk.getComponent('molecules.MTextTile'),
- 'm.notice': sdk.getComponent('molecules.MNoticeTile'),
- 'm.emote': sdk.getComponent('molecules.MEmoteTile'),
- 'm.image': sdk.getComponent('molecules.MImageTile'),
- 'm.file': sdk.getComponent('molecules.MFileTile')
- };
-
- var content = this.props.mxEvent.getContent();
- var msgtype = content.msgtype;
- var TileType = UnknownMessageTile;
- if (msgtype && tileTypes[msgtype]) {
- TileType = tileTypes[msgtype];
- }
-
- return
-
-
-
-
-
-
-
-
-
- 
-
-
-
-
-
- 
-
-
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/RoomCreate.js b/src/skins/vector/views/molecules/RoomCreate.js
deleted file mode 100644
index d66e014d8b..0000000000
--- a/src/skins/vector/views/molecules/RoomCreate.js
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-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 = React.createClass({
- displayName: 'RoomCreate',
-
- render: function() {
- return (
-
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/RoomHeader.js b/src/skins/vector/views/molecules/RoomHeader.js
deleted file mode 100644
index 47ac9cbeaf..0000000000
--- a/src/skins/vector/views/molecules/RoomHeader.js
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher')
-
-var CallHandler = require('matrix-react-sdk/lib/CallHandler');
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var RoomHeaderController = require('matrix-react-sdk/lib/controllers/molecules/RoomHeader')
-
-module.exports = React.createClass({
- displayName: 'RoomHeader',
- mixins: [RoomHeaderController],
-
- onNameChange: function(new_name) {
- if (this.props.room.name != new_name && new_name) {
- MatrixClientPeg.get().setRoomName(this.props.room.roomId, new_name);
- }
- },
-
- getRoomName: function() {
- return this.refs.name_edit.value;
- },
-
- onFullscreenClick: function() {
- dis.dispatch({action: 'video_fullscreen', fullscreen: true}, true);
- },
-
- render: function() {
- var EditableText = sdk.getComponent("atoms.EditableText");
- var RoomAvatar = sdk.getComponent('atoms.RoomAvatar');
-
- var header;
- if (this.props.simpleHeader) {
- var cancel;
- if (this.props.onCancelClick) {
- cancel =
-
-
-
-
- 
-
-
- Create new room
-
- }
- header =
-
-
- }
- else {
- var topic = this.props.room.currentState.getStateEvents('m.room.topic', '');
-
- var call_buttons;
- if (this.state && this.state.call_state != 'ended') {
- //var muteVideoButton;
- var activeCall = (
- CallHandler.getCallForRoom(this.props.room.roomId)
- );
-/*
- if (activeCall && activeCall.type === "video") {
- muteVideoButton = (
-
- { this.props.simpleHeader }
- { cancel }
-
-
- {
- (activeCall.isLocalVideoMuted() ?
- "Unmute" : "Mute") + " video"
- }
-
- );
- }
- {muteVideoButton}
-
- {
- (activeCall && activeCall.isMicrophoneMuted() ?
- "Unmute" : "Mute") + " audio"
- }
-
-*/
-
- call_buttons = (
-
- End call
-
- );
- }
-
- var name = null;
- var topic_el = null;
- var cancel_button = null;
- var save_button = null;
- var settings_button = null;
- var actual_name = this.props.room.currentState.getStateEvents('m.room.name', '');
- if (actual_name) actual_name = actual_name.getContent().name;
- if (this.props.editing) {
- name =
-
-
-
- // if (topic) topic_el =
- cancel_button = Cancel
- save_button = Save Changes
- } else {
- //
-
- if (topic) topic_el = { this.props.room.name }
-
- 
-
-
- { topic.getContent().topic }
;
- }
-
- var roomAvatar = null;
- if (this.props.room) {
- roomAvatar = (
-
- 
-
- );
- }
- video_button =
-
-
- 
-
;
- voice_button =
-
-
- 
-
;
- }
-
- header =
-
-
-
- }
-
- return (
-
-
- {call_buttons}
- {cancel_button}
- {save_button}
-
- { roomAvatar }
-
-
- { name }
- { topic_el }
-
-
- { video_button }
- { voice_button }
- { zoom_button }
-
-
- 
-
-
-
- { header }
-
- );
- },
-});
diff --git a/src/skins/vector/views/molecules/RoomSettings.js b/src/skins/vector/views/molecules/RoomSettings.js
deleted file mode 100644
index 4fdd40d9e1..0000000000
--- a/src/skins/vector/views/molecules/RoomSettings.js
+++ /dev/null
@@ -1,232 +0,0 @@
-/*
-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('matrix-react-sdk/lib/MatrixClientPeg');
-var sdk = require('matrix-react-sdk');
-
-var RoomSettingsController = require('matrix-react-sdk/lib/controllers/molecules/RoomSettings')
-
-module.exports = React.createClass({
- displayName: 'RoomSettings',
- mixins: [RoomSettingsController],
-
- getTopic: function() {
- return this.refs.topic.value;
- },
-
- getJoinRules: function() {
- return this.refs.is_private.checked ? "invite" : "public";
- },
-
- getHistoryVisibility: function() {
- return this.refs.share_history.checked ? "shared" : "invited";
- },
-
- getPowerLevels: function() {
- if (!this.state.power_levels_changed) return undefined;
-
- var power_levels = this.props.room.currentState.getStateEvents('m.room.power_levels', '');
- power_levels = power_levels.getContent();
-
- var new_power_levels = {
- ban: parseInt(this.refs.ban.value),
- kick: parseInt(this.refs.kick.value),
- redact: parseInt(this.refs.redact.value),
- invite: parseInt(this.refs.invite.value),
- events_default: parseInt(this.refs.events_default.value),
- state_default: parseInt(this.refs.state_default.value),
- users_default: parseInt(this.refs.users_default.value),
- users: power_levels.users,
- events: power_levels.events,
- };
-
- return new_power_levels;
- },
-
- onPowerLevelsChanged: function() {
- this.setState({
- power_levels_changed: true
- });
- },
-
- render: function() {
- var ChangeAvatar = sdk.getComponent('molecules.ChangeAvatar');
-
- var topic = this.props.room.currentState.getStateEvents('m.room.topic', '');
- if (topic) topic = topic.getContent().topic;
-
- var join_rule = this.props.room.currentState.getStateEvents('m.room.join_rules', '');
- if (join_rule) join_rule = join_rule.getContent().join_rule;
-
- var history_visibility = this.props.room.currentState.getStateEvents('m.room.history_visibility', '');
- if (history_visibility) history_visibility = history_visibility.getContent().history_visibility;
-
- var power_levels = this.props.room.currentState.getStateEvents('m.room.power_levels', '');
-
- var events_levels = power_levels.events || {};
-
- if (power_levels) {
- power_levels = power_levels.getContent();
-
- var ban_level = parseInt(power_levels.ban);
- var kick_level = parseInt(power_levels.kick);
- var redact_level = parseInt(power_levels.redact);
- var invite_level = parseInt(power_levels.invite || 0);
- var send_level = parseInt(power_levels.events_default || 0);
- var state_level = parseInt(power_levels.state_default || 0);
- var default_user_level = parseInt(power_levels.users_default || 0);
-
- if (power_levels.ban == undefined) ban_level = 50;
- if (power_levels.kick == undefined) kick_level = 50;
- if (power_levels.redact == undefined) redact_level = 50;
-
- var user_levels = power_levels.users || {};
-
- var user_id = MatrixClientPeg.get().credentials.userId;
-
- var current_user_level = user_levels[user_id];
- if (current_user_level == undefined) current_user_level = default_user_level;
-
- var power_level_level = events_levels["m.room.power_levels"];
- if (power_level_level == undefined) {
- power_level_level = state_level;
- }
-
- var can_change_levels = current_user_level >= power_level_level;
- } else {
- var ban_level = 50;
- var kick_level = 50;
- var redact_level = 50;
- var invite_level = 0;
- var send_level = 0;
- var state_level = 0;
- var default_user_level = 0;
-
- var user_levels = [];
- var events_levels = [];
-
- var current_user_level = 0;
-
- var power_level_level = 0;
-
- var can_change_levels = false;
- }
-
- var room_avatar_level = parseInt(power_levels.state_default || 0);
- if (events_levels['m.room.avatar'] !== undefined) {
- room_avatar_level = events_levels['m.room.avatar'];
- }
- var can_set_room_avatar = current_user_level >= room_avatar_level;
-
- var change_avatar;
- if (can_set_room_avatar) {
- change_avatar =
-
;
- }
-
- var banned = this.props.room.getMembersWithMembership("ban");
-
- return (
- Room Icon
-
-
-
-
-
- -
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/SenderProfile.js b/src/skins/vector/views/molecules/SenderProfile.js
deleted file mode 100644
index c09685aad8..0000000000
--- a/src/skins/vector/views/molecules/SenderProfile.js
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-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 classNames = require("classnames");
-
-// The Lato WOFF doesn't include sensible combining diacritics, so Chrome chokes on rendering them.
-// Revert to Arial when this happens, which on OSX works at least.
-var zalgo = /[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/;
-
-module.exports = React.createClass({
- displayName: 'SenderProfile',
-
- render: function() {
- var mxEvent = this.props.mxEvent;
- var name = mxEvent.sender ? mxEvent.sender.name : mxEvent.getSender();
-
- var classes = classNames({
- mx_SenderProfile: true,
- // taken from https://en.wikipedia.org/wiki/Combining_character
- mx_SenderProfile_zalgo: zalgo.test(name),
- });
-
- var msgtype = mxEvent.getContent().msgtype;
- if (msgtype && msgtype == 'm.emote') {
- name = ''; // emote message must include the name so don't duplicate it
- }
- return (
-
- {name} { this.props.aux }
-
- );
- },
-});
-
diff --git a/src/skins/vector/views/molecules/ServerConfig.js b/src/skins/vector/views/molecules/ServerConfig.js
deleted file mode 100644
index d6947727c8..0000000000
--- a/src/skins/vector/views/molecules/ServerConfig.js
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
-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 Modal = require('matrix-react-sdk/lib/Modal');
-var sdk = require('matrix-react-sdk')
-
-var ServerConfigController = require('matrix-react-sdk/lib/controllers/molecules/ServerConfig')
-
-module.exports = React.createClass({
- displayName: 'ServerConfig',
- mixins: [ServerConfigController],
-
- showHelpPopup: function() {
- var ErrorDialog = sdk.getComponent('organisms.ErrorDialog');
- Modal.createDialog(ErrorDialog, {
- title: 'Custom Server Options',
- description:
- You can use the custom server options to log into other Matrix servers by specifying a different Home server URL.-
-
-
- -
Power levels
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- User levels
-
- {Object.keys(user_levels).map(function(user, i) {
- return (
-
-
-
-
-
-
- );
- })}
- Event levels
-
- {Object.keys(events_levels).map(function(event_type, i) {
- return (
-
-
-
-
-
-
- );
- })}
- Banned users
-
- {banned.map(function(member, i) {
- return (
-
- {change_avatar}
-
- {member.userId}
-
- );
- })}
- - This allows you to use Vector with an existing Matrix account on a different Home server.
-
- You can also set a custom Identity server but this will affect people's ability to find you - if you use a server in a group other than the main Matrix.org group. - , - button: "Dismiss", - focus: true, - }); - }, - - render: function() { - return ( -
-
-
-
-
- What does this mean?
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/UnknownMessageTile.js b/src/skins/vector/views/molecules/UnknownMessageTile.js
deleted file mode 100644
index e8cd322aa4..0000000000
--- a/src/skins/vector/views/molecules/UnknownMessageTile.js
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-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 = React.createClass({
- displayName: 'UnknownMessageTile',
-
- render: function() {
- var content = this.props.mxEvent.getContent();
- return (
-
- {content.body}
-
- );
- },
-});
diff --git a/src/skins/vector/views/molecules/UserSelector.js b/src/skins/vector/views/molecules/UserSelector.js
deleted file mode 100644
index 58cb7d215a..0000000000
--- a/src/skins/vector/views/molecules/UserSelector.js
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-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 UserSelectorController = require('matrix-react-sdk/lib/controllers/molecules/UserSelector')
-
-module.exports = React.createClass({
- displayName: 'UserSelector',
- mixins: [UserSelectorController],
-
- onAddUserId: function() {
- this.addUser(this.refs.user_id_input.value);
- this.refs.user_id_input.value = "";
- },
-
- render: function() {
- var self = this;
- return (
-
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/voip/CallView.js b/src/skins/vector/views/molecules/voip/CallView.js
deleted file mode 100644
index 52297bbc1d..0000000000
--- a/src/skins/vector/views/molecules/voip/CallView.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-var CallViewController = require(
- "../../../../../controllers/molecules/voip/CallView"
-);
-
-module.exports = React.createClass({
- displayName: 'CallView',
- mixins: [CallViewController],
-
- getVideoView: function() {
- return this.refs.video;
- },
-
- render: function(){
- var VideoView = sdk.getComponent('molecules.voip.VideoView');
- return (
- -
- {this.props.selected_users.map(function(user_id, i) {
- return
- {user_id} - X - })} -
- {audioBlock}
-
- );
- }
- var caller = MatrixClientPeg.get().getRoom(this.state.incomingCall.roomId).name;
- return (
-
- {audioBlock}
- 
-
- );
- }
-});
diff --git a/src/skins/vector/views/molecules/voip/VideoView.js b/src/skins/vector/views/molecules/voip/VideoView.js
deleted file mode 100644
index 75a2500d10..0000000000
--- a/src/skins/vector/views/molecules/voip/VideoView.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-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 ReactDOM = require('react-dom');
-
-var sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher')
-
-module.exports = React.createClass({
- displayName: 'VideoView',
-
- componentWillMount: function() {
- dis.register(this.onAction);
- },
-
- getRemoteVideoElement: function() {
- return ReactDOM.findDOMNode(this.refs.remote);
- },
-
- getRemoteAudioElement: function() {
- return this.refs.remoteAudio;
- },
-
- getLocalVideoElement: function() {
- return ReactDOM.findDOMNode(this.refs.local);
- },
-
- setContainer: function(c) {
- this.container = c;
- },
-
- onAction: function(payload) {
- switch (payload.action) {
- case 'video_fullscreen':
- if (!this.container) {
- return;
- }
- var element = this.container;
- if (payload.fullscreen) {
- var requestMethod = (
- element.requestFullScreen ||
- element.webkitRequestFullScreen ||
- element.mozRequestFullScreen ||
- element.msRequestFullscreen
- );
- requestMethod.call(element);
- }
- else {
- var exitMethod = (
- document.exitFullscreen ||
- document.mozCancelFullScreen ||
- document.webkitExitFullscreen ||
- document.msExitFullscreen
- );
- if (exitMethod) {
- exitMethod.call(document);
- }
- }
- break;
- }
- },
-
- render: function() {
- var VideoFeed = sdk.getComponent('atoms.voip.VideoFeed');
- return (
-
-
- Incoming { this.state.incomingCall ? this.state.incomingCall.type : '' } call from { caller }
-
-
-
-
-
-
- Decline
-
-
-
-
- Accept
-
-
-
- );
- }
-});
diff --git a/src/skins/vector/views/organisms/CasLogin.js b/src/skins/vector/views/organisms/CasLogin.js
deleted file mode 100644
index ad9dbed955..0000000000
--- a/src/skins/vector/views/organisms/CasLogin.js
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-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 CasLoginController = require('matrix-react-sdk/lib/controllers/organisms/CasLogin');
-
-module.exports = React.createClass({
- displayName: 'CasLogin',
- mixins: [CasLoginController],
-
- render: function() {
- return (
-
-
-
-
-
-
-
- );
- },
-
-});
diff --git a/src/skins/vector/views/organisms/CreateRoom.js b/src/skins/vector/views/organisms/CreateRoom.js
deleted file mode 100644
index b63b477deb..0000000000
--- a/src/skins/vector/views/organisms/CreateRoom.js
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
-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 CreateRoomController = require('matrix-react-sdk/lib/controllers/organisms/CreateRoom')
-
-var sdk = require('matrix-react-sdk')
-
-var PresetValues = require('matrix-react-sdk/lib/controllers/atoms/create_room/Presets').Presets;
-
-module.exports = React.createClass({
- displayName: 'CreateRoom',
- mixins: [CreateRoomController],
-
- getPreset: function() {
- return this.refs.presets.getPreset();
- },
-
- getName: function() {
- return this.refs.name_textbox.getName();
- },
-
- getTopic: function() {
- return this.refs.topic.getTopic();
- },
-
- getAliasLocalpart: function() {
- return this.refs.alias.getAliasLocalpart();
- },
-
- getInvitedUsers: function() {
- return this.refs.user_selector.getUserIds();
- },
-
- onPresetChanged: function(preset) {
- switch (preset) {
- case PresetValues.PrivateChat:
- this.setState({
- preset: preset,
- is_private: true,
- share_history: false,
- });
- break;
- case PresetValues.PublicChat:
- this.setState({
- preset: preset,
- is_private: false,
- share_history: true,
- });
- break;
- case PresetValues.Custom:
- this.setState({
- preset: preset,
- });
- break;
- }
- },
-
- onPrivateChanged: function(ev) {
- this.setState({
- preset: PresetValues.Custom,
- is_private: ev.target.checked,
- });
- },
-
- onShareHistoryChanged: function(ev) {
- this.setState({
- preset: PresetValues.Custom,
- share_history: ev.target.checked,
- });
- },
-
- onTopicChange: function(ev) {
- this.setState({
- topic: ev.target.value,
- });
- },
-
- onNameChange: function(ev) {
- this.setState({
- room_name: ev.target.value,
- });
- },
-
- onInviteChanged: function(invited_users) {
- this.setState({
- invited_users: invited_users,
- });
- },
-
- onAliasChanged: function(alias) {
- this.setState({
- alias: alias
- })
- },
-
- onEncryptChanged: function(ev) {
- this.setState({
- encrypt: ev.target.checked,
- });
- },
-
- render: function() {
- var curr_phase = this.state.phase;
- if (curr_phase == this.phases.CREATING) {
- var Loader = sdk.getComponent("atoms.Spinner");
- return (
-
- An error occured: {this.state.error_string}
-
- );
- }
-
- var CreateRoomButton = sdk.getComponent("atoms.create_room.CreateRoomButton");
- var RoomAlias = sdk.getComponent("atoms.create_room.RoomAlias");
- var Presets = sdk.getComponent("atoms.create_room.Presets");
- var UserSelector = sdk.getComponent("molecules.UserSelector");
- var RoomHeader = sdk.getComponent("molecules.RoomHeader");
-
- return (
-
-
- );
- }
- }
-});
diff --git a/src/skins/vector/views/organisms/LogoutPrompt.js b/src/skins/vector/views/organisms/LogoutPrompt.js
deleted file mode 100644
index 6e347a4ef7..0000000000
--- a/src/skins/vector/views/organisms/LogoutPrompt.js
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-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 LogoutPromptController = require('matrix-react-sdk/lib/controllers/organisms/LogoutPrompt')
-
-module.exports = React.createClass({
- displayName: 'LogoutPrompt',
- mixins: [LogoutPromptController],
-
- render: function() {
- return (
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {error_box}
- -
-
- );
- },
-});
-
diff --git a/src/skins/vector/views/organisms/MemberList.js b/src/skins/vector/views/organisms/MemberList.js
deleted file mode 100644
index b39d675f31..0000000000
--- a/src/skins/vector/views/organisms/MemberList.js
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-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 classNames = require('classnames');
-
-var MemberListController = require('matrix-react-sdk/lib/controllers/organisms/MemberList')
-var GeminiScrollbar = require('react-gemini-scrollbar');
-
-var sdk = require('matrix-react-sdk')
-
-
-module.exports = React.createClass({
- displayName: 'MemberList',
- mixins: [MemberListController],
-
- getInitialState: function() {
- },
-
- memberSort: function(userIdA, userIdB) {
- var userA = this.memberDict[userIdA].user;
- var userB = this.memberDict[userIdB].user;
-
- var presenceMap = {
- online: 3,
- unavailable: 2,
- offline: 1
- };
-
- var presenceOrdA = userA ? presenceMap[userA.presence] : 0;
- var presenceOrdB = userB ? presenceMap[userB.presence] : 0;
-
- if (presenceOrdA != presenceOrdB) {
- return presenceOrdB - presenceOrdA;
- }
-
- var latA = userA ? (userA.lastPresenceTs - (userA.lastActiveAgo || userA.lastPresenceTs)) : 0;
- var latB = userB ? (userB.lastPresenceTs - (userB.lastActiveAgo || userB.lastPresenceTs)) : 0;
-
- return latB - latA;
- },
-
- makeMemberTiles: function(membership) {
- var MemberTile = sdk.getComponent("molecules.MemberTile");
-
- var self = this;
- return self.state.members.filter(function(userId) {
- var m = self.memberDict[userId];
- return m.membership == membership;
- }).map(function(userId) {
- var m = self.memberDict[userId];
- return (
-
- Sign out?
-
-
-
-
-
-
-
- );
- }
- return (
- Invited
-
- {invitedMemberTiles}
-
-
-
- {this.inviteTile()}
-
-
- );
- }
-});
-
diff --git a/src/skins/vector/views/organisms/Notifier.js b/src/skins/vector/views/organisms/Notifier.js
deleted file mode 100644
index b214b4cd16..0000000000
--- a/src/skins/vector/views/organisms/Notifier.js
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-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 NotifierController = require('matrix-react-sdk/lib/controllers/organisms/Notifier')
-
-var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
-var extend = require('matrix-react-sdk/lib/extend');
-var dis = require('matrix-react-sdk/lib/dispatcher');
-
-var Avatar = require('../../../../Avatar');
-
-
-var NotifierView = {
- notificationMessageForEvent: function(ev) {
- return TextForEvent.textForEvent(ev);
- },
-
- displayNotification: function(ev, room) {
- if (!global.Notification || global.Notification.permission != 'granted') {
- return;
- }
- if (global.document.hasFocus()) {
- return;
- }
-
- var msg = this.notificationMessageForEvent(ev);
- if (!msg) return;
-
- var title;
- if (!ev.sender || room.name == ev.sender.name) {
- title = room.name;
- // notificationMessageForEvent includes sender,
- // but we already have the sender here
- if (ev.getContent().body) msg = ev.getContent().body;
- } else if (ev.getType() == 'm.room.member') {
- // context is all in the message here, we don't need
- // to display sender info
- title = room.name;
- } else if (ev.sender) {
- title = ev.sender.name + " (" + room.name + ")";
- // notificationMessageForEvent includes sender,
- // but we've just out sender in the title
- if (ev.getContent().body) msg = ev.getContent().body;
- }
-
- var avatarUrl = ev.sender ? Avatar.avatarUrlForMember(
- ev.sender, 40, 40, 'crop'
- ) : null;
-
- var notification = new global.Notification(
- title,
- {
- "body": msg,
- "icon": avatarUrl,
- "tag": "vector"
- }
- );
-
- notification.onclick = function() {
- dis.dispatch({
- action: 'view_room',
- room_id: room.roomId
- });
- global.focus();
- };
-
- /*var audioClip;
-
- if (audioNotification) {
- audioClip = playAudio(audioNotification);
- }*/
-
- global.setTimeout(function() {
- notification.close();
- }, 5 * 1000);
-
- }
-};
-
-var NotifierClass = function() {};
-extend(NotifierClass.prototype, NotifierController);
-extend(NotifierClass.prototype, NotifierView);
-
-module.exports = new NotifierClass();
-
diff --git a/src/skins/vector/views/organisms/QuestionDialog.js b/src/skins/vector/views/organisms/QuestionDialog.js
deleted file mode 100644
index 3941b1f925..0000000000
--- a/src/skins/vector/views/organisms/QuestionDialog.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-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';
-
-/*
- * Usage:
- * Modal.createDialog(ErrorDialog, {
- * title: "some text", (default: "Error")
- * description: "some more text",
- * button: "Button Text",
- * onClose: someFunction,
- * focus: true|false (default: true)
- * });
- */
-
-var React = require('react');
-var QuestionDialogController = require('matrix-react-sdk/lib/controllers/organisms/QuestionDialog')
-
-module.exports = React.createClass({
- displayName: 'QuestionDialog',
- mixins: [QuestionDialogController],
-
- onOk: function() {
- this.props.onFinished(true);
- },
-
- onCancel: function() {
- this.props.onFinished(false);
- },
-
- render: function() {
- return (
-
-
- {invitedSection}
-
- {this.makeMemberTiles('join')}
-
-
-
- );
- }
-});
diff --git a/src/skins/vector/views/organisms/RoomList.js b/src/skins/vector/views/organisms/RoomList.js
deleted file mode 100644
index 018cc9b0db..0000000000
--- a/src/skins/vector/views/organisms/RoomList.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher');
-
-var GeminiScrollbar = require('react-gemini-scrollbar');
-var RoomListController = require('../../../../controllers/organisms/RoomList')
-
-module.exports = React.createClass({
- displayName: 'RoomList',
- mixins: [RoomListController],
-
- onShowClick: function() {
- dis.dispatch({
- action: 'show_left_panel',
- });
- },
-
- render: function() {
- var expandButton = this.props.collapsed ?
-
- {this.props.title}
-
-
- {this.props.description}
-
-
-
-
-
-
- :
- null;
-
- var RoomSubList = sdk.getComponent('organisms.RoomSubList');
- var self = this;
-
- return (
-
- { expandButton }
-
-
-
-
-
- );
- } else {
- return (
-
- );
- }
- }
-
- var myUserId = MatrixClientPeg.get().credentials.userId;
- if (this.state.room.currentState.members[myUserId].membership == 'invite') {
- if (this.state.joining || this.state.rejecting) {
- var Loader = sdk.getComponent("atoms.Spinner");
- return (
-
-
- );
- } else {
- var inviteEvent = this.state.room.currentState.members[myUserId].events.member.event;
- // XXX: Leaving this intentionally basic for now because invites are about to change totally
- var joinErrorText = this.state.joinError ? "Failed to join room!" : "";
- var rejectErrorText = this.state.rejectError ? "Failed to reject invite!" : "";
- return (
-
-
- );
- }
- } else {
- var scrollheader_classes = classNames({
- mx_RoomView_scrollheader: true,
- loading: this.state.paginating
- });
-
- var statusBar = (
-
- );
-
- // for testing UI...
- // this.state.upload = {
- // uploadedBytes: 123493,
- // totalBytes: 347534,
- // fileName: "testing_fooble.jpg",
- // }
-
- if (this.state.upload) {
- var innerProgressStyle = {
- width: ((this.state.upload.uploadedBytes / this.state.upload.totalBytes) * 100) + '%'
- };
- var uploadedSize = filesize(this.state.upload.uploadedBytes);
- var totalSize = filesize(this.state.upload.totalBytes);
- if (uploadedSize.replace(/^.* /,'') === totalSize.replace(/^.* /,'')) {
- uploadedSize = uploadedSize.replace(/ .*/, '');
- }
- statusBar = (
-
-
- - -
- {inviteEvent.user_id} has invited you to a room
- - - -
{joinErrorText}
- {rejectErrorText}
-
- 
- 
-
- );
- } else {
- var typingString = this.getWhoIsTypingString();
- //typingString = "Testing typing...";
- var unreadMsgs = this.getUnreadMessagesString();
- // no conn bar trumps unread count since you can't get unread messages
- // without a connection! (technically may already have some but meh)
- // It also trumps the "some not sent" msg since you can't resend without
- // a connection!
- if (this.state.syncState === "ERROR") {
- statusBar = (
-
-
-
-
-
-
- { uploadedSize } / { totalSize }
-
- Uploading {this.state.upload.fileName}
-
- 
-
- );
- }
- else if (this.state.hasUnsentMessages) {
- statusBar = (
-
-
-
-
- Connectivity to the server has been lost.
-
-
- Sent messages will be stored until your connection has returned.
-
-
-
-
- );
- }
- // unread count trumps who is typing since the unread count is only
- // set when you've scrolled up
- else if (unreadMsgs) {
- statusBar = (
-
-
-
-
- Some of your messages have not been sent.
-
-
-
- Resend all now
- or select individual messages to re-send.
-
-
- 
- {unreadMsgs}
-
- );
- }
- else if (typingString) {
- statusBar = (
-
- {unreadMsgs}
-
-
- );
- }
- }
-
- var aux = null;
- if (this.state.editingRoomSettings) {
- aux = ...
- {typingString}
-
- Ongoing conference call {supportedText}
-
- );
- }
-
- var fileDropTarget = null;
- if (this.state.draggingFile) {
- fileDropTarget =
-
;
- }
-
- return (
-
- 
- Drop File Here -
- - Drop File Here -
-
-
-
- );
- }
- },
-});
diff --git a/src/skins/vector/views/organisms/UserSettings.js b/src/skins/vector/views/organisms/UserSettings.js
deleted file mode 100644
index ea38c1bc85..0000000000
--- a/src/skins/vector/views/organisms/UserSettings.js
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-var dis = require('matrix-react-sdk/lib/dispatcher')
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
-var q = require('q');
-
-var version = require('../../../../../package.json').version;
-
-var Modal = require('matrix-react-sdk/lib/Modal');
-var UserSettingsStore = require('matrix-react-sdk/lib/UserSettingsStore');
-
-module.exports = React.createClass({
- displayName: 'UserSettings',
-
- Phases: {
- Loading: "loading",
- Saving: "saving",
- Display: "display",
- },
-
- getInitialState: function() {
- return {
- avatarUrl: null,
- displayName: null,
- threePids: [],
- clientVersion: version,
- phase: this.Phases.Loading,
- };
- },
-
- componentWillMount: function() {
- var self = this;
-
- var profilePromise = UserSettingsStore.loadProfileInfo();
- var threepidPromise = UserSettingsStore.loadThreePids();
-
- q.all([profilePromise, threepidPromise]).then(
- function(resps) {
- self.setState({
- avatarUrl: resps[0].avatar_url,
- displayName: resps[0].displayname,
- threepids: resps[1].threepids,
- phase: self.Phases.Display,
- });
-
- // keep a copy of the original state in order to track changes
- self.setState({
- originalState: self.state
- });
- },
- function(error) {
- var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
- Modal.createDialog(ErrorDialog, {
- title: "Can't load user settings",
- description: error.toString()
- });
- }
- );
- },
-
- componentDidMount: function() {
- this.dispatcherRef = dis.register(this.onAction);
- },
-
- componentWillUnmount: function() {
- dis.unregister(this.dispatcherRef);
- },
-
- onSaveClicked: function(ev) {
- var self = this;
- var savePromises = [];
-
- // XXX: this is managed in ChangeAvatar.js, although could be moved out here in order
- // to allow for the change to be staged alongside the rest of the form.
- //
- // if (this.state.originalState.avatarUrl !== this.state.avatarUrl) {
- // savePromises.push( UserSettingsStore.saveAvatarUrl(this.state.avatarUrl) );
- // }
-
- if (this.state.originalState.displayName !== this.state.displayName) {
- savePromises.push( UserSettingsStore.saveDisplayName(this.state.displayName) );
- }
-
- if (this.state.originalState.threepids.length !== this.state.threepids.length ||
- this.state.originalState.threepids.every(function(element, index) {
- return element === this.state.threepids[index];
- }))
- {
- savePromises.push( UserSettingsStore.saveThreePids(this.state.threepids) );
- }
-
- // TODO: do the password check
-
- self.setState({
- phase: self.Phases.Saving,
- });
-
- q.all(savePromises).then(
- function(resps) {
- self.setState({
- phase: self.Phases.Display,
- });
- self.onClose();
- },
- function(error) {
- self.setState({
- phase: self.Phases.Display,
- });
- var ErrorDialog = sdk.getComponent("organisms.ErrorDialog");
- Modal.createDialog(ErrorDialog, {
- title: "Can't save user settings",
- description: error.toString()
- });
- }
- );
- },
-
- onClose: function(ev) {
- // XXX: use browser history instead to find the previous room?
- if (this.props.roomId) {
- dis.dispatch({
- action: 'view_room',
- room_id: this.props.roomId,
- });
- }
- else {
- dis.dispatch({
- action: 'view_indexed_room',
- roomIndex: 0,
- });
- }
- },
-
- onAction: function(payload) {
- if (payload.action === "notifier_enabled") {
- this.setState({
- enableNotifications : UserSettingsStore.getEnableNotifications()
- });
- }
- },
-
- editAvatar: function() {
- var url = MatrixClientPeg.get().mxcUrlToHttp(this.state.avatarUrl);
- var ChangeAvatar = sdk.getComponent('molecules.ChangeAvatar');
- var avatarDialog = (
-
-
- { conferenceCallNotification }
- { aux }
-
-
- { fileDropTarget }
-
- -
-
- - - {this.getEventTiles()} -
-
-
-
- {statusBar}
-
-
-
- );
- this.avatarDialog = Modal.createDialogWithElement(avatarDialog);
- },
-
- onAvatarDialogCancel: function() {
- this.avatarDialog.close();
- },
-
- onLogoutClicked: function(event) {
- var LogoutPrompt = sdk.getComponent('organisms.LogoutPrompt');
- this.logoutModal = Modal.createDialog(LogoutPrompt, {onCancel: this.onLogoutPromptCancel});
- },
-
- onLogoutPromptCancel: function() {
- this.logoutModal.closeDialog();
- },
-
- onDisplayNameChange: function(event) {
- this.setState({ displayName: event.target.value });
- },
-
- onEnableNotificationsChange: function(event) {
- // don't bother waiting for Save to be clicked, as that'd be silly
- UserSettingsStore.setEnableNotifications( this.refs.enableNotifications.value );
-
- this.setState({
- enableNotifications : UserSettingsStore.getEnableNotifications()
- });
- },
-
- render: function() {
- var Loader = sdk.getComponent("atoms.Spinner");
- var saving;
- switch (this.state.phase) {
- case this.Phases.Loading:
- return
-
-
-
-
- );
- }
- }
-});
diff --git a/src/skins/vector/views/pages/MatrixChat.js b/src/skins/vector/views/pages/MatrixChat.js
deleted file mode 100644
index 8083902ce7..0000000000
--- a/src/skins/vector/views/pages/MatrixChat.js
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-
-var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/MatrixChat')
-
-var dis = require('matrix-react-sdk/lib/dispatcher');
-var Matrix = require("matrix-js-sdk");
-var ContextualMenu = require("../../../../ContextualMenu");
-
-module.exports = React.createClass({
- displayName: 'MatrixChat',
- mixins: [MatrixChatController],
-
- getInitialState: function() {
- return {
- width: 10000,
- }
- },
-
- componentDidMount: function() {
- window.addEventListener('resize', this.handleResize);
- this.handleResize();
- },
-
- componentWillUnmount: function() {
- window.removeEventListener('resize', this.handleResize);
- },
-
- onAliasClick: function(event, alias) {
- event.preventDefault();
- dis.dispatch({action: 'view_room_alias', room_alias: alias});
- },
-
- onUserClick: function(event, userId) {
- event.preventDefault();
- var MemberInfo = sdk.getComponent('molecules.MemberInfo');
- var member = new Matrix.RoomMember(null, userId);
- ContextualMenu.createMenu(MemberInfo, {
- member: member,
- right: window.innerWidth - event.pageX,
- top: event.pageY
- });
- },
-
- handleResize: function(e) {
- var hideLhsThreshold = 1000;
- var showLhsThreshold = 1000;
- var hideRhsThreshold = 820;
- var showRhsThreshold = 820;
-
- if (this.state.width > hideLhsThreshold && window.innerWidth <= hideLhsThreshold) {
- dis.dispatch({ action: 'hide_left_panel' });
- }
- if (this.state.width <= showLhsThreshold && window.innerWidth > showLhsThreshold) {
- dis.dispatch({ action: 'show_left_panel' });
- }
- if (this.state.width > hideRhsThreshold && window.innerWidth <= hideRhsThreshold) {
- dis.dispatch({ action: 'hide_right_panel' });
- }
- if (this.state.width <= showRhsThreshold && window.innerWidth > showRhsThreshold) {
- dis.dispatch({ action: 'show_right_panel' });
- }
-
- this.setState({width: window.innerWidth});
- },
-
- onRoomCreated: function(room_id) {
- dis.dispatch({
- action: "view_room",
- room_id: room_id,
- });
- },
-
- render: function() {
- var LeftPanel = sdk.getComponent('organisms.LeftPanel');
- var RoomView = sdk.getComponent('organisms.RoomView');
- var RightPanel = sdk.getComponent('organisms.RightPanel');
- var Login = sdk.getComponent('templates.Login');
- var UserSettings = sdk.getComponent('organisms.UserSettings');
- var Register = sdk.getComponent('templates.Register');
- var CreateRoom = sdk.getComponent('organisms.CreateRoom');
- var RoomDirectory = sdk.getComponent('organisms.RoomDirectory');
- var MatrixToolbar = sdk.getComponent('molecules.MatrixToolbar');
- var Notifier = sdk.getComponent('organisms.Notifier');
-
- if (this.state.logged_in && this.state.ready) {
- var page_element;
- var right_panel = "";
-
- switch (this.state.page_type) {
- case this.PageTypes.RoomView:
- page_element = Profile
- -
-
-
-
-
-
-
-
-
- {this.state.threepids.map(function(val) {
- var id = "email-" + val.address;
- return (
-
-
-
-
-
-
-
-
- );
- })}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Log out
- Notifications
- -
-
-
-
-
-
-
-
-
-
-
-
-
- Advanced
- -
-
-
-
- Version {this.state.clientVersion}
-
-
-
- { saving }
- Save and close
-
-
- );
- }
- else {
- return (
-
-
- {page_element}
-
- {right_panel}
-
-
-
- {page_element}
-
- {right_panel}
-
- );
- }
- } else if (this.state.logged_in) {
- var Spinner = sdk.getComponent('atoms.Spinner');
- return (
-
-
-
-
- );
- // XXX: clearly these should be separate organisms
- case 'stage_m.login.password':
- return (
-
-
-
-
-
- );
- case 'stage_m.login.cas':
- var CasLogin = sdk.getComponent('organisms.CasLogin');
- return (
-
-
- -
- );
- },
-
- render: function() {
- return (
- Sign in
- {this.componentForStep(this.state.step)} -
- { loader }
- {this.state.errorText}
-
- Create a new account
- - -
-
- );
- }
-});
diff --git a/src/skins/vector/views/templates/Register.js b/src/skins/vector/views/templates/Register.js
deleted file mode 100644
index 945d607c9e..0000000000
--- a/src/skins/vector/views/templates/Register.js
+++ /dev/null
@@ -1,216 +0,0 @@
-/*
-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 sdk = require('matrix-react-sdk')
-var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg')
-
-var RegisterController = require('../../../../controllers/templates/Register')
-
-var config = require('../../../../../config.json');
-
-module.exports = React.createClass({
- displayName: 'Register',
- mixins: [RegisterController],
-
- getInitialState: function() {
- // TODO: factor out all localstorage stuff into its own home.
- // This is common to Login, Register and MatrixClientPeg
- var localStorage = window.localStorage;
- var hs_url, is_url;
- if (localStorage) {
- hs_url = localStorage.getItem("mx_hs_url");
- is_url = localStorage.getItem("mx_is_url");
- }
-
- // make sure we have our MatrixClient set up whatever
- // Useful for debugging only.
- // MatrixClientPeg.replaceUsingUrls(
- // hs_url || config.default_hs_url,
- // is_url || config.default_is_url
- // );
-
- return {
- customHsUrl: hs_url || config.default_hs_url,
- customIsUrl: is_url || config.default_is_url,
- serverConfigVisible: (hs_url && hs_url !== config.default_hs_url ||
- is_url && is_url !== config.default_is_url)
- }
- },
-
- getRegFormVals: function() {
- return {
- email: this.refs.email.value.trim(),
- username: this.refs.username.value.trim(),
- password: this.refs.password.value.trim(),
- confirmPassword: this.refs.confirmPassword.value.trim()
- };
- },
-
- getHsUrl: function() {
- if (this.state.serverConfigVisible) {
- return this.state.customHsUrl;
- } else {
- return config.default_hs_url;
- }
- },
-
- getIsUrl: function() {
- if (this.state.serverConfigVisible) {
- return this.state.customIsUrl;
- } else {
- return config.default_is_url;
- }
- },
-
- onServerConfigVisibleChange: function(ev) {
- this.setState({
- serverConfigVisible: ev.target.checked
- });
- },
-
- onServerUrlChanged: function(newUrl) {
- this.setState({
- customHsUrl: this.refs.serverConfig.getHsUrl(),
- customIsUrl: this.refs.serverConfig.getIsUrl(),
- });
- this.forceUpdate();
- },
-
- onProfileContinueClicked: function() {
- this.onAccountReady();
- },
-
- componentForStep: function(step) {
- switch (step) {
- case 'initial':
- var serverConfigStyle = {};
- serverConfigStyle.display = this.state.serverConfigVisible ? 'block' : 'none';
- var ServerConfig = sdk.getComponent("molecules.ServerConfig");
- return (
-
-
-
-
-
- {this.loginContent()}
-
-
-
-
- );
- // XXX: clearly these should be separate organisms
- case 'stage_m.login.email.identity':
- return (
-
- Please check your email to continue registration.
-
- );
- case 'stage_m.login.recaptcha':
- return (
-
- This Home Server would like to make sure you are not a robot
-
-
- );
- }
- },
-
- registerContent: function() {
- if (this.state.busy) {
- var Loader = sdk.getComponent("atoms.Spinner");
- return (
-
- Set a display name:
-
- );
- } else {
- return (
-
-
- );
- }
- },
-
- onBadFields: function(bad) {
- var keys = Object.keys(bad);
- var strings = [];
- for (var i = 0; i < keys.length; ++i) {
- switch (bad[keys[i]]) {
- case this.FieldErrors.PasswordMismatch:
- strings.push("Passwords don't match");
- break;
- case this.FieldErrors.Missing:
- strings.push("Missing "+keys[i]);
- break;
- case this.FieldErrors.TooShort:
- strings.push(keys[i]+" is too short");
- break;
- case this.FieldErrors.InUse:
- strings.push(keys[i]+" is already taken");
- break;
- case this.FieldErrors.Length:
- strings.push(keys[i] + " is not long enough.");
- break;
- default:
- console.error("Unhandled FieldError: %s", bad[keys[i]]);
- break;
- }
- }
- var errtxt = strings.join(', ');
- this.setState({
- errorText: errtxt
- });
- },
-
- render: function() {
- return (
- Create an account
- {this.componentForStep(this.state.step)} -{this.state.errorText}
- I already have an account
-
-
- );
- }
-});
diff --git a/src/vector/index.js b/src/vector/index.js
index 87cbd0b661..efca1e8243 100644
--- a/src/vector/index.js
+++ b/src/vector/index.js
@@ -16,17 +16,28 @@ limitations under the License.
'use strict';
+// CSS requires: just putting them here for now as CSS is going to be
+// refactored soon anyway
+require('../../vector/components.css');
+require('gemini-scrollbar/gemini-scrollbar.css');
+require('gfm.css/gfm.css');
+require('highlight.js/styles/github.css');
+
var RunModernizrTests = require("./modernizr"); // this side-effects a global
var React = require("react");
var ReactDOM = require("react-dom");
var sdk = require("matrix-react-sdk");
-sdk.loadSkin(require('../skins/vector/skindex'));
-sdk.loadModule(require('../modules/VectorConferenceHandler'));
+sdk.loadSkin(require('../component-index'));
+var VectorConferenceHandler = require('../VectorConferenceHandler');
+var configJson = require("../../config.json");
var qs = require("querystring");
var lastLocationHashSet = null;
+var CallHandler = require("matrix-react-sdk/lib/CallHandler");
+CallHandler.setConferenceHandler(VectorConferenceHandler);
+
function checkBrowserFeatures(featureList) {
if (!window.Modernizr) {
console.error("Cannot check features - Modernizr global is missing.");
@@ -136,16 +147,20 @@ window.onload = function() {
function loadApp() {
if (validBrowser) {
- var MatrixChat = sdk.getComponent('pages.MatrixChat');
+ var MatrixChat = sdk.getComponent('structures.MatrixChat');
window.matrixChat = ReactDOM.render(
-
-
-
-
-
- {this.registerContent()}
-
-