From a0fb58415e997ee830b1889bc7ff14984a8eee75 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 23 Nov 2016 19:55:36 -0500 Subject: [PATCH 1/2] Help: slight refactor of version section --- js/page/help.js | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/js/page/help.js b/js/page/help.js index 5e9515965..0f5ccc041 100644 --- a/js/page/help.js +++ b/js/page/help.js @@ -17,21 +17,24 @@ var HelpPage = React.createClass({ document.title = "Help"; }, render: function() { - var ver = this.state.versionInfo; + let ver, osName, platform, newVerLink; + if (this.state.versionInfo) { + ver = this.state.versionInfo; - if (ver) { if (ver.os_system == 'Darwin') { - var osName = (parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS'); + osName = (parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS'); - var platform = osName + ' ' + ver.os_release; - var newVerLink = 'https://lbry.io/get/lbry.dmg'; + platform = `${osName} ${ver.os_release}` + newVerLink = 'https://lbry.io/get/lbry.dmg'; } else if (ver.os_system == 'Linux') { - var platform = 'Linux (' + ver.platform + ')'; - var newVerLink = 'https://lbry.io/get/lbry.deb'; + platform = `Linux (${ver.platform})`; + newVerLink = 'https://lbry.io/get/lbry.deb'; } else { - var platform = 'Windows (' + ver.platform + ')'; - var newVerLink = 'https://lbry.io/get/lbry.msi'; + platform = `Windows (${ver.platform})`; + newVerLink = 'https://lbry.io/get/lbry.msi'; } + } else { + ver = null; } return ( @@ -60,7 +63,7 @@ var HelpPage = React.createClass({

About

{ver.lbrynet_update_available || ver.lbryum_update_available ? -

A newer version of LBRY is available.

+

A newer version of LBRY is available.

:

Your copy of LBRY is up to date.

} From 70076d8a9e699c31889711898472078273bf0031 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 23 Nov 2016 20:35:34 -0500 Subject: [PATCH 2/2] Help: Show LBRY ID in "About" section --- js/page/help.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/js/page/help.js b/js/page/help.js index 0f5ccc041..60c70d2a6 100644 --- a/js/page/help.js +++ b/js/page/help.js @@ -17,10 +17,12 @@ var HelpPage = React.createClass({ document.title = "Help"; }, render: function() { - let ver, osName, platform, newVerLink; + let ver, osName, platform, newVerLink, lbryId; if (this.state.versionInfo) { ver = this.state.versionInfo; + lbryId = ver.lbry_id; + if (ver.os_system == 'Darwin') { osName = (parseInt(ver.os_release.match(/^\d+/)) < 16 ? 'Mac OS X' : 'Mac OS'); @@ -80,6 +82,10 @@ var HelpPage = React.createClass({ + + + +
Platform {platform}
Installation ID{lbryId}