diff --git a/dist.zip b/dist.zip
index cbbfdedeb..adb031ad1 100644
Binary files a/dist.zip and b/dist.zip differ
diff --git a/dist/index.html b/dist/index.html
index 9dfc19fd1..4bfac2bd2 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -26,6 +26,10 @@
+
+
+
+
diff --git a/js/.DS_Store b/js/.DS_Store
new file mode 100644
index 000000000..7b0ba57c7
Binary files /dev/null and b/js/.DS_Store differ
diff --git a/js/app.js b/js/app.js
index 309846633..ac6d67509 100644
--- a/js/app.js
+++ b/js/app.js
@@ -5,16 +5,42 @@ var appStyles = {
};
var App = React.createClass({
getInitialState: function() {
- return {
- viewingPage: window.location.search === '?settings' ? 'settings' : 'home'
+ // For now, routes are in format ?page or ?page=args
+ var match, param, val;
+ [match, param, val] = window.location.search.match(/\??([^=]*)(?:=(.*))?/);
+
+ if (['settings', 'help', 'start', 'watch', 'report'].indexOf(param) != -1) {
+ var viewingPage = param;
+ } else {
+ var viewingPage = 'home';
}
+
+ return {
+ viewingPage: viewingPage,
+ pageArgs: val,
+ };
},
componentWillMount: function() {
lbry.checkNewVersionAvailable(function(isAvailable) {
if (isAvailable) {
- alert("The version of LBRY you're using is not up to date.\n\n" +
- "You'll now be taken to lbry.io, where you can download the latest version.");
- window.location = "http://www.lbry.io/" + (navigator.userAgent.indexOf('Mac OS X') != -1 ? 'osx' : 'linux');
+ var message = "The version of LBRY you're using is not up to date.\n\n" +
+ "You'll now be taken to lbry.io, where you can download the latest version.";
+
+ lbry.getVersionInfo(function(versionInfo) {
+ var maj, min, patch;
+ [maj, min, patch] = versionInfo.lbrynet_version.split('.');
+
+ if (versionInfo.os_system == 'Darwin' && maj == 0 && min <= 2 && patch <= 2) {
+ // On OS X with version <= 0.2.2, we need to notify user to close manually close LBRY
+ message += "\n\nBefore installing the new version, make sure to exit LBRY, if you started the app " +
+ "click that LBRY icon in your status bar and choose \"Quit.\"";
+ } else {
+ lbry.stop();
+ }
+
+ alert(message);
+ window.location = "http://www.lbry.io/" + (versionInfo.os_system == 'Darwin' ? 'osx' : 'linux');
+ });
}
});
},
@@ -30,6 +56,14 @@ var App = React.createClass({
var content =