Update vcard library - fixes #433 #451 #530 (#539)

owncloud · Dec 5, 2016 · 682e79d · 682e79d
1 parent 4cedbf3
commit 682e79d
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 24 deletions.
diff --git a/bower.json b/bower.json
@@ -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",

diff --git a/js/components/parsers/groupModel_directive.js b/js/components/parsers/groupModel_directive.js
diff --git a/js/models/contact_model.js b/js/models/contact_model.js
@@ -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];
 				}
 			},
 
@@ -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]);
+			}
 		}
 	};
 });
diff --git a/templates/detailItems/groups.html b/templates/detailItems/groups.html
@@ -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>