From 089b0e13d789309556dafbf0b0933fd2e1299432 Mon Sep 17 00:00:00 2001
From: brantje <brantje@gmail.com>
Date: Fri, 30 Sep 2016 21:51:38 +0200
Subject: [PATCH] Replace all scope.apply with digest

---
 js/app/app.js                         | 2 ++
 js/app/controllers/edit_credential.js | 6 +++---
 js/app/controllers/import.js          | 4 ++--
 js/app/controllers/share_settings.js  | 2 +-
 js/app/controllers/vault.js           | 4 ++--
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/js/app/app.js b/js/app/app.js
index d22830de..bd9ef8b6 100644
--- a/js/app/app.js
+++ b/js/app/app.js
@@ -81,11 +81,13 @@ jQuery(document).ready(function () {
 	jQuery(document).on('click', '.undoDelete', function () {
 		var credential = findItemByID($(this).attr('data-item-id'));
 		angular.element('#app-content-wrapper').scope().recoverCredential(credential);
+		//Outside anglular we need $apply
 		angular.element('#app-content-wrapper').scope().$apply();
 	});
 	jQuery(document).on('click', '.undoRestore', function () {
 		var credential = findItemByID($(this).attr('data-item-id'));
 		angular.element('#app-content-wrapper').scope().deleteCredential(credential);
+		//Outside anglular we need $apply
 		angular.element('#app-content-wrapper').scope().$apply();
 	});
 	var adjustControlsWidth = function(r) {
diff --git a/js/app/controllers/edit_credential.js b/js/app/controllers/edit_credential.js
index 21dfc8d5..d6b409ff 100644
--- a/js/app/controllers/edit_credential.js
+++ b/js/app/controllers/edit_credential.js
@@ -169,7 +169,7 @@ angular.module('passmanApp')
 				});
 
 
-				$scope.$apply()
+				$scope.$digest()
 			};
 
 			$scope.fileLoadError = function (error, file) {
@@ -181,7 +181,7 @@ angular.module('passmanApp')
 			$scope.fileSelectProgress = function (progress) {
 				if (progress) {
 					$scope.fileprogress = progress;
-					$scope.$apply()
+					$scope.$digest()
 
 				}
 			};
@@ -208,7 +208,7 @@ angular.module('passmanApp')
 				qrInfo[parsedQR[3]] = parsedQR[4];
 				qrInfo[parsedQR[5]] = parsedQR[6];
 				$scope.storedCredential.otp = qrInfo;
-				$scope.$apply()
+				$scope.$digest()
 			};
 
 			$scope.saveCredential = function () {
diff --git a/js/app/controllers/import.js b/js/app/controllers/import.js
index 91eed59d..26ce9cc0 100644
--- a/js/app/controllers/import.js
+++ b/js/app/controllers/import.js
@@ -40,7 +40,7 @@ angular.module('passmanApp')
 			file_data = file.data.split(',');
 			file_data = decodeURIComponent(escape(window.atob( file_data[1] ))); //window.atob();
 			_log('File read successfully!')
-			$scope.$apply();
+			$scope.$digest();
 		};
 
 		$scope.fileLoadError = function (file) {
@@ -121,7 +121,7 @@ angular.module('passmanApp')
 					}
 				}).progress(function(progress){
 					$scope.file_read_progress = progress;
-					$scope.$apply();
+					$scope.$digest();
 				});
 			}
 		}
diff --git a/js/app/controllers/share_settings.js b/js/app/controllers/share_settings.js
index 2d55a69d..3be5ba36 100644
--- a/js/app/controllers/share_settings.js
+++ b/js/app/controllers/share_settings.js
@@ -16,7 +16,7 @@ angular.module('passmanApp')
 
             ShareService.generateRSAKeys(length).progress(function(progress){
                 $scope.progress = progress > 0 ? 2:1;
-                $scope.$apply();
+                $scope.$digest();
             }).then(function(kp){
                 console.log('stuff done');
                 $scope.generating = false;
diff --git a/js/app/controllers/vault.js b/js/app/controllers/vault.js
index 2f64271c..301741b0 100644
--- a/js/app/controllers/vault.js
+++ b/js/app/controllers/vault.js
@@ -75,13 +75,13 @@ angular.module('passmanApp')
 			ShareService.generateRSAKeys(key_size).progress(function (progress) {
 				var p = progress > 0 ? 2 : 1;
 				$scope.creating_keys = 'Generating sharing keys (' + p + ' / 2)';
-				$scope.$apply();
+				$scope.$digest();
 			}).then(function (kp) {
 				var pem = ShareService.rsaKeyPairToPEM(kp);
 				$scope.creating_keys = false;
 				$scope.sharing_keys.private_sharing_key = pem.privateKey;
 				$scope.sharing_keys.public_sharing_key = pem.publicKey;
-				$scope.$apply();
+				$scope.$digest();
 			});
 
 		};