LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Restore UI version on Help page

Browse source
This commit is contained in:
Alex Liebowitz 2017-02-23 23:36:19 -05:00
parent 7daeb610a2
commit e058470a70
3 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG.md
View file

@ -20,7 +20,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
### Fixed ### Fixed
* On load screen, always show Cancel link if a previous page is available * On load screen, always show Cancel link if a previous page is available
* When user hits "Watch," don't check balance if download already started * When user hits "Watch," don't check balance if download already started
* * Restore UI version on Help page
* *
## [0.9.0rc9] - 2017-02-22 ## [0.9.0rc9] - 2017-02-22

9
js/page/help.js
View file

@ -3,6 +3,7 @@
import React from 'react'; import React from 'react';
import lbry from '../lbry.js'; import lbry from '../lbry.js';
import {Link} from '../component/link.js'; import {Link} from '../component/link.js';
import {version as uiVersion} from 'json!../../package.json';
var HelpPage = React.createClass({ var HelpPage = React.createClass({
getInitialState: function() { getInitialState: function() {
@ -27,7 +28,7 @@ var HelpPage = React.createClass({
document.title = "Help"; document.title = "Help";
}, },
render: function() { render: function() {
let ver, osName, platform, newVerLink, uiVersion; let ver, osName, platform, newVerLink;
if (this.state.versionInfo) { if (this.state.versionInfo) {
ver = this.state.versionInfo; ver = this.state.versionInfo;
@ -43,12 +44,6 @@ var HelpPage = React.createClass({
platform = `Windows (${ver.platform})`; platform = `Windows (${ver.platform})`;
newVerLink = 'https://lbry.io/get/lbry.msi'; newVerLink = 'https://lbry.io/get/lbry.msi';
} }
if (ver.ui_version == 'user-specified') {
uiVersion = '(User specified)';
} else {
uiVersion = ver.ui_version || '(Unknown)';
}
} else { } else {
ver = null; ver = null;
} }

1
package.json
View file

@ -46,6 +46,7 @@
"eslint-plugin-import": "^2.2.0", "eslint-plugin-import": "^2.2.0",
"eslint-plugin-jsx-a11y": "^2.2.3", "eslint-plugin-jsx-a11y": "^2.2.3",
"eslint-plugin-react": "^6.7.1", "eslint-plugin-react": "^6.7.1",
"json-loader": "^0.5.4",
"node-sass": "^3.13.0", "node-sass": "^3.13.0",
"webpack": "^1.13.3", "webpack": "^1.13.3",
"webpack-target-electron-renderer": "^0.4.0" "webpack-target-electron-renderer": "^0.4.0"