refactor(Directives): use arrow notation, remove some return statements

blockchain · Dec 14, 2015 · d4227c0 · d4227c0
1 parent 1de0f23
commit d4227c0
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 23 deletions.
diff --git a/assets/js/directives/activity-feed.directive.js b/assets/js/directives/activity-feed.directive.js
@@ -23,14 +23,14 @@ function activityFeed($http, Wallet, Activity) {
       scope.activities = activities;
     });
 
-    scope.$watch('status.didLoadTransactions', function (didLoad) {
+    scope.$watch('status.didLoadTransactions', (didLoad) => {
       if (didLoad) {
         Activity.updateTxActivities();
         scope.loading = false;
       }
     });
 
-    scope.$watch('status.didLoadSettings', function (didLoad) {
+    scope.$watch('status.didLoadSettings', (didLoad) => {
       if (didLoad) Activity.updateLogActivities();
     });
   }

diff --git a/assets/js/directives/bc-async-input.directive.js b/assets/js/directives/bc-async-input.directive.js
@@ -1,4 +1,3 @@
-
 angular
   .module('walletApp')
   .directive('bcAsyncInput', bcAsyncInput);
@@ -52,56 +51,55 @@ function bcAsyncInput($timeout, Wallet) {
       newValue: scope.ngModel
     };
 
-    scope.edit = function () {
+    scope.edit = () => {
       // finds and focuses on the text input field
       // a brief timeout is necessary before trying to focus
-      $timeout((function () {
+      $timeout((() => {
         elem.find('input')[0].focus();
       }), 50);
-      return scope.status.edit = 1;
+      scope.status.edit = 1;
     };
 
-    scope.focus = function () {
+    scope.focus = () => {
       scope.status.edit = 1;
     };
 
-    scope.validate = function () {
-      return scope.validator ? scope.validator(scope.form.newValue) : true;
-    };
+    scope.validate = () =>
+      scope.validator ? scope.validator(scope.form.newValue) : true;
 
-    scope.save = function () {
+    scope.save = () => {
       scope.status.saving = true;
 
-      let success = function () {
+      let success = () => {
         scope.ngModel = scope.form.newValue;
         if (!attrs.custom) scope.bcAsyncForm.$setPristine();
 
         // Fixes issue: hit enter after changing PBKDF2 iterations
         // when 2nd password is enabled
-        scope.$evalAsync(function () {
+        scope.$evalAsync(() => {
           scope.status.saving = false;
           if (!attrs.editing) scope.status.edit = false;
         });
         scope.$root.$safeApply(scope);
       };
 
-      let error = function () {
+      let error = () => {
         scope.status.saving = false;
         scope.$root.$safeApply(scope);
       };
 
       scope.onSave(scope.form.newValue, success, error);
     };
 
-    scope.cancel = function () {
+    scope.cancel = () => {
       if (!attrs.editing) scope.status.edit = false;
       scope.bcAsyncForm.input.$rollbackViewValue();
       scope.form.newValue = scope.ngModel;
       scope.bcAsyncForm.$setPristine();
       scope.onCancel && scope.onCancel();
     };
 
-    transclude(scope, function (clone, scope) {
+    transclude(scope, (clone, scope) => {
       if (attrs.custom) elem.empty().append(clone);
     });
   }

diff --git a/assets/js/directives/configure-mobile-number.directive.js b/assets/js/directives/configure-mobile-number.directive.js
@@ -29,9 +29,8 @@ function configureMobileNumber(Wallet) {
 
     scope.fields.newMobile = Wallet.user.internationalMobileNumber;
 
-    scope.numberChanged = () => {
-      return scope.fields.newMobile !== Wallet.user.internationalMobileNumber;
-    };
+    scope.numberChanged = () =>
+      scope.fields.newMobile !== Wallet.user.internationalMobileNumber;
 
     scope.cancel = () => {
       scope.fields.newMobile = Wallet.user.internationalMobileNumber;

diff --git a/assets/js/directives/did-you-know.directive.js b/assets/js/directives/did-you-know.directive.js
@@ -15,9 +15,9 @@ function didYouKnow(DidYouKnow) {
   return directive;
 
   function link(scope, elem, attrs) {
-    scope.getRandInRange = (min, max) => {
-      return Math.floor(Math.random() * (max - min + 1) + min);
-    };
+    scope.getRandInRange = (min, max) =>
+      Math.floor(Math.random() * (max - min + 1) + min);
+
     let randDYKIndex = scope.getRandInRange(0, DidYouKnow.dyks.length - 1);
     scope.dyk = DidYouKnow.dyks[randDYKIndex];
   }

diff --git a/assets/js/directives/fiat-or-btc.directive.js b/assets/js/directives/fiat-or-btc.directive.js
@@ -22,7 +22,10 @@ function fiatOrBtc(Wallet, currency) {
     scope.currency = scope.settings.displayCurrency;
     scope.isBitCurrency = currency.isBitCurrency;
 
-    scope.updateDisplay = () => scope.currency = Wallet.settings.displayCurrency;
+    scope.updateDisplay = () => {
+      scope.currency = Wallet.settings.displayCurrency;
+    }
+
     scope.$watch('settings.displayCurrency', scope.updateDisplay);
   }
 }