Merge remote-tracking branch 'origin/develop' into dbkr/electron_3

src/components/views/globals/NewVersionBar.js

@@ -16,8 +16,8 @@ limitations under the License.
 
 '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 PlatformPeg from 'matrix-react-sdk/lib/PlatformPeg';
 
@@ -30,58 +30,65 @@ function checkVersion(ver) {
     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,
-            const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+        newVersion: React.PropTypes.string.isRequired,
-            Modal.createDialog(QuestionDialog, {
+        releaseNotes: React.PropTypes.string,
-                title: "What's New",
+    },
-                description: <pre className="changelog_text">{props.releaseNotes}</pre>,
-                button: "Update",
-                onFinished: (update) => {
-                    if(update && PlatformPeg.get()) {
-                        PlatformPeg.get().installUpdate();
-                    }
-                }
-            });
-        } else {
-            const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
-            Modal.createDialog(ChangelogDialog, {
-                version: props.version,
-                newVersion: props.newVersion,
-                releaseNotes: releaseNotes,
-                onFinished: (update) => {
-                    if(update && PlatformPeg.get()) {
-                        PlatformPeg.get().installUpdate();
-                    }
-                }
-            });
-        }
-    };
 
-    const onUpdateClicked = () => {
+    displayReleaseNotes: function(releaseNotes) {
+        const QuestionDialog = sdk.getComponent('dialogs.QuestionDialog');
+        Modal.createDialog(QuestionDialog, {
+            title: "What's New",
+            description: <pre className="changelog_text">{releaseNotes}</pre>,
+            button: "Update",
+            onFinished: (update) => {
+                if(update && PlatformPeg.get()) {
+                    PlatformPeg.get().installUpdate();
+                }
+            }
+        });
+    },
+
+    displayChangelog: function() {
+        const ChangelogDialog = sdk.getComponent('dialogs.ChangelogDialog');
+        Modal.createDialog(ChangelogDialog, {
+            version: this.props.version,
+            newVersion: this.props.newVersion,
+            onFinished: (update) => {
+                if(update && PlatformPeg.get()) {
+                    PlatformPeg.get().installUpdate();
+                }
+            }
+        });
+    },
+
+    onUpdateClicked: function() {
         PlatformPeg.get().installUpdate();
-    };
+    },
 
-    let action_button;
+    render: function() {
-    if (props.releaseNotes || (checkVersion(props.version) && checkVersion(props.newVersion))) {
+        let action_button;
-        action_button = <button className="mx_MatrixToolbar_action" onClick={onChangelogClicked}>What's new?</button>;
+        // If we have release notes to display, we display them. Otherwise,
-    } else if (PlatformPeg.get()) {
+        // we display the Changelog Dialog which takes two versions and
-        action_button = <button className="mx_MatrixToolbar_action" onClick={onUpdateClicked}>Update</button>;
+        // automatically tells you what's changed (provided the versions
-    }
+        // are in the right format)
-    return (
+        if (this.props.releaseNotes) {
-        <div className="mx_MatrixToolbar">
+            action_button = <button className="mx_MatrixToolbar_action" onClick={this.displayReleaseNotes}>What's new?</button>;
-            <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
+        } else if (checkVersion(this.props.version) && checkVersion(this.props.newVersion)) {
-            <div className="mx_MatrixToolbar_content">
+            action_button = <button className="mx_MatrixToolbar_action" onClick={this.displayChangelog}>What's new?</button>;
-                A new version of Riot is available.
+        } else if (PlatformPeg.get()) {
+            action_button = <button className="mx_MatrixToolbar_action" onClick={this.onUpdateClicked}>Update</button>;
+        }
+        return (
+            <div className="mx_MatrixToolbar">
+                <img className="mx_MatrixToolbar_warning" src="img/warning.svg" width="24" height="23" alt="/!\"/>
+                <div className="mx_MatrixToolbar_content">
+                    A new version of Riot is available.
+                </div>
+                {action_button}
             </div>
-            {action_button}
+        );
-        </div>
+    }
-    );
+});
-}
-
-NewVersionBar.propTypes = {
-    version: React.PropTypes.string.isRequired,
-    newVersion: React.PropTypes.string.isRequired,
-    releaseNotes: React.PropTypes.string,
-};

src/vector/platform/VectorBasePlatform.js

@@ -1,7 +1,8 @@
 // @flow
 
 /*
-Copyright 2016 Aviral Dasgupta and OpenMarket Ltd
+Copyright 2016 Aviral Dasgupta
+Copyright 2016 OpenMarket Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

src/vector/platform/WebPlatform.js

@@ -1,7 +1,8 @@
 // @flow
 
 /*
-Copyright 2016 Aviral Dasgupta and OpenMarket Ltd
+Copyright 2016 Aviral Dasgupta
+Copyright 2016 OpenMarket Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

src/vector/platform/index.js

@@ -1,7 +1,8 @@
 // @flow
 
 /*
-Copyright 2016 Aviral Dasgupta and OpenMarket Ltd
+Copyright 2016 Aviral Dasgupta
+Copyright 2016 OpenMarket Ltd
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.