Skip to content
This repository has been archived by the owner on Apr 15, 2019. It is now read-only.

Commit

Permalink
Fix all other eslint errors #45
Browse files Browse the repository at this point in the history
  • Loading branch information
Vit Stanislav authored and Vit Stanislav committed Mar 6, 2017
1 parent 0b627cc commit d9b206b
Show file tree
Hide file tree
Showing 10 changed files with 59 additions and 49 deletions.
18 changes: 17 additions & 1 deletion src/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,21 @@
"extends": "airbnb-base",
"plugins": [
"import"
]
],
"globals": {
"angular": true,
"app": true
},
"env": {
"browser": true,
"node": true
},
"rules": {
"new-cap": ["error", { "newIsCapExceptions": ["mnemonic"]}],
"global-require": "off",
"no-return-assign": "off",
"no-plusplus": "off",
"no-loop-func": "off",
"func-names": "off"
}
}
53 changes: 24 additions & 29 deletions src/app/components/login/login.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ app.component('login', {
reset() {
this.input_passphrase = '';
this.progress = 0;
this.seed = this.emptyBytes().map(v => '00');
this.seed = this.emptyBytes().map(() => '00');
}

stop() {
Expand All @@ -48,11 +48,11 @@ app.component('login', {
}

isValid(value) {
value = this.fix(value);
const fixedValue = this.fix(value);

if (value === '') {
if (fixedValue === '') {
this.valid = 2;
} else if (value.split(' ').length < 12 || !mnemonic.isValid(value)) {
} else if (fixedValue.split(' ').length < 12 || !mnemonic.isValid(fixedValue)) {
this.valid = 0;
} else {
this.valid = 1;
Expand All @@ -67,30 +67,24 @@ app.component('login', {
let last = [0, 0];
let used = this.emptyBytes();

const turns = 10 + parseInt(Math.random() * 10);
const turns = 10 + parseInt(Math.random() * 10, 10);
const steps = 2;
const total = turns * used.length;
let count = 0;

this.listener = (ev) => {
const distance = Math.sqrt(Math.pow(ev.pageX - last[0], 2) + Math.pow(ev.pageY - last[1], 2));
const distance = Math.sqrt(((ev.pageX - last[0]) ** 2) + ((ev.pageY - last[1]) ** 2));

if (distance > 60 || ev.isTrigger) {
for (let p = 0; p < steps; p++) {
let pos;
const available = [];

for (const i in used) {
if (!used[i]) {
available.push(i);
}
}
const available = used.filter(u => u);

if (!available.length) {
used = used.map(v => 0);
pos = parseInt(Math.random() * used.length);
used = used.map(() => 0);
pos = parseInt(Math.random() * used.length, 10);
} else {
pos = available[parseInt(Math.random() * available.length)];
pos = available[parseInt(Math.random() * available.length, 10)];
}

count++;
Expand All @@ -103,10 +97,10 @@ app.component('login', {

const update = () => {
this.seed[pos] = this.lpad(crypto.randomBytes(1)[0].toString(16), '0', 2);
this.progress = parseInt(count / total * 100);
this.progress = parseInt((count / total) * 100, 10);
};

if (this.$scope.$root.$$phase != '$apply' && this.$scope.$root.$$phase != '$digest') {
if (this.$scope.$root.$$phase !== '$apply' && this.$scope.$root.$$phase !== '$digest') {
this.$scope.$apply(update);
} else {
update();
Expand Down Expand Up @@ -151,11 +145,11 @@ app.component('login', {
this.enter = true;

const words = this.passphrase.split(' ');
const missing_number = parseInt(Math.random() * words.length);
const missingNumber = parseInt(Math.random() * words.length, 10);

this.missing_word = words[missing_number];
this.pre = words.slice(0, missing_number).join(' ');
this.pos = words.slice(missing_number + 1).join(' ');
this.missing_word = words[missingNumber];
this.pre = words.slice(0, missingNumber).join(' ');
this.pos = words.slice(missingNumber + 1).join(' ');
}

ok() {
Expand All @@ -180,22 +174,23 @@ app.component('login', {
}
}

fix(v) {
static fix(v) {
return (v || '').replace(/ +/g, ' ').trim().toLowerCase();
}

lpad(str, pad, length) {
while (str.length < length) str = pad + str;
return str;
static lpad(str, pad, length) {
let result = str;
while (result.length < length) result = pad + str;
return result;
}

emptyBytes() {
static emptyBytes() {
return [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
}

mobileAndTabletcheck() {
static mobileAndTabletcheck() {
let check = false
;(function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0, 4))) check = true; }(navigator.userAgent || navigator.vendor || window.opera));
;(function (a) { if (/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino|android|ipad|playbook|silk/i.test(a) || /1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw-(n|u)|c55\/|capi|ccwa|cdm-|cell|chtm|cldc|cmd-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc-s|devi|dica|dmob|do(c|p)o|ds(12|-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(-|_)|g1 u|g560|gene|gf-5|g-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd(m|p|t)|hei|hi(pt|ta)|hp( i|ip)|hsc|ht(c(| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i(20|go|ma)|i230|iac( ||\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|[a-w])|libw|lynx|m1w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|mcr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|([1-8]|c))|phil|pire|pl(ay|uc)|pn2|po(ck|rt|se)|prox|psio|ptg|qaa|qc(07|12|21|32|60|[2-7]|i)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h|oo|p)|sdk\/|se(c(|0|1)|47|mc|nd|ri)|sgh|shar|sie(|m)|sk0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h|v|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl|tdg|tel(i|m)|tim|tmo|to(pl|sh)|ts(70|m|m3|m5)|tx9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas|your|zeto|zte/i.test(a.substr(0, 4))) check = true; }(navigator.userAgent || navigator.vendor || window.opera));
return check;
}
},
Expand Down
7 changes: 3 additions & 4 deletions src/app/components/main/main.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import lisk from 'lisk-js';

import './main.less';

import lisk from 'lisk-js';

const UPDATE_INTERVAL_BALANCE = 10000;

app.component('main', {
Expand Down Expand Up @@ -44,9 +43,9 @@ app.component('main', {
this.prelogged = false;
this.logged = true;
})
.catch((res) => {
.catch(() => {
if (attempts < 10) {
this.$timeout(() => this.login(++attempts), 1000);
this.$timeout(() => this.login(attempts + 1), 1000);
} else {
this.error.dialog({ text: 'No peer connection' });
this.logout();
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/send/send.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import './send.less';

const ADDRESS_VALID_RE = '^[0-9]{1,21}[L|l]$';
const AMOUNT_VALID_RE = '^[0-9]+(\.[0-9]{1,8})?$';
const AMOUNT_VALID_RE = '^[0-9]+(.[0-9]{1,8})?$';

app.component('send', {
template: require('./send.pug')(),
Expand Down Expand Up @@ -81,7 +81,7 @@ app.component('send', {
this.amount.raw,
)
.then(
res => this.success.dialog({ text: `${this.amount.value} sent to ${this.recipient.value}` })
() => this.success.dialog({ text: `${this.amount.value} sent to ${this.recipient.value}` })
.then(() => {
this.reset();
}),
Expand All @@ -101,7 +101,7 @@ app.component('send', {

app.directive('ignoreMouseWheel', () => ({
restrict: 'A',
link: (scope, element, attrs) => {
element.bind('mousewheel', event => element.blur());
link: (scope, element) => {
element.bind('mousewheel', () => element.blur());
},
}));
5 changes: 2 additions & 3 deletions src/app/components/timestamp/timestamp.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import moment from 'moment';

import './timestamp.less';

import moment from 'moment';

const UPDATE_INTERVAL_UPDATE = 15000;

app.component('timestamp', {
Expand Down Expand Up @@ -31,7 +30,7 @@ app.component('timestamp', {
this.timeout = this.$timeout(this.update.bind(this), UPDATE_INTERVAL_UPDATE);
}

fix(value) {
static fix(value) {
return new Date((((Date.UTC(2016, 4, 24, 17, 0, 0, 0) / 1000) + value) * 1000));
}
},
Expand Down
2 changes: 1 addition & 1 deletion src/app/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import 'angular-aria';
import 'angular-messages';
import 'angular-material';
import 'angular-material/angular-material.css';
import 'angular-material-data-table/dist/md-data-table.js';
import 'angular-material-data-table/dist/md-data-table';
import 'angular-material-data-table/dist/md-data-table.css';

import './index.less';
Expand Down
4 changes: 2 additions & 2 deletions src/app/services/lsk.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ import numeral from 'numeral';

app.factory('lsk', () => ({
normalize(value) {
return numeral(parseInt(value) || 0).divide(Math.pow(10, 8)).format('0.0[0000000]');
return numeral(parseInt(value, 10) || 0).divide(10 ** 8).format('0.0[0000000]');
},
from(value) {
return parseInt(value * Math.pow(10, 8));
return parseInt(value * (10 ** 8), 10);
},
}));
4 changes: 2 additions & 2 deletions src/app/services/peers/peer.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ const TRANSACTION_HEADER_OS = 'nanowallet';
const TRANSACTION_HEADER_PORT = '8000';
const TRANSACTION_HEADER_VERSION = '0.5.0';

app.factory('$peer', ($http, $log, $q, $timeout) => class $peer {
app.factory('$peer', ($http, $log, $q) => class $peer {
constructor({ host, port = 8000, ssl = false }) {
this.host = host;
this.port = port;
Expand Down Expand Up @@ -80,7 +80,7 @@ app.factory('$peer', ($http, $log, $q, $timeout) => class $peer {
getAccount(address) {
return this.get(API_ACCOUNT, { address })
.then(res => res.data.account)
.catch(res => this.getBalance(address)
.catch(() => this.getBalance(address)
.then(balance => ({
address,
balance,
Expand Down
5 changes: 3 additions & 2 deletions src/app/services/peers/peers.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ app.factory('$peers', ($peer, $timeout, $cookies) => {

setActive() {
this.active = _.chain([])
.concat($cookies.get('peerStack') == 'testnet' ?
.concat($cookies.get('peerStack') === 'testnet' ?
this.stack.testnet : this.stack.official,
this.stack.public)
.sample()
Expand All @@ -53,7 +53,8 @@ app.factory('$peers', ($peer, $timeout, $cookies) => {
const next = () => this.timeout = $timeout(this.check.bind(this), UPDATE_INTERVAL_CHECK);

if (!this.active) {
return next();
next();
return;
}

this.active.status()
Expand Down
2 changes: 1 addition & 1 deletion src/app/util/animateOnChange/animateOnChange.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

app.directive('animateOnChange', ($animate, $timeout) => (scope, elem, attr) => {
scope.$watch(attr.animateOnChange, (nv, ov) => {
if (nv != ov) {
if (nv !== ov) {
$animate.addClass(elem, 'change').then(() => {
$timeout(() => $animate.removeClass(elem, 'change'));
});
Expand Down

0 comments on commit d9b206b

Please sign in to comment.