Skip to content

Commit

Permalink
Update vcard library - fixes #433 #451 #530 (#539)
Browse files Browse the repository at this point in the history
  • Loading branch information
DeepDiver1975 authored Dec 5, 2016
1 parent 4cedbf3 commit 682e79d
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 24 deletions.
4 changes: 2 additions & 2 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
"angular-uuid4": "0.3.1",
"jquery-timepicker": "883bb2cd94",
"ui-select": "angular-ui/ui-select#0.14.9",
"vcard": "Heymdall/vcard#1eb59e9b4406a3253bbb9295a1da776d22cdfe3a",
"ngclipboard": "^1.1.1"
"ngclipboard": "^1.1.1",
"vcard": "0.2.7"
},
"devDependencies": {
"angular-mocks": "1.5.8",
Expand Down
18 changes: 0 additions & 18 deletions js/components/parsers/groupModel_directive.js

This file was deleted.

12 changes: 9 additions & 3 deletions js/models/contact_model.js
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,13 @@ angular.module('contactsApp')
} else {
// getter
var property = this.getProperty('categories');
if(property && property.value.length > 0) {
return property.value.split(',');
} else {
if(!property) {
return [];
}
if (angular.isArray(property.value)) {
return property.value;
}
return [property.value];
}
},

Expand Down Expand Up @@ -293,6 +295,10 @@ angular.module('contactsApp')
var property = this.getProperty('categories');
if(!property) {
this.categories('');
} else {
if (angular.isString(property.value)) {
this.categories([property.value]);
}
}
};
});
2 changes: 1 addition & 1 deletion templates/detailItems/groups.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<label ng-if="ctrl.availableOptions.length === 0" for="details-{{ctrl.name}}">{{ctrl.meta.readableName}}</label>
<ui-select id="details-{{ctrl.name}}" multiple tagging tagging-label="{{ctrl.t.newGroup}}" ng-model="ctrl.data.value" group-model
<ui-select id="details-{{ctrl.name}}" multiple tagging tagging-label="{{ctrl.t.newGroup}}" ng-model="ctrl.data.value"
on-remove="ctrl.model.updateContact()" on-select="ctrl.model.updateContact()"
theme="select2" focus-expression="$parent.$parent.ctrl.focus === ctrl.name">
<ui-select-match placeholder="{{ctrl.meta.readableName}}">{{$item}}</ui-select-match>
Expand Down

0 comments on commit 682e79d

Please sign in to comment.