From b80420465a6b98a678f9ae763066d342d5b9cb11 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 5 Dec 2016 14:51:36 -0500 Subject: [PATCH 1/4] Tweak upgrade message Avoid text like "Click 'Upgrade' to XXX" that tells the user how to do something that the UI already invites them to do. --- js/app.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/app.js b/js/app.js index f4fc8adad..35ce4b8fe 100644 --- a/js/app.js +++ b/js/app.js @@ -198,7 +198,7 @@ var App = React.createClass({ -

The version of LBRY you're using is not up to date. Choose "Upgrade" to get the latest version.

+

Your version of LBRY is out of date and may be unreliable or insecure.

{this.state.isOldOSX ?

Before installing the new version, make sure to exit LBRY. If you started the app, click the LBRY icon in your status bar and choose "Quit."

: null} From 0458d58a0897af50a33be546e0404d991a7487a8 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Wed, 7 Dec 2016 13:13:24 -0500 Subject: [PATCH 2/4] Remove a couple of stray console.log() calls --- js/component/common.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/js/component/common.js b/js/component/common.js index 41a10c97b..4d2bffa48 100644 --- a/js/component/common.js +++ b/js/component/common.js @@ -25,8 +25,6 @@ var TruncatedText = React.createClass({ } }, componentDidMount: function() { - console.log('span is', this.refs.span); - console.log('type of lines is', typeof this.props.lines) $clamp(this.refs.span, { clamp: this.props.lines || this.props.height || 'auto', }); From 3fd7cd62af68c7a6268ed3fda2a3b83fae3d6908 Mon Sep 17 00:00:00 2001 From: Alex Liebowitz Date: Sat, 31 Dec 2016 22:56:03 -0500 Subject: [PATCH 3/4] Add Babel Polyfill Fixes some IE bugs, plus gives us a few more ES2015 features. --- package.json | 1 + webpack.config.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 14b1eca0d..40ef3d434 100644 --- a/package.json +++ b/package.json @@ -36,6 +36,7 @@ "babel-plugin-react-require": "^3.0.0", "babel-preset-es2015": "^6.18.0", "babel-preset-react": "^6.16.0", + "babel-polyfill": "^6.20.0", "eslint": "^3.10.2", "eslint-config-airbnb": "^13.0.0", "eslint-loader": "^1.6.1", diff --git a/webpack.config.js b/webpack.config.js index 2e479d119..34b4bdffc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -6,7 +6,7 @@ const PATHS = { }; module.exports = { - entry: "./js/main.js", + entry: ['babel-polyfill', './js/main.js'], output: { path: path.join(PATHS.dist, 'js'), publicPath: '/js/', From e23cce81dc19387cccade465e45206d4145df7f3 Mon Sep 17 00:00:00 2001 From: Job Evers Date: Mon, 2 Jan 2017 20:21:23 -0600 Subject: [PATCH 4/4] fix LoadScreen import on watch page --- js/page/watch.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/js/page/watch.js b/js/page/watch.js index 4351c2132..2bc3580e7 100644 --- a/js/page/watch.js +++ b/js/page/watch.js @@ -1,7 +1,9 @@ import React from 'react'; import lbry from '../lbry.js'; +import LoadScreen from '../component/load_screen.js' import MediaElementPlayer from 'mediaelement'; + var WatchPage = React.createClass({ propTypes: { name: React.PropTypes.string,