fix setting a custom icon on credential creation

2 files changed, 5 insertions, 9 deletions

diff --git a/js/app/directives/iconpicker.js b/js/app/directives/iconpicker.js
index 2cc60594..210dfacb 100644
--- a/js/app/directives/iconpicker.js
+++ b/js/app/directives/iconpicker.js
@@ -129,7 +129,9 @@
             };
 
             scope.useIcon = function() {
-
+	            if(!scope.credential.icon){
+		            scope.credential.icon = {};
+	            }
                 if(scope.customIcon){
                     var data = scope.customIcon.data;
                     scope.credential.icon.type = data.substring(data.lastIndexOf(":")+1,data.lastIndexOf(";"));
@@ -138,9 +140,6 @@
 					$http.get(scope.selectedIcon.url).then(function(result) {
 						var base64Data = window.btoa(result.data);
 						var mimeType = 'svg+xml';
-						if(!scope.credential.icon){
-							scope.credential.icon = {};
-						}
 						scope.credential.icon.type = mimeType;
 						scope.credential.icon.content = base64Data;
 					});
diff --git a/js/app/services/credentialservice.js b/js/app/services/credentialservice.js
index 53fa67c0..e8bc2a41 100644
--- a/js/app/services/credentialservice.js
+++ b/js/app/services/credentialservice.js
@@ -41,10 +41,7 @@
 				'changed': null,
 				'tags': [],
 				'email': null,
-				'icon':{
-					'type': false,
-					'content': ''
-				},
+				'icon': null,
 				'username': null,
 				'password': null,
 				'url': null,
@@ -364,4 +361,4 @@
 				}
 			};
 		}]);
-}());
\ No newline at end of file
+}());