Merge pull request #3828 from MetaMask/lint-sys-fix

Lint system fixes

8 files changed, 6 insertions, 8 deletions

diff --git a/.eslintrc b/.eslintrc
index 028a6dfa3..8af71bf4e 100644
--- a/.eslintrc
+++ b/.eslintrc
@@ -42,6 +42,7 @@
   },
 
   "rules": {
+    "no-restricted-globals": ["error", "event"],
     "accessor-pairs": 2,
     "arrow-spacing": [2, { "before": true, "after": true }],
     "block-spacing": [2, "always"],
diff --git a/gulpfile.js b/gulpfile.js
index fd9ab6249..cd01a9d5f 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -207,7 +207,7 @@ gulp.task('dev:copy',
 
 // lint js
 
-const lintTargets = ['app/**/*.json', 'app/**/*.js', '!app/scripts/vendor/**/*.js', 'ui/**/*.js', 'mascara/src/*.js', 'mascara/server/*.js', '!node_modules/**', '!dist/firefox/**', '!docs/**', '!app/scripts/chromereload.js', '!mascara/test/jquery-3.1.0.min.js']
+const lintTargets = ['app/**/*.json', 'app/**/*.js', '!app/scripts/vendor/**/*.js', 'ui/**/*.js', 'old-ui/**/*.js', 'mascara/src/*.js', 'mascara/server/*.js', '!node_modules/**', '!dist/firefox/**', '!docs/**', '!app/scripts/chromereload.js', '!mascara/test/jquery-3.1.0.min.js']
 
 gulp.task('lint', function () {
   // Ignoring node_modules, dist/firefox, and docs folders:
diff --git a/old-ui/app/app.js b/old-ui/app/app.js
index e9ab185f3..37611987f 100644
--- a/old-ui/app/app.js
+++ b/old-ui/app/app.js
@@ -581,7 +581,6 @@ App.prototype.renderPrimary = function () {
 
     case 'qr':
       log.debug('rendering show qr screen')
-      console.log(`QrView`, QrView);
       return h('div', {
         style: {
           position: 'absolute',
diff --git a/old-ui/app/components/buy-button-subview.js b/old-ui/app/components/buy-button-subview.js
index 843627c33..56d173839 100644
--- a/old-ui/app/components/buy-button-subview.js
+++ b/old-ui/app/components/buy-button-subview.js
@@ -247,7 +247,6 @@ BuyButtonSubview.prototype.backButtonContext = function () {
   if (this.props.context === 'confTx') {
     this.props.dispatch(actions.showConfTxPage(false))
   } else {
-    console.log(`actions.goHome`, actions.goHome);
     this.props.dispatch(actions.goHome())
   }
 }
diff --git a/old-ui/app/components/qr-code.js b/old-ui/app/components/qr-code.js
index fa38dcd92..06b9aed9b 100644
--- a/old-ui/app/components/qr-code.js
+++ b/old-ui/app/components/qr-code.js
@@ -25,7 +25,6 @@ function QrCodeView () {
 QrCodeView.prototype.render = function () {
   const props = this.props
   const Qr = props.Qr
-  console.log(`QrCodeView Qr`, Qr);
   const address = `${isHexPrefixed(Qr.data) ? 'ethereum:' : ''}${Qr.data}`
   const qrImage = qrCode(4, 'M')
   qrImage.addData(address)
diff --git a/old-ui/app/components/range-slider.js b/old-ui/app/components/range-slider.js
index 823f5eb01..bae740a74 100644
--- a/old-ui/app/components/range-slider.js
+++ b/old-ui/app/components/range-slider.js
@@ -35,7 +35,7 @@ RangeSlider.prototype.render = function () {
         step: increment,
         style: range,
         value: state.value || defaultValue,
-        onChange: mirrorInput ? this.mirrorInputs.bind(this, event) : onInput,
+        onChange: mirrorInput ? this.mirrorInputs.bind(this) : onInput,
       }),
 
       // Mirrored input for range
@@ -47,7 +47,7 @@ RangeSlider.prototype.render = function () {
         value: state.value || defaultValue,
         step: increment,
         style: input,
-        onChange: this.mirrorInputs.bind(this, event),
+        onChange: this.mirrorInputs.bind(this),
       }) : null,
     ])
   )
diff --git a/old-ui/app/components/transaction-list-item.js b/old-ui/app/components/transaction-list-item.js
index f7d59005a..b9f82c668 100644
--- a/old-ui/app/components/transaction-list-item.js
+++ b/old-ui/app/components/transaction-list-item.js
@@ -30,7 +30,7 @@ function TransactionListItem () {
 
 TransactionListItem.prototype.showRetryButton = function () {
   const { transaction = {}, transactions } = this.props
-  const { status, submittedTime, txParams } = transaction
+  const { submittedTime, txParams } = transaction
 
   if (!txParams) {
     return false
diff --git a/old-ui/app/config.js b/old-ui/app/config.js
index 7da3694ac..508770bd4 100644
--- a/old-ui/app/config.js
+++ b/old-ui/app/config.js
@@ -42,7 +42,7 @@ ConfigScreen.prototype.render = function () {
       // subtitle and nav
       h('.section-title.flex-row.flex-center', [
         h('i.fa.fa-arrow-left.fa-lg.cursor-pointer', {
-          onClick: (event) => {
+          onClick: () => {
             state.dispatch(actions.goHome())
           },
         }),