gaja-group
/
matrix-bot
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Split NewVersionBar release notes / changelog 

and change the class to use React createClass syntax while I'm at
it, rather than a completely different third style we use nowhere
else in the project.
This commit is contained in:
David Baker 2016-11-02 19:20:11 +00:00
parent 8c3fed7559
commit e8494c3dc7
1 changed files with 65 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
src/components/views/globals/NewVersionBar.js
View File

@ -16,8 +16,8 @@ limitations under the License.
'use strict'; 'use strict';
var React = require('react'); import React from 'react';
var sdk = require('matrix-react-sdk'); import sdk from 'matrix-react-sdk';
import Modal from 'matrix-react-sdk/lib/Modal'; import Modal from 'matrix-react-sdk/lib/Modal';
import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg'; import PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
@ -30,13 +30,30 @@ function checkVersion(ver) {
return parts[0] == 'vector' && parts[2] == 'react' && parts[4] == 'js'; return parts[0] == 'vector' && parts[2] == 'react' && parts[4] == 'js';
} }
export default function NewVersionBar(props) { export default React.createClass({
const onChangelogClicked = () => { propTypes: {
if (props.releaseNotes) { version: React.PropTypes.string.isRequired,
newVersion: React.PropTypes.string.isRequired,
releaseNotes: React.PropTypes.string,
},
onChangelogClicked: function() {
// If we have release notes to display, we display them. Otherwise,
// we display the Changelog Dialog which takes two versions and
// automatically tells you what's changed (provided the versions
// are in the right format)
if (this.props.releaseNotes) {
this.displayReleaseNotes(this.props.releaseNotes);
} else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
this.displayChangelog();
}
},
displayReleaseNotes: function(releaseNotes) {
const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
Modal.createDialog(QuestionDialog, { Modal.createDialog(QuestionDialog, {
title: "What's New", title: "What's New",
description: <pre className="changelog_text">{props.releaseNotes}</pre>, description: <pre className="changelog_text">{releaseNotes}</pre>,
button: "Update", button: "Update",
onFinished: (update) => { onFinished: (update) => {
if(update && PlatformPeg.get()) { if(update && PlatformPeg.get()) {
@ -44,30 +61,31 @@ export default function NewVersionBar(props) {
} }
} }
}); });
} else { },
displayChangelog: function() {
const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog'); const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
Modal.createDialog(ChangelogDialog, { Modal.createDialog(ChangelogDialog, {
version: props.version, version: this.props.version,
newVersion: props.newVersion, newVersion: this.props.newVersion,
releaseNotes: releaseNotes,
onFinished: (update) => { onFinished: (update) => {
if(update && PlatformPeg.get()) { if(update && PlatformPeg.get()) {
PlatformPeg.get().installUpdate(); PlatformPeg.get().installUpdate();
} }
} }
}); });
} },
};
const onUpdateClicked = () => { onUpdateClicked: function() {
PlatformPeg.get().installUpdate(); PlatformPeg.get().installUpdate();
}; },
render: function() {
let action_button; let action_button;
if (props.releaseNotes || (checkVersion(props.version) && checkVersion(props.newVersion))) { if (this.props.releaseNotes || (checkVersion(this.props.version) && checkVersion(this.props.newVersion))) {
action_button = <button className="mx_MatrixToolbar_action" onClick={onChangelogClicked}>What's new?</button>; action_button = <button className="mx_MatrixToolbar_action" onClick={this.onChangelogClicked}>What's new?</button>;
} else if (PlatformPeg.get()) { } else if (PlatformPeg.get()) {
action_button = <button className="mx_MatrixToolbar_action" onClick={onUpdateClicked}>Update</button>; action_button = <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>Update</button>;
} }
return ( return (
<div className="mx_MatrixToolbar"> <div className="mx_MatrixToolbar">
@ -79,9 +97,4 @@ export default function NewVersionBar(props) {
</div> </div>
); );
} }
});
NewVersionBar.propTypes = {
version: React.PropTypes.string.isRequired,
newVersion: React.PropTypes.string.isRequired,
releaseNotes: React.PropTypes.string,
};