nextcloud
/
contacts
mirror of https://github.com/nextcloud/contacts
0
0
Fork 0
Code Issues Releases Wiki Activity

fix delete Field functionality

This commit is contained in:
Hendrik Leppelsack 2016-03-03 17:57:04 +01:00 committed by Thomas Müller
parent 390cb41f42
commit f897f6f603
5 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
js/components/contactDetails/contactDetails_controller.js
View File

@ -61,8 +61,8 @@ app.controller('contactdetailsCtrl', ['ContactService', 'AddressBookService', 'v
ctrl.field = '';
};
ctrl.deleteField = function (field, index) {
ctrl.contact.removeProperty(field, index);
ctrl.deleteField = function (field, prop) {
ctrl.contact.removeProperty(field, prop);
ctrl.focus = undefined;
};

2
js/components/detailsItem/detailsItem_controller.js
View File

@ -33,7 +33,7 @@ app.controller('detailsItemCtrl', ['$templateRequest', 'vCardPropertiesService',
};
ctrl.deleteField = function () {
ctrl.model.deleteField(ctrl.name, ctrl.index);
ctrl.model.deleteField(ctrl.name, ctrl.data);
ctrl.model.updateContact();
};
}]);

3
js/components/detailsItem/detailsItem_directive.js
View File

@ -6,8 +6,7 @@ app.directive('detailsitem', ['$compile', function($compile) {
bindToController: {
name: '=',
data: '=',
model: '=',
index: '='
model: '='
},
link: function(scope, element, attrs, ctrl) {
ctrl.getTemplate().then(function(html) {

4
js/models/contact_model.js
View File

@ -83,8 +83,8 @@ app.factory('Contact', [ '$filter', function($filter) {
// keep vCard in sync
this.data.addressData = $filter('JSON2vCard')(this.props);
},
removeProperty: function (name, index) {
delete this.props[name][index];
removeProperty: function (name, prop) {
angular.copy(_.without(this.props[name], prop), this.props[name]);
this.data.addressData = $filter('JSON2vCard')(this.props);
},
setETag: function(etag) {

13
js/public/script.js
View File

@ -281,8 +281,8 @@ app.controller('contactdetailsCtrl', ['ContactService', 'AddressBookService', 'v
ctrl.field = '';
};
ctrl.deleteField = function (field, index) {
ctrl.contact.removeProperty(field, index);
ctrl.deleteField = function (field, prop) {
ctrl.contact.removeProperty(field, prop);
ctrl.focus = undefined;
};
@ -459,7 +459,7 @@ app.controller('detailsItemCtrl', ['$templateRequest', 'vCardPropertiesService',
};
ctrl.deleteField = function () {
ctrl.model.deleteField(ctrl.name, ctrl.index);
ctrl.model.deleteField(ctrl.name, ctrl.data);
ctrl.model.updateContact();
};
}]);
@ -472,8 +472,7 @@ app.directive('detailsitem', ['$compile', function($compile) {
bindToController: {
name: '=',
data: '=',
model: '=',
index: '='
model: '='
},
link: function(scope, element, attrs, ctrl) {
ctrl.getTemplate().then(function(html) {
@ -697,8 +696,8 @@ app.factory('Contact', [ '$filter', function($filter) {
// keep vCard in sync
this.data.addressData = $filter('JSON2vCard')(this.props);
},
removeProperty: function (name, index) {
delete this.props[name][index];
removeProperty: function (name, prop) {
angular.copy(_.without(this.props[name], prop), this.props[name]);
this.data.addressData = $filter('JSON2vCard')(this.props);
},
setETag: function(etag) {