From 4ed0c7b85c6c5768c3eaf4524fe603e1bc2b1a74 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 29 Jan 2016 15:56:36 -0300 Subject: [PATCH] refactor scroll method --- src/js/controllers/create.js | 7 ++++--- src/js/controllers/walletHome.js | 8 +++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/js/controllers/create.js b/src/js/controllers/create.js index 48a3c815a..372f0a53c 100644 --- a/src/js/controllers/create.js +++ b/src/js/controllers/create.js @@ -164,7 +164,7 @@ angular.module('copayApp.controllers').controller('createController', if (err) { $log.warn(err); self.error = err; - scrollUp(); + scrollUp('notification'); $timeout(function() { $rootScope.$apply(); }); @@ -175,8 +175,9 @@ angular.module('copayApp.controllers').controller('createController', }, 100); } - function scrollUp(){ - $location.hash('notification'); + function scrollUp(location){ + if(!location) return; + $location.hash(location); $anchorScroll(); }; diff --git a/src/js/controllers/walletHome.js b/src/js/controllers/walletHome.js index 49ae1d1d8..4a30c98c2 100644 --- a/src/js/controllers/walletHome.js +++ b/src/js/controllers/walletHome.js @@ -97,8 +97,9 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi $rootScope.$digest(); }); - this.scrollUp = function(){ - $location.hash('notification'); + this.scrollUp = function(location){ + if(!location) return; + $location.hash(location); $anchorScroll(); }; @@ -670,6 +671,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi this.hideAmount = true; } } + this.scrollUp('comment'); $timeout(function() { $rootScope.$digest(); }, 1); @@ -744,7 +746,7 @@ angular.module('copayApp.controllers').controller('walletHomeController', functi fc.credentials.m > 1 ? gettextCatalog.getString('Could not create payment proposal') : gettextCatalog.getString('Could not send payment'); this.error = bwsError.msg(err, prefix); - this.scrollUp(); + this.scrollUp('notification'); $timeout(function() { $scope.$digest(); }, 1);