imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/dbkr/my_groups' into dbkr/groups_better_groupview

Browse source
This commit is contained in:
David Baker 2017-07-07 13:44:35 +01:00
commit c1833f9833
8 changed files with 40 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/components/structures/LoggedInView.js
View file

@ -269,17 +269,19 @@ export default React.createClass({
break;
case PageTypes.HomePage:
// If team server config is present, pass the teamServerURL. props.teamToken
// must also be set for the team page to be displayed, otherwise the
// welcomePageUrl is used (which might be undefined).
const teamServerUrl = this.props.config.teamServerConfig ?
this.props.config.teamServerConfig.teamServerURL : null;
{
// If team server config is present, pass the teamServerURL. props.teamToken
// must also be set for the team page to be displayed, otherwise the
// welcomePageUrl is used (which might be undefined).
const teamServerUrl = this.props.config.teamServerConfig ?
this.props.config.teamServerConfig.teamServerURL : null;
page_element = <HomePage
teamServerUrl={teamServerUrl}
teamToken={this.props.teamToken}
homePageUrl={this.props.config.welcomePageUrl}
/>;
page_element = <HomePage
teamServerUrl={teamServerUrl}
teamToken={this.props.teamToken}
homePageUrl={this.props.config.welcomePageUrl}
/>;
}
break;
case PageTypes.UserView:

12
src/components/structures/MyGroups.js
View file

@ -17,7 +17,7 @@ limitations under the License.
import React from 'react';
import sdk from '../../index';
import { _t, _tJsx } from '../../languageHandler';
import WithMatrixClient from '../../wrappers/WithMatrixClient';
import withMatrixClient from '../../wrappers/withMatrixClient';
import AccessibleButton from '../views/elements/AccessibleButton';
import dis from '../../dispatcher';
import PropTypes from 'prop-types';
@ -40,10 +40,10 @@ const GroupTile = React.createClass({
render: function() {
return <a onClick={this.onClick} href="#">{this.props.groupId}</a>;
}
},
});
export default WithMatrixClient(React.createClass({
export default withMatrixClient(React.createClass({
displayName: 'MyGroups',
propTypes: {
@ -84,12 +84,12 @@ export default WithMatrixClient(React.createClass({
let content;
if (this.state.groups) {
let groupNodes = [];
const groupNodes = [];
this.state.groups.forEach((g) => {
groupNodes.push(
<div key={g}>
<GroupTile groupId={g} />
</div>
</div>,
);
});
content = <div>
@ -117,7 +117,7 @@ export default WithMatrixClient(React.createClass({
{_t(
'Create a group to represent your community! '+
'Define a set of rooms and your own custom homepage '+
'to mark out your space in the Matrix universe.'
'to mark out your space in the Matrix universe.',
)}
</div>
<div className="mx_MyGroups_joinBox">