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

Just bind the right function to the button 

rather than deciding in onChangelogClicked
This commit is contained in:
David Baker 2016-11-03 11:43:50 +00:00
parent e8494c3dc7
commit 108af83ae8
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,18 +37,6 @@ export default React.createClass({
releaseNotes: React.PropTypes.string, 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) { displayReleaseNotes: function(releaseNotes) {
const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog'); const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
Modal.createDialog(QuestionDialog, { Modal.createDialog(QuestionDialog, {
@ -82,8 +70,14 @@ export default React.createClass({
render: function() { render: function() {
let action_button; let action_button;
if (this.props.releaseNotes || (checkVersion(this.props.version) && checkVersion(this.props.newVersion))) { // If we have release notes to display, we display them. Otherwise,
action_button = <button className="mx_MatrixToolbar_action" onClick={this.onChangelogClicked}>What's new?</button>; // 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) {
action_button = <button className="mx_MatrixToolbar_action" onClick={this.displayReleaseNotes}>What's new?</button>;
} else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
action_button = <button className="mx_MatrixToolbar_action" onClick={this.displayChangelog}>What's new?</button>;
} else if (PlatformPeg.get()) { } else if (PlatformPeg.get()) {
action_button = <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>Update</button>; action_button = <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>Update</button>;
} }