merge develop

This commit is contained in:
Matthew Hodgson 2015-10-27 23:28:34 +00:00
parent aac00db16b
commit cbaf134625
17 changed files with 30 additions and 54 deletions

View File

@ -1,20 +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';
module.exports = {
};

View File

@ -63,6 +63,7 @@ module.exports = {
MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline); MatrixClientPeg.get().removeListener("Room.timeline", this.onRoomTimeline);
MatrixClientPeg.get().removeListener("Room.name", this.onRoomName); MatrixClientPeg.get().removeListener("Room.name", this.onRoomName);
MatrixClientPeg.get().removeListener("RoomMember.typing", this.onRoomMemberTyping); MatrixClientPeg.get().removeListener("RoomMember.typing", this.onRoomMemberTyping);
MatrixClientPeg.get().removeListener("RoomState.members", this.onRoomStateMember);
} }
}, },

View File

@ -62,10 +62,6 @@ limitations under the License.
display: block; display: block;
} }
.mx_EventTile_notice .mx_MessageTile_content {
opacity: 0.5;
}
.mx_MessageTile_content { .mx_MessageTile_content {
display: block; display: block;
margin-right: 100px; margin-right: 100px;

View File

@ -15,5 +15,5 @@ limitations under the License.
*/ */
.mx_MNoticeTile { .mx_MNoticeTile {
opacity: 0.5; opacity: 0.6;
} }

View File

@ -18,13 +18,11 @@ limitations under the License.
var React = require('react'); var React = require('react');
var ImageViewController = require('../../../../controllers/atoms/ImageView')
var DateUtils = require('../../../../DateUtils'); var DateUtils = require('../../../../DateUtils');
var filesize = require('filesize'); var filesize = require('filesize');
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'ImageView', displayName: 'ImageView',
mixins: [ImageViewController],
// XXX: keyboard shortcuts for managing dialogs should be done by the modal dialog base class omehow, surely... // XXX: keyboard shortcuts for managing dialogs should be done by the modal dialog base class omehow, surely...
componentDidMount: function() { componentDidMount: function() {

View File

@ -19,11 +19,8 @@ limitations under the License.
var React = require('react'); var React = require('react');
var DateUtils = require('../../../../DateUtils'); var DateUtils = require('../../../../DateUtils');
var MessageTimestampController = require('matrix-react-sdk/lib/controllers/atoms/MessageTimestamp')
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MessageTimestamp', displayName: 'MessageTimestamp',
mixins: [MessageTimestampController],
render: function() { render: function() {
var date = new Date(this.props.ts); var date = new Date(this.props.ts);

View File

@ -18,11 +18,8 @@ limitations under the License.
var React = require('react'); var React = require('react');
var VideoFeedController = require('matrix-react-sdk/lib/controllers/atoms/voip/VideoFeed')
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'VideoFeed', displayName: 'VideoFeed',
mixins: [VideoFeedController],
render: function() { render: function() {
return ( return (

View File

@ -18,12 +18,11 @@ limitations under the License.
var React = require('react'); var React = require('react');
var EventAsTextTileController = require('matrix-react-sdk/lib/controllers/molecules/EventAsTextTile') var sdk = require('matrix-react-sdk')
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent'); var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'EventAsTextTile', displayName: 'EventAsTextTile',
mixins: [EventAsTextTileController],
statics: { statics: {
needsSenderProfile: function() { needsSenderProfile: function() {

View File

@ -19,15 +19,12 @@ limitations under the License.
var React = require('react'); var React = require('react');
var filesize = require('filesize'); var filesize = require('filesize');
var MImageTileController = require('matrix-react-sdk/lib/controllers/molecules/MImageTile')
var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg'); var MatrixClientPeg = require('matrix-react-sdk/lib/MatrixClientPeg');
var Modal = require('matrix-react-sdk/lib/Modal'); var Modal = require('matrix-react-sdk/lib/Modal');
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk')
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MImageTile', displayName: 'MImageTile',
mixins: [MImageTileController],
thumbHeight: function(fullWidth, fullHeight, thumbWidth, thumbHeight) { thumbHeight: function(fullWidth, fullHeight, thumbWidth, thumbHeight) {
if (!fullWidth || !fullHeight) { if (!fullWidth || !fullHeight) {

View File

@ -18,14 +18,11 @@ limitations under the License.
var React = require('react'); var React = require('react');
var MRoomMemberTileController = require('matrix-react-sdk/lib/controllers/molecules/MRoomMemberTile')
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk')
var TextForEvent = require('matrix-react-sdk/lib/TextForEvent'); var TextForEvent = require('matrix-react-sdk/lib/TextForEvent');
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MRoomMemberTile', displayName: 'MRoomMemberTile',
mixins: [MRoomMemberTileController],
getMemberEventText: function() { getMemberEventText: function() {
return TextForEvent.textForEvent(this.props.mxEvent); return TextForEvent.textForEvent(this.props.mxEvent);

View File

@ -20,11 +20,8 @@ var React = require('react');
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk')
var MatrixToolbarController = require('matrix-react-sdk/lib/controllers/molecules/MatrixToolbar')
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MatrixToolbar', displayName: 'MatrixToolbar',
mixins: [MatrixToolbarController],
hideToolbar: function() { hideToolbar: function() {
var Notifier = sdk.getComponent('organisms.Notifier'); var Notifier = sdk.getComponent('organisms.Notifier');

View File

@ -19,15 +19,12 @@ limitations under the License.
var React = require('react'); var React = require('react');
var classNames = require("classnames"); var classNames = require("classnames");
var SenderProfileController = require('matrix-react-sdk/lib/controllers/molecules/SenderProfile')
// The Lato WOFF doesn't include sensible combining diacritics, so Chrome chokes on rendering them. // 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. // Revert to Arial when this happens, which on OSX works at least.
var zalgo = /[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/; var zalgo = /[\u0300-\u036f\u1ab0-\u1aff\u1dc0-\u1dff\u20d0-\u20ff\ufe20-\ufe2f]/;
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'SenderProfile', displayName: 'SenderProfile',
mixins: [SenderProfileController],
render: function() { render: function() {
var mxEvent = this.props.mxEvent; var mxEvent = this.props.mxEvent;

View File

@ -18,11 +18,8 @@ limitations under the License.
var React = require('react'); var React = require('react');
var UnknownMessageTileController = require('matrix-react-sdk/lib/controllers/molecules/UnknownMessageTile')
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'UnknownMessageTile', displayName: 'UnknownMessageTile',
mixins: [UnknownMessageTileController],
render: function() { render: function() {
var content = this.props.mxEvent.getContent(); var content = this.props.mxEvent.getContent();

View File

@ -20,11 +20,9 @@ var React = require('react');
var sdk = require('matrix-react-sdk') var sdk = require('matrix-react-sdk')
var dis = require('matrix-react-sdk/lib/dispatcher') var dis = require('matrix-react-sdk/lib/dispatcher')
var VideoViewController = require('matrix-react-sdk/lib/controllers/molecules/voip/VideoView')
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'VideoView', displayName: 'VideoView',
mixins: [VideoViewController],
componentWillMount: function() { componentWillMount: function() {
dis.register(this.onAction); dis.register(this.onAction);

View File

@ -66,7 +66,8 @@ var NotifierView = {
title, title,
{ {
"body": msg, "body": msg,
"icon": avatarUrl "icon": avatarUrl,
"tag": "vector"
} }
); );

View File

@ -84,6 +84,13 @@ module.exports = React.createClass({
}); });
} }
} }
if (payload.action === "view_room") {
if (this.state.phase === this.Phase.MemberInfo) {
this.setState({
phase: this.Phase.MemberList
});
}
}
}, },
render: function() { render: function() {

View File

@ -25,7 +25,8 @@ var MatrixChatController = require('matrix-react-sdk/lib/controllers/pages/Matri
var Loader = require("react-loader"); var Loader = require("react-loader");
var dis = require('matrix-react-sdk/lib/dispatcher'); var dis = require('matrix-react-sdk/lib/dispatcher');
var Matrix = require("matrix-js-sdk");
var ContextualMenu = require("../../../../ContextualMenu");
module.exports = React.createClass({ module.exports = React.createClass({
displayName: 'MatrixChat', displayName: 'MatrixChat',
@ -46,6 +47,22 @@ module.exports = React.createClass({
window.removeEventListener('resize', this.handleResize); 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) { handleResize: function(e) {
var hideLhsThreshold = 1000; var hideLhsThreshold = 1000;
var showLhsThreshold = 1000; var showLhsThreshold = 1000;