Merge pull request #121 from lbryio/master

Sync development with fixes in Master

js/app.js

@@ -217,7 +217,7 @@ var App = React.createClass({
           </Modal>
           <Modal isOpen={this.state.modal == 'upgrade'} type="confirm" confirmButtonLabel="Upgrade" abortButtonLabel="Skip"
                  onConfirmed={this.handleUpgradeClicked} onAborted={this.handleSkipClicked} >
-            <p>The version of LBRY you're using is not up to date. Choose "Upgrade" to get the latest version.</p>
+            <p>Your version of LBRY is out of date and may be unreliable or insecure.</p>
             {this.state.isOldOSX
               ? <p>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."</p>
               : null}

js/component/common.js

@@ -30,8 +30,6 @@ export let 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',
     });

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,

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",

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/',