diff --git a/app/client.js b/app/client.js index c77b769..51a16d5 100644 --- a/app/client.js +++ b/app/client.js @@ -119,7 +119,6 @@ var main = new Vue({ data: { userdata: userdata._parsed, current: 0, - transitioning: false, freespace: {size: 0, unit: 'B'}, balance: { sjcx: 0, @@ -156,8 +155,6 @@ var main = new Vue({ self.userdata.tabs[self.current].active = false; } - self.transitioning = false; - if (index === -1) { this.current = 0; @@ -225,10 +222,9 @@ var main = new Vue({ return window.alert(err.message); } - this.transitioning = true; + tab.transitioning = true; tab.telemetry = { enabled: appSettings.reportTelemetry }; - var storageAdapter = storj.EmbeddedStorageAdapter(tab.storage.path); var logger = new Logger(Number(appSettings.logLevel)); var reporter = new TelemetryReporter( @@ -262,7 +258,7 @@ var main = new Vue({ if (err) { logger.error(err.message); - self.transitioning = false; + tab.transitioning = false; return window.alert(err.message); } @@ -308,12 +304,12 @@ var main = new Vue({ userdata.saveConfig(function(err) { if (err) { - self.transitioning = false; + tab.transitioning = false; return window.alert(err.message); } farmer.join(function(err) { - self.transitioning = false; + tab.transitioning = false; if (self.userdata.appSettings.reportTelemetry) { self.startReportingTelemetry(tab); @@ -377,10 +373,10 @@ var main = new Vue({ } tab.wasRunning = false; - self.transitioning = true; + tab.transitioning = true; tab.farmer().leave(function() { - self.transitioning = false; + tab.transitioning = false; tab.farmer = null; }); } diff --git a/app/lib/tab.js b/app/lib/tab.js index 3c8e64c..a43ce60 100644 --- a/app/lib/tab.js +++ b/app/lib/tab.js @@ -69,6 +69,7 @@ function Tab(options) { endPort: options.tunnels.endPort || 0 }; + this.transitioning = false; this.id = options.id || this.createID(); this.shortId = this.id.substr(0, 6); this.active = typeof options.active === 'undefined' ? false : options.active; diff --git a/app/package.json b/app/package.json index e504351..3f98921 100644 --- a/app/package.json +++ b/app/package.json @@ -29,7 +29,7 @@ "request": "^2.63.0", "semver": "^5.1.0", "storj-lib": "^4.0.0", - "storj-telemetry-reporter": "Storj/telemetry-reporter", + "storj-telemetry-reporter": "^2.0.0", "untildify": "^2.1.0", "vue": "^1.0.10", "winreg": "0.0.15" diff --git a/app/storjshare.html b/app/storjshare.html index d44c451..fc924e9 100644 --- a/app/storjshare.html +++ b/app/storjshare.html @@ -183,13 +183,13 @@