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

Merge branch 'redux' of https://github.com/lbryio/lbry-app into redux

Browse source
This commit is contained in:
6ea86b96 2017-05-05 11:15:20 +07:00
commit ca2c678301
6 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bumpversion.cfg
View file

@ -1,5 +1,5 @@
[bumpversion] [bumpversion]
current_version = 0.10.0rc8 current_version = 0.10.0rc9
commit = True commit = True
tag = True tag = True
parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))? parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+)(?P<candidate>\d+))?

2
app/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "LBRY", "name": "LBRY",
"version": "0.10.0rc8", "version": "0.10.0rc9",
"main": "main.js", "main": "main.js",
"description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.", "description": "LBRY is a fully decentralized, open-source protocol facilitating the discovery, access, and (sometimes) purchase of data.",
"author": { "author": {

2
build/DAEMON_URL
View file

@ -1 +1 @@
https://github.com/lbryio/lbry/releases/download/v0.10.1rc2/lbrynet-daemon-v0.10.1rc2-OSNAME.zip https://github.com/lbryio/lbry/releases/download/v0.10.3rc1/lbrynet-daemon-v0.10.3rc1-OSNAME.zip

6
ui/js/lbry.js
View file

@ -95,7 +95,7 @@ let lbry = {
}; };
lbry.call = function (method, params, callback, errorCallback, connectFailedCallback) { lbry.call = function (method, params, callback, errorCallback, connectFailedCallback) {
jsonrpc.call(lbry.daemonConnectionString, method, [params], callback, errorCallback, connectFailedCallback); jsonrpc.call(lbry.daemonConnectionString, method, params, callback, errorCallback, connectFailedCallback);
} }
//core //core
@ -673,7 +673,7 @@ lbry.settings_get = function(params={}) {
// lbry.get = function(params={}) { // lbry.get = function(params={}) {
// return function(params={}) { // return function(params={}) {
// return new Promise((resolve, reject) => { // return new Promise((resolve, reject) => {
// jsonrpc.call(lbry.daemonConnectionString, "get", [params], resolve, reject, reject); // jsonrpc.call(lbry.daemonConnectionString, "get", params, resolve, reject, reject);
// }); // });
// }; // };
// } // }
@ -686,7 +686,7 @@ lbry = new Proxy(lbry, {
return function(params={}) { return function(params={}) {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
jsonrpc.call(lbry.daemonConnectionString, name, [params], resolve, reject, reject); jsonrpc.call(lbry.daemonConnectionString, name, params, resolve, reject, reject);
}); });
}; };
} }

4
ui/js/page/settings.js
View file

@ -23,7 +23,7 @@ var SettingsPage = React.createClass({
this.setDaemonSetting('run_on_startup', event.target.checked); this.setDaemonSetting('run_on_startup', event.target.checked);
}, },
onShareDataChange: function (event) { onShareDataChange: function (event) {
this.setDaemonSetting('share_usage_stats', event.target.checked); this.setDaemonSetting('share_usage_data', event.target.checked);
}, },
onDownloadDirChange: function(event) { onDownloadDirChange: function(event) {
this.setDaemonSetting('download_directory', event.target.value); this.setDaemonSetting('download_directory', event.target.value);
@ -188,7 +188,7 @@ var SettingsPage = React.createClass({
<div className="card__content"> <div className="card__content">
<FormRow type="checkbox" <FormRow type="checkbox"
onChange={this.onShareDataChange} onChange={this.onShareDataChange}
defaultChecked={this.state.daemonSettings.share_usage_stats} defaultChecked={this.state.daemonSettings.share_usage_data}
label="Help make LBRY better by contributing diagnostic data about my usage" /> label="Help make LBRY better by contributing diagnostic data about my usage" />
</div> </div>
</section> </section>

2
ui/package.json
View file

@ -1,6 +1,6 @@
{ {
"name": "lbry-web-ui", "name": "lbry-web-ui",
"version": "0.10.0rc8", "version": "0.10.0rc9",
"description": "LBRY UI", "description": "LBRY UI",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1", "test": "echo \"Error: no test specified\" && exit 1",