summaryrefslogtreecommitdiffstats
path: root/js
diff options
context:
space:
mode:
authorHendrik Leppelsack <hendrik@leppelsack.de>2016-04-28 10:44:48 +0200
committerskjnldsv <fremulon@protonmail.com>2016-05-09 10:03:01 +0200
commit16f1fa2dfde93c4b56997ed2f5cc39d1a0f80673 (patch)
treeead655eff300adca44dbdba3a116c116679bf44b /js
parentfc005f2b2ac548473ad7ffcca58409d6c88f3f5c (diff)
add change avatar functionality
Diffstat (limited to 'js')
-rw-r--r--js/components/avatar/avatar_controller.js (renamed from js/components/avatarUpload/avatarUpload_controller.js)2
-rw-r--r--js/components/avatar/avatar_directive.js (renamed from js/components/avatarUpload/avatarUpload_directive.js)4
-rw-r--r--js/components/contactDetails/contactDetails_controller.js4
3 files changed, 3 insertions, 7 deletions
diff --git a/js/components/avatarUpload/avatarUpload_controller.js b/js/components/avatar/avatar_controller.js
index 724bc456..6adb9c58 100644
--- a/js/components/avatarUpload/avatarUpload_controller.js
+++ b/js/components/avatar/avatar_controller.js
@@ -1,5 +1,5 @@
angular.module('contactsApp')
-.controller('avataruploadCtrl', function(ContactService) {
+.controller('avatarCtrl', function(ContactService) {
var ctrl = this;
ctrl.import = ContactService.import.bind(ContactService);
diff --git a/js/components/avatarUpload/avatarUpload_directive.js b/js/components/avatar/avatar_directive.js
index 369dc9aa..7e5b56e9 100644
--- a/js/components/avatarUpload/avatarUpload_directive.js
+++ b/js/components/avatar/avatar_directive.js
@@ -1,5 +1,5 @@
angular.module('contactsApp')
-.directive('avatarupload', function(ContactService) {
+.directive('avatar', function(ContactService) {
return {
scope: {
contact: '=data'
@@ -25,6 +25,6 @@ angular.module('contactsApp')
}
});
},
- templateUrl: OC.linkTo('contacts', 'templates/avatarUpload.html')
+ templateUrl: OC.linkTo('contacts', 'templates/avatar.html')
};
});
diff --git a/js/components/contactDetails/contactDetails_controller.js b/js/components/contactDetails/contactDetails_controller.js
index 9889cfcb..a1898300 100644
--- a/js/components/contactDetails/contactDetails_controller.js
+++ b/js/components/contactDetails/contactDetails_controller.js
@@ -88,8 +88,4 @@ angular.module('contactsApp')
ctrl.changeAddressBook = function (addressBook) {
ContactService.moveContact(ctrl.contact, addressBook);
};
-
- ctrl.uploadAvatar = function() {
- console.log('hi');
- };
});