add eslint to precommit hook; put repo into compliance

bignimbus · Nov 25, 2015 · 3536a46 · 3536a46
1 parent 3f53f21
commit 3536a46
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 30 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -107,5 +107,5 @@ module.exports = function (grunt) {
     grunt.loadNpmTasks('grunt-git');
     grunt.registerTask('build', ['babel', 'requirejs:main', 'requirejs:lite', 'uglify']);
     grunt.registerTask('test', ['build', 'jasmine']);
-    grunt.registerTask('precommit', [/*'eslint', */ 'test', 'gitadd']);
+    grunt.registerTask('precommit', ['eslint', 'test', 'gitadd']);
 };
diff --git a/dist/cash-lite.js b/dist/cash-lite.js
@@ -29,7 +29,7 @@ polyfills = function (exports) {
         return to;
       }
     });
-  }
+  }  /* eslint-enable */
   return exports;
 }(polyfills);
 currencies = function (exports) {
@@ -528,7 +528,7 @@ cashex = function (exports) {
       inferCurrency: {
         value: function inferCurrency() {
           var _this = this;
-          var index = undefined, match = undefined, regex = undefined, found = undefined, candidate = undefined, currentCandidate = undefined, currencies = [].concat(this.register.getPrefixes(), this.register.getSuffixes(), this.register.specialMagnitudes);
+          var index = undefined, match = undefined, regex = undefined, found = undefined, currentCandidate = undefined, currencies = [].concat(this.register.getPrefixes(), this.register.getSuffixes(), this.register.specialMagnitudes);
           currencies = '(?:' + currencies.join('|') + ')';
           regex = new RegExp(currencies, 'i');
           match = this.raw.match(regex)[0];

diff --git a/dist/cash.js b/dist/cash.js
@@ -29,7 +29,7 @@ polyfills = function (exports) {
         return to;
       }
     });
-  }
+  }  /* eslint-enable */
   return exports;
 }(polyfills);
 currencies = function (exports) {
@@ -528,7 +528,7 @@ cashex = function (exports) {
       inferCurrency: {
         value: function inferCurrency() {
           var _this = this;
-          var index = undefined, match = undefined, regex = undefined, found = undefined, candidate = undefined, currentCandidate = undefined, currencies = [].concat(this.register.getPrefixes(), this.register.getSuffixes(), this.register.specialMagnitudes);
+          var index = undefined, match = undefined, regex = undefined, found = undefined, currentCandidate = undefined, currencies = [].concat(this.register.getPrefixes(), this.register.getSuffixes(), this.register.specialMagnitudes);
           currencies = '(?:' + currencies.join('|') + ')';
           regex = new RegExp(currencies, 'i');
           match = this.raw.match(regex)[0];
@@ -833,7 +833,7 @@ cash_dom = function (exports, _cashMain) {
     }, {
       recalculate: {
         value: function recalculate(source, targets) {
-          var obj = undefined, rate = undefined, current = undefined, oldRate = undefined, multiplier = undefined, cache = this.register.metadata;
+          var cache = this.register.metadata;
           for (var id in cache) {
             if (targets && targets.indexOf(cache[id].currency) === -1) {
               continue;

diff --git a/es5-amd/cash-dom.js b/es5-amd/cash-dom.js
@@ -82,12 +82,7 @@ define(["exports", "module", "cash-main"], function (exports, module, _cashMain)
         }, {
             recalculate: {
                 value: function recalculate(source, targets) {
-                    var obj = undefined,
-                        rate = undefined,
-                        current = undefined,
-                        oldRate = undefined,
-                        multiplier = undefined,
-                        cache = this.register.metadata;
+                    var cache = this.register.metadata;
 
                     for (var id in cache) {
                         if (targets && targets.indexOf(cache[id].currency) === -1) {

diff --git a/es5-amd/cashex.js b/es5-amd/cashex.js
@@ -88,7 +88,6 @@ define(["exports", "module"], function (exports, module) {
                         match = undefined,
                         regex = undefined,
                         found = undefined,
-                        candidate = undefined,
                         currentCandidate = undefined,
                         currencies = [].concat(this.register.getPrefixes(), this.register.getSuffixes(), this.register.specialMagnitudes);
                     currencies = "(?:" + currencies.join("|") + ")";

diff --git a/es5-amd/polyfills.js b/es5-amd/polyfills.js
@@ -1,5 +1,7 @@
 define(["exports"], function (exports) {
   // source: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
+
+  /* eslint-disable */
   "use strict";
 
   if (!Object.assign) {
@@ -33,4 +35,6 @@ define(["exports"], function (exports) {
       }
     });
   }
+
+  /* eslint-enable */
 });
diff --git a/src/cash-dom.js b/src/cash-dom.js
@@ -37,9 +37,9 @@ export default class CashDom extends Cash {
                 throw new Error(`${currency} not supported.`);
             }
         });
-        this.for = (targets, source) => {
+        this.for = ((targets, source) => {
             this.constructor.recalculate.call(this, source, targets);
-        }.bind(this, currencies);
+        }).bind(this, currencies);
         return this;
     }
 
@@ -49,12 +49,7 @@ export default class CashDom extends Cash {
     }
 
     static recalculate (source, targets) {
-        let obj,
-            rate,
-            current,
-            oldRate,
-            multiplier,
-            cache = this.register.metadata;
+        let cache = this.register.metadata;
 
         for (let id in cache) {
             if (targets && targets.indexOf(cache[id].currency) === -1) {

diff --git a/src/cashex.js b/src/cashex.js
@@ -73,7 +73,6 @@ export default class CashEx {
             match,
             regex,
             found,
-            candidate,
             currentCandidate,
             currencies = [].concat(this.register.getPrefixes(), this.register.getSuffixes(), this.register.specialMagnitudes);
         currencies = `(?:${currencies.join('|')})`;

diff --git a/src/polyfills.js b/src/polyfills.js
@@ -1,4 +1,6 @@
 // source: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object/assign
+
+/* eslint-disable */
 if (!Object.assign) {
   Object.defineProperty(Object, 'assign', {
     enumerable: false,
@@ -30,3 +32,5 @@ if (!Object.assign) {
     }
   });
 }
+
+/* eslint-enable */
diff --git a/tests/currencies.spec.js b/tests/currencies.spec.js
@@ -34,8 +34,6 @@
                 dollarSign = ['$'],
                 usd = ['USD'],
                 bucks = ['bucks'],
-                one = ['one'],
-                a = ['a'],
                 dollars = ['dollars'],
                 nums = ['12345'],
                 decimals = ['.50'];
@@ -307,4 +305,4 @@
             expect(cashCount(processed)).toBe(8);
         });
     });
-})();
+})();
diff --git a/tests/main.spec.js b/tests/main.spec.js
@@ -53,11 +53,6 @@
     });
 
     describe('tag', function () {
-        function cashCount (str) {
-            var match = str.match(/\/span/g);
-            return match ? match.length : 0;
-        }
-
         beforeEach(function () {
             cash = new Cash();
         });