mad-star-studio/element-web
2
0
Fork 0
Code Pull requests Activity

Get the vector 'ongoing conference' bar back (vector now needs a custom RoomView for this: it would be nice it it didn't)

Browse source
This commit is contained in:
David Baker 2015-10-08 15:22:16 +01:00
parent c22442f6d1
commit ccc5f30c9b
2 changed files with 495 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/skins/vector/views/organisms/RoomView.js
View file

@ -19,12 +19,13 @@ limitations under the License.
var React = require('react');
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 RoomViewController = require('matrix-react-sdk/lib/controllers/organisms/RoomView')
var RoomViewController = require('../../../../controllers/organisms/RoomView')
var Loader = require("react-loader");
@ -62,6 +63,14 @@ module.exports = React.createClass({
this.setState(this.getInitialState());
},
onConferenceNotificationClick: function() {
dis.dispatch({
action: 'place_call',
type: "video",
room_id: this.props.roomId
});
},
getUnreadMessagesString: function() {
if (!this.state.numUnreadMessages) {
return "";