OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

PR feedback

pull/21833/head
David Baker 2016-11-08 11:43:24 +00:00
parent d44adcb7a9
commit d871ca2b24
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/BasePlatform.js
View File

@ -71,6 +71,6 @@ export default class BasePlatform {
* the current version of the application. * the current version of the application.
*/ */
getAppVersion() { getAppVersion() {
return q(); throw new Error("getAppVersion not implemented!");
} }
} }

5
src/components/structures/UserSettings.js
View File

@ -36,7 +36,6 @@ module.exports = React.createClass({
displayName: 'UserSettings', displayName: 'UserSettings',
propTypes: { propTypes: {
version: React.PropTypes.string,
onClose: React.PropTypes.func, onClose: React.PropTypes.func,
// The brand string given when creating email pushers // The brand string given when creating email pushers
brand: React.PropTypes.string, brand: React.PropTypes.string,
@ -66,8 +65,11 @@ module.exports = React.createClass({
}, },
componentWillMount: function() { componentWillMount: function() {
this._unmounted = false;
if (PlatformPeg.get()) { if (PlatformPeg.get()) {
PlatformPeg.get().getAppVersion().done((appVersion) => { PlatformPeg.get().getAppVersion().done((appVersion) => {
if (this._unmounted) return;
this.setState({ this.setState({
vectorVersion: appVersion, vectorVersion: appVersion,
}); });
@ -90,6 +92,7 @@ module.exports = React.createClass({
}, },
componentWillUnmount: function() { componentWillUnmount: function() {
this._unmounted = true;
dis.dispatch({ dis.dispatch({
action: 'ui_opacity', action: 'ui_opacity',
sideOpacity: 1.0, sideOpacity: 1.0,