Skip to content
This repository has been archived by the owner on Oct 30, 2018. It is now read-only.

Commit

Permalink
Merge pull request #306 from aleitner/master
Browse files Browse the repository at this point in the history
Removed ability to click outside modal for terms and when counting shards
  • Loading branch information
bookchin authored Jul 25, 2016
2 parents 5062c77 + d10165f commit 2f66236
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 5 deletions.
7 changes: 4 additions & 3 deletions app/client.js
Original file line number Diff line number Diff line change
Expand Up @@ -253,11 +253,12 @@ var main = new Vue({
var contracts = localStorage.getItem(contractCountKey);
if (contracts === null || Number(contracts) === 0 ) {
self.readingshards = true;
$('#loading').modal('show');
$('#loading').modal({backdrop: 'static', keyboard: false, show: true});

Monitor.getContractsDetails(farmer, function(err, stats) {
localStorage.setItem(
contractCountKey, stats.contracts.total.toString()
contractCountKey,
(stats.contracts.total + tab.contracts.total).toString()
);
tab.contracts.total += stats.contracts.total;
$('#loading').modal('hide');
Expand Down Expand Up @@ -543,7 +544,7 @@ var main = new Vue({
//If terms not acceped before
var terms = JSON.parse(localStorage.getItem('terms'));
if (terms === null || terms.accepted !== true ) {
$('#terms').modal('show');
$('#terms').modal({backdrop: 'static', keyboard: false, show: true});
}

if (!this.userdata.tabs.length) {
Expand Down
2 changes: 1 addition & 1 deletion app/lib/fslogger.js
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ FsLogger.prototype._doesFileExist = function(log) {
return !(err && err.code === 'ENOENT');
}

if (!log.includes(this._builddate)) {
if (log.indexOf(this._builddate()) === -1) {
return false;
}

Expand Down
2 changes: 1 addition & 1 deletion app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"productName": "Storj Share",
"identifier": "com.storj.farmer",
"description": "Earn money by sharing your extra hard drive space",
"version": "1.0.2",
"version": "1.0.3",
"author": "Storj <[email protected]>",
"main": "main.js",
"config": {
Expand Down

0 comments on commit 2f66236

Please sign in to comment.