Updated JS namespace.

2 files changed, 1494 insertions, 1504 deletions

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index c53fc5af63f..8108bb25904 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -10,1642 +10,1632 @@ String.prototype.strip_tags = function(){
 	return stripped;
 };
 
-Contacts={
-	UI:{
-		/**
-		 * Arguments:
-		 * message: The text message to show.
-		 * timeout: The timeout in seconds before the notification disappears. Default 10.
-		 * timeouthandler: A function to run on timeout.
-		 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
-		 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
-		 * cancel: If set cancel all ongoing timer events and hide the notification.
-		 */
-		notify:function(params) {
-			var self = this;
-			if(!self.notifier) {
+OC.Contacts={
+	/**
+	 * Arguments:
+	 * message: The text message to show.
+	 * timeout: The timeout in seconds before the notification disappears. Default 10.
+	 * timeouthandler: A function to run on timeout.
+	 * clickhandler: A function to run on click. If a timeouthandler is given it will be cancelled.
+	 * data: An object that will be passed as argument to the timeouthandler and clickhandler functions.
+	 * cancel: If set cancel all ongoing timer events and hide the notification.
+	 */
+	notify:function(params) {
+		var self = this;
+		if(!self.notifier) {
+			self.notifier = $('#notification');
+		}
+		if(params.cancel) {
+			self.notifier.off('click');
+			for(var id in self.notifier.data()) {
+				if($.isNumeric(id)) {
+					clearTimeout(parseInt(id));
+				}
+			}
+			self.notifier.text('').fadeOut().removeData();
+			return;
+		}
+		self.notifier.text(params.message);
+		self.notifier.fadeIn();
+		self.notifier.on('click', function() { $(this).fadeOut();});
+		var timer = setTimeout(function() {
+			if(!self || !self.notifier) {
+				var self = OC.Contacts;
 				self.notifier = $('#notification');
 			}
-			if(params.cancel) {
+			self.notifier.fadeOut();
+			if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
+				params.timeouthandler(self.notifier.data(dataid));
 				self.notifier.off('click');
-				for(var id in self.notifier.data()) {
-					if($.isNumeric(id)) {
-						clearTimeout(parseInt(id));
-					}
-				}
-				self.notifier.text('').fadeOut().removeData();
-				return;
+				self.notifier.removeData(dataid);
 			}
-			self.notifier.text(params.message);
-			self.notifier.fadeIn();
-			self.notifier.on('click', function() { $(this).fadeOut();});
-			var timer = setTimeout(function() {
+		}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
+		var dataid = timer.toString();
+		if(params.data) {
+			self.notifier.data(dataid, params.data);
+		}
+		if(params.clickhandler && $.isFunction(params.clickhandler)) {
+			self.notifier.on('click', function() {
 				if(!self || !self.notifier) {
-					var self = Contacts.UI;
-					self.notifier = $('#notification');
-				}
-				self.notifier.fadeOut();
-				if(params.timeouthandler && $.isFunction(params.timeouthandler)) {
-					params.timeouthandler(self.notifier.data(dataid));
-					self.notifier.off('click');
-					self.notifier.removeData(dataid);
+					var self = OC.Contacts;
+					self.notifier = $(this);
 				}
-			}, params.timeout && $.isNumeric(params.timeout) ? parseInt(params.timeout)*1000 : 10000);
-			var dataid = timer.toString();
-			if(params.data) {
-				self.notifier.data(dataid, params.data);
-			}
-			if(params.clickhandler && $.isFunction(params.clickhandler)) {
-				self.notifier.on('click', function() {
-					if(!self || !self.notifier) {
-						var self = Contacts.UI;
-						self.notifier = $(this);
-					}
-					clearTimeout(timer);
-					self.notifier.off('click');
-					params.clickhandler(self.notifier.data(dataid));
-					self.notifier.removeData(dataid);
-				});
-			}
-		},
-		notImplemented:function() {
-			OC.dialogs.alert(t('contacts', 'Sorry, this functionality has not been implemented yet'), t('contacts', 'Not implemented'));
-		},
-		searchOSM:function(obj) {
-			var adr = Contacts.UI.propertyContainerFor(obj).find('.adr').val();
-			if(adr == undefined) {
-				OC.dialogs.alert(t('contacts', 'Couldn\'t get a valid address.'), t('contacts', 'Error'));
-				return;
-			}
-			// FIXME: I suck at regexp. /Tanghus
-			var adrarr = adr.split(';');
-			var adrstr = '';
-			if(adrarr[2].trim() != '') {
-				adrstr = adrstr + adrarr[2].trim() + ',';
-			}
-			if(adrarr[3].trim() != '') {
-				adrstr = adrstr + adrarr[3].trim() + ',';
-			}
-			if(adrarr[4].trim() != '') {
-				adrstr = adrstr + adrarr[4].trim() + ',';
-			}
-			if(adrarr[5].trim() != '') {
-				adrstr = adrstr + adrarr[5].trim() + ',';
-			}
-			if(adrarr[6].trim() != '') {
-				adrstr = adrstr + adrarr[6].trim();
+				clearTimeout(timer);
+				self.notifier.off('click');
+				params.clickhandler(self.notifier.data(dataid));
+				self.notifier.removeData(dataid);
+			});
+		}
+	},
+	notImplemented:function() {
+		OC.dialogs.alert(t('contacts', 'Sorry, this functionality has not been implemented yet'), t('contacts', 'Not implemented'));
+	},
+	searchOSM:function(obj) {
+		var adr = OC.Contacts.propertyContainerFor(obj).find('.adr').val();
+		if(adr == undefined) {
+			OC.dialogs.alert(t('contacts', 'Couldn\'t get a valid address.'), t('contacts', 'Error'));
+			return;
+		}
+		// FIXME: I suck at regexp. /Tanghus
+		var adrarr = adr.split(';');
+		var adrstr = '';
+		if(adrarr[2].trim() != '') {
+			adrstr = adrstr + adrarr[2].trim() + ',';
+		}
+		if(adrarr[3].trim() != '') {
+			adrstr = adrstr + adrarr[3].trim() + ',';
+		}
+		if(adrarr[4].trim() != '') {
+			adrstr = adrstr + adrarr[4].trim() + ',';
+		}
+		if(adrarr[5].trim() != '') {
+			adrstr = adrstr + adrarr[5].trim() + ',';
+		}
+		if(adrarr[6].trim() != '') {
+			adrstr = adrstr + adrarr[6].trim();
+		}
+		adrstr = encodeURIComponent(adrstr);
+		var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&polygon=1&zoom=';
+		var newWindow = window.open(uri,'_blank');
+		newWindow.focus();
+	},
+	mailTo:function(obj) {
+		var adr = OC.Contacts.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
+		if(adr == '') {
+			OC.dialogs.alert(t('contacts', 'Please enter an email address.'), t('contacts', 'Error'));
+			return;
+		}
+		window.location.href='mailto:' + adr;
+	},
+	propertyContainerFor:function(obj) {
+		return $(obj).parents('.propertycontainer').first();
+	},
+	checksumFor:function(obj) {
+		return $(obj).parents('.propertycontainer').first().data('checksum');
+	},
+	propertyTypeFor:function(obj) {
+		return $(obj).parents('.propertycontainer').first().data('element');
+	},
+	loading:function(obj, state) {
+		if(state) {
+			$(obj).addClass('loading');
+		} else {
+			$(obj).removeClass('loading');
+		}
+	},
+	showCardDAVUrl:function(username, bookname){
+		$('#carddav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(bookname));
+		$('#carddav_url').show();
+		$('#carddav_url_close').show();
+	},
+	loadListHandlers:function() {
+		$('.propertylist li a.delete').unbind('click');
+		$('.propertylist li a.delete').unbind('keydown');
+		var deleteItem = function(obj) {
+			obj.tipsy('hide');
+			OC.Contacts.Card.deleteProperty(obj, 'list');
+		}
+		$('.propertylist li a.delete, .addresscard .delete').click(function() { deleteItem($(this)) });
+		$('.propertylist li a.delete, .addresscard .delete').keydown(function() { deleteItem($(this)) });
+		$('.propertylist li a.mail').click(function() { OC.Contacts.mailTo(this) });
+		$('.propertylist li a.mail').keydown(function() { OC.Contacts.mailTo(this) });
+		$('.addresscard .globe').click(function() { $(this).tipsy('hide');OC.Contacts.searchOSM(this); });
+		$('.addresscard .globe').keydown(function() { $(this).tipsy('hide');OC.Contacts.searchOSM(this); });
+		$('.addresscard .edit').click(function() { $(this).tipsy('hide');OC.Contacts.Card.editAddress(this, false); });
+		$('.addresscard .edit').keydown(function() { $(this).tipsy('hide');OC.Contacts.Card.editAddress(this, false); });
+		$('.addresscard,.propertylist li,.propertycontainer').hover(
+			function () {
+				$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {});
+			},
+			function () {
+				$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {});
 			}
-			adrstr = encodeURIComponent(adrstr);
-			var uri = 'http://open.mapquestapi.com/nominatim/v1/search.php?q=' + adrstr + '&limit=10&addressdetails=1&polygon=1&zoom=';
-			var newWindow = window.open(uri,'_blank');
+		);
+	},
+	loadHandlers:function() {
+		var deleteItem = function(obj) {
+			obj.tipsy('hide');
+			OC.Contacts.Card.deleteProperty(obj, 'single');
+		}
+		var goToUrl = function(obj) {
+		var url = OC.Contacts.propertyContainerFor(obj).find('#url').val();
+		if(url != '') {
+			var newWindow = window.open(url,'_blank');
 			newWindow.focus();
-		},
-		mailTo:function(obj) {
-			var adr = Contacts.UI.propertyContainerFor($(obj)).find('input[type="email"]').val().trim();
-			if(adr == '') {
-				OC.dialogs.alert(t('contacts', 'Please enter an email address.'), t('contacts', 'Error'));
-				return;
 			}
-			window.location.href='mailto:' + adr;
-		},
-		propertyContainerFor:function(obj) {
-			return $(obj).parents('.propertycontainer').first();
-		},
-		checksumFor:function(obj) {
-			return $(obj).parents('.propertycontainer').first().data('checksum');
-		},
-		propertyTypeFor:function(obj) {
-			return $(obj).parents('.propertycontainer').first().data('element');
-		},
-		loading:function(obj, state) {
-			if(state) {
-				$(obj).addClass('loading');
-			} else {
-				$(obj).removeClass('loading');
+		}
+
+		$('#identityprops a.delete').click( function() { deleteItem($(this)) });
+		$('#identityprops a.delete').keydown( function() { deleteItem($(this)) });
+		$('#categories_value a.edit').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
+		$('#categories_value a.edit').keydown( function() { $(this).tipsy('hide');OCCategories.edit(); } );
+		$('#url_value a.globe').click( function() { $(this).tipsy('hide');goToUrl($(this)); } );
+		$('#url_value a.globe').keydown( function() { $(this).tipsy('hide');goToUrl($(this)); } );
+		$('#fn_select').combobox({
+			'id': 'fn',
+			'name': 'value',
+			'classes': ['contacts_property', 'nonempty', 'huge', 'tip', 'float'],
+			'attributes': {'placeholder': t('contacts', 'Enter name')},
+			'title': t('contacts', 'Format custom, Short name, Full name, Reverse or Reverse with comma')});
+		$('#bday').datepicker({
+					dateFormat : 'dd-mm-yy'
+		});
+		// Style phone types
+		$('#phonelist').find('select.contacts_property').multiselect({
+												noneSelectedText: t('contacts', 'Select type'),
+												header: false,
+												selectedList: 4,
+												classes: 'typelist'
+											});
+		$('#edit_name').click(function(){OC.Contacts.Card.editName()});
+		$('#edit_name').keydown(function(){OC.Contacts.Card.editName()});
+
+		$('#phototools li a').click(function() {
+		$(this).tipsy('hide');
+		});
+		$('#contacts_details_photo_wrapper').hover(
+			function () {
+				$('#phototools').slideDown(200);
+			},
+			function () {
+				$('#phototools').slideUp(200);
 			}
-		},
-		showCardDAVUrl:function(username, bookname){
-			$('#carddav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(bookname));
-			$('#carddav_url').show();
-			$('#carddav_url_close').show();
-		},
-		loadListHandlers:function() {
-			$('.propertylist li a.delete').unbind('click');
-			$('.propertylist li a.delete').unbind('keydown');
-			var deleteItem = function(obj) {
-				obj.tipsy('hide');
-				Contacts.UI.Card.deleteProperty(obj, 'list');
-			}
-			$('.propertylist li a.delete, .addresscard .delete').click(function() { deleteItem($(this)) });
-			$('.propertylist li a.delete, .addresscard .delete').keydown(function() { deleteItem($(this)) });
-			$('.propertylist li a.mail').click(function() { Contacts.UI.mailTo(this) });
-			$('.propertylist li a.mail').keydown(function() { Contacts.UI.mailTo(this) });
-			$('.addresscard .globe').click(function() { $(this).tipsy('hide');Contacts.UI.searchOSM(this); });
-			$('.addresscard .globe').keydown(function() { $(this).tipsy('hide');Contacts.UI.searchOSM(this); });
-			$('.addresscard .edit').click(function() { $(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false); });
-			$('.addresscard .edit').keydown(function() { $(this).tipsy('hide');Contacts.UI.Card.editAddress(this, false); });
-			$('.addresscard,.propertylist li,.propertycontainer').hover(
-				function () {
-					$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {});
-				},
-				function () {
-					$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {});
-				}
-			);
-		},
-		loadHandlers:function() {
-			var deleteItem = function(obj) {
-				obj.tipsy('hide');
-				Contacts.UI.Card.deleteProperty(obj, 'single');
+		);
+		$('#phototools').hover(
+			function () {
+				$(this).removeClass('transparent');
+			},
+			function () {
+				$(this).addClass('transparent');
 			}
-
-			var goToUrl = function(obj) {
-				var url = Contacts.UI.propertyContainerFor(obj).find('#url').val();
-				if(url != '') {
-					var newWindow = window.open(url,'_blank');
-					newWindow.focus();
+		);
+		$('#phototools .upload').click(function() {
+			$('#file_upload_start').trigger('click');
+		});
+		$('#phototools .cloud').click(function() {
+			OC.dialogs.filepicker(t('contacts', 'Select photo'), OC.Contacts.Card.cloudPhotoSelected, false, 'image', true);
+		});
+		/* Initialize the photo edit dialog */
+		$('#edit_photo_dialog').dialog({
+			autoOpen: false, modal: true, height: 'auto', width: 'auto'
+		});
+		$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
+			{
+				text: "Ok",
+				click: function() {
+					OC.Contacts.Card.savePhoto(this);
+					$(this).dialog('close');
 				}
+			},
+			{
+				text: "Cancel",
+				click: function() { $(this).dialog('close'); }
 			}
+		] );
 
-			$('#identityprops a.delete').click( function() { deleteItem($(this)) });
-			$('#identityprops a.delete').keydown( function() { deleteItem($(this)) });
-			$('#categories_value a.edit').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
-			$('#categories_value a.edit').keydown( function() { $(this).tipsy('hide');OCCategories.edit(); } );
-			$('#url_value a.globe').click( function() { $(this).tipsy('hide');goToUrl($(this)); } );
-			$('#url_value a.globe').keydown( function() { $(this).tipsy('hide');goToUrl($(this)); } );
-			$('#fn_select').combobox({
-				'id': 'fn',
-				'name': 'value',
-				'classes': ['contacts_property', 'nonempty', 'huge', 'tip', 'float'],
-				'attributes': {'placeholder': t('contacts', 'Enter name')},
-				'title': t('contacts', 'Format custom, Short name, Full name, Reverse or Reverse with comma')});
-			$('#bday').datepicker({
-						dateFormat : 'dd-mm-yy'
-			});
-			// Style phone types
-			$('#phonelist').find('select.contacts_property').multiselect({
-													noneSelectedText: t('contacts', 'Select type'),
-													header: false,
-													selectedList: 4,
-													classes: 'typelist'
-												});
-			$('#edit_name').click(function(){Contacts.UI.Card.editName()});
-			$('#edit_name').keydown(function(){Contacts.UI.Card.editName()});
+		// Name has changed. Update it and reorder.
+		$('#fn').change(function(){
+			var name = $('#fn').val().strip_tags();
+			var item = $('.contacts li[data-id="'+OC.Contacts.Card.id+'"]').detach();
+			$(item).find('a').html(name);
+			OC.Contacts.Card.fn = name;
+			OC.Contacts.Contacts.insertContact({contact:item});
+			OC.Contacts.Contacts.scrollTo(OC.Contacts.Card.id);
+		});
 
-			$('#phototools li a').click(function() {
-				$(this).tipsy('hide');
-			});
-			$('#contacts_details_photo_wrapper').hover(
-				function () {
-					$('#phototools').slideDown(200);
-				},
-				function () {
-					$('#phototools').slideUp(200);
-				}
-			);
-			$('#phototools').hover(
-				function () {
-					$(this).removeClass('transparent');
-				},
-				function () {
-					$(this).addClass('transparent');
-				}
-			);
-			$('#phototools .upload').click(function() {
-				$('#file_upload_start').trigger('click');
-			});
-			$('#phototools .cloud').click(function() {
-				OC.dialogs.filepicker(t('contacts', 'Select photo'), Contacts.UI.Card.cloudPhotoSelected, false, 'image', true);
-			});
-			/* Initialize the photo edit dialog */
-			$('#edit_photo_dialog').dialog({
-				autoOpen: false, modal: true, height: 'auto', width: 'auto'
-			});
-			$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
-				{
-					text: "Ok",
-					click: function() {
-						Contacts.UI.Card.savePhoto(this);
-						$(this).dialog('close');
-					}
-				},
-				{
-					text: "Cancel",
-					click: function() { $(this).dialog('close'); }
-				}
-			] );
-
-			// Name has changed. Update it and reorder.
-			$('#fn').change(function(){
-				var name = $('#fn').val().strip_tags();
-				var item = $('.contacts li[data-id="'+Contacts.UI.Card.id+'"]').detach();
-				$(item).find('a').html(name);
-				Contacts.UI.Card.fn = name;
-				Contacts.UI.Contacts.insertContact({contact:item});
-				Contacts.UI.Contacts.scrollTo(Contacts.UI.Card.id);
-			});
-
-			$('#contacts_deletecard').click( function() { Contacts.UI.Card.delayedDelete();return false;} );
-			$('#contacts_deletecard').keydown( function(event) {
-				if(event.which == 13 || event.which == 32) {
-					Contacts.UI.Card.delayedDelete();
-				}
-				return false;
-			});
+		$('#contacts_deletecard').click( function() { OC.Contacts.Card.delayedDelete();return false;} );
+		$('#contacts_deletecard').keydown( function(event) {
+			if(event.which == 13 || event.which == 32) {
+				OC.Contacts.Card.delayedDelete();
+			}
+			return false;
+		});
 
-			$('#contacts_downloadcard').click( function() { Contacts.UI.Card.doExport();return false;} );
-			$('#contacts_downloadcard').keydown( function(event) {
-				if(event.which == 13 || event.which == 32) {
-					Contacts.UI.Card.doExport();
-				}
-				return false;
-			});
+		$('#contacts_downloadcard').click( function() { OC.Contacts.Card.doExport();return false;} );
+		$('#contacts_downloadcard').keydown( function(event) {
+			if(event.which == 13 || event.which == 32) {
+				OC.Contacts.Card.doExport();
+			}
+			return false;
+		});
 
-			// Profile picture upload handling
-			// New profile picture selected
-			$('#file_upload_start').change(function(){
-				Contacts.UI.Card.uploadPhoto(this.files);
-			});
-			$('#contacts_details_photo_wrapper').bind('dragover',function(event){
-				$(event.target).addClass('droppable');
-				event.stopPropagation();
-				event.preventDefault();
-			});
-			$('#contacts_details_photo_wrapper').bind('dragleave',function(event){
-				$(event.target).removeClass('droppable');
-				//event.stopPropagation();
-				//event.preventDefault();
-			});
-			$('#contacts_details_photo_wrapper').bind('drop',function(event){
-				event.stopPropagation();
-				event.preventDefault();
-				$(event.target).removeClass('droppable');
-				$.fileUpload(event.originalEvent.dataTransfer.files);
-			});
+		// Profile picture upload handling
+		// New profile picture selected
+		$('#file_upload_start').change(function(){
+			OC.Contacts.Card.uploadPhoto(this.files);
+		});
+		$('#contacts_details_photo_wrapper').bind('dragover',function(event){
+			$(event.target).addClass('droppable');
+			event.stopPropagation();
+			event.preventDefault();
+		});
+		$('#contacts_details_photo_wrapper').bind('dragleave',function(event){
+			$(event.target).removeClass('droppable');
+		});
+		$('#contacts_details_photo_wrapper').bind('drop',function(event){
+			event.stopPropagation();
+			event.preventDefault();
+			$(event.target).removeClass('droppable');
+			$.fileUpload(event.originalEvent.dataTransfer.files);
+		});
 
-			$('#categories').multiple_autocomplete({source: categories});
-			$('#contacts_deletecard').tipsy({gravity: 'ne'});
-			$('#contacts_downloadcard').tipsy({gravity: 'ne'});
-			$('#contacts_propertymenu_button').tipsy();
-			$('#contacts_newcontact, #contacts_import, #bottomcontrols .settings').tipsy({gravity: 'sw'});
+		$('#categories').multiple_autocomplete({source: categories});
+		$('#contacts_deletecard').tipsy({gravity: 'ne'});
+		$('#contacts_downloadcard').tipsy({gravity: 'ne'});
+		$('#contacts_propertymenu_button').tipsy();
+		$('#contacts_newcontact, #contacts_import, #bottomcontrols .settings').tipsy({gravity: 'sw'});
 
-			$('body').click(function(e){
-				if(!$(e.target).is('#contacts_propertymenu_button')) {
-					$('#contacts_propertymenu_dropdown').hide();
-				}
-			});
-			function propertyMenu(){
-				var menu = $('#contacts_propertymenu_dropdown');
-				if(menu.is(':hidden')) {
-					menu.show();
-					menu.find('li').first().focus();
-				} else {
-					menu.hide();
-				}
-			}
-			$('#contacts_propertymenu_button').click(propertyMenu);
-			$('#contacts_propertymenu_button').keydown(propertyMenu);
-			function propertyMenuItem(){
-				var type = $(this).data('type');
-				Contacts.UI.Card.addProperty(type);
+		$('body').click(function(e){
+			if(!$(e.target).is('#contacts_propertymenu_button')) {
 				$('#contacts_propertymenu_dropdown').hide();
 			}
-			$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
-			$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
-		},
-		Card:{
-			update:function(params) { // params {cid:int, aid:int}
-				if(!params) { params = {}; }
-				$('#contacts li,#contacts h3').removeClass('active');
-				console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
-				var newid, bookid, firstitem;
-				if(!parseInt(params.cid) && !parseInt(params.aid)) {
-					firstitem = $('#contacts ul').first().find('li:first-child');
-					if(firstitem.length > 0) {
-						newid = parseInt(firstitem.data('id'));
-						bookid = parseInt(firstitem.data('bookid'));
-					}
-				} else if(!parseInt(params.cid) && parseInt(params.aid)) {
-					bookid = parseInt(params.aid);
-					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
-				} else if(parseInt(params.cid) && !parseInt(params.aid)) {
-					newid = parseInt(params.cid);
-					var listitem = Contacts.UI.Contacts.getContact(newid); //$('#contacts li[data-id="'+newid+'"]');
-					console.log('Is contact in list? ' + listitem.length);
-					if(listitem.length) {
-						//bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
-						bookid = parseInt(Contacts.UI.Contacts.getContact(newid).data('bookid'));
-					} else { // contact isn't in list yet.
-						bookid = 'unknown';
-					}
-				} else {
-					newid = parseInt(params.cid);
-					bookid = parseInt(params.aid);
-				}
-				if(!bookid || !newid) {
-					bookid = parseInt($('#contacts h3').first().data('id'));
-					newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
-				}
-				console.log('newid: ' + newid + ' bookid: ' +bookid);
-				var localLoadContact = function(newid, bookid) {
-					if($('.contacts li').length > 0) {
-						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
-							if(jsondata.status == 'success'){
-								if(bookid == 'unknown') {
-									bookid = jsondata.data.addressbookid;
-									var contact = Contacts.UI.Contacts.insertContact({
-										contactlist:$('#contacts ul[data-id="'+bookid+'"]'),
-										data:jsondata.data
-									});
-								}
-								$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
-								$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
-								Contacts.UI.Card.loadContact(jsondata.data, bookid);
-								Contacts.UI.Contacts.scrollTo(newid);
-							} else {
-								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							}
-						});
-					}
-				}
-
-				// Make sure proper DOM is loaded.
-				if(!$('#card').length && newid) {
-					console.log('Loading card DOM');
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{requesttoken:requesttoken},function(jsondata){
-						if(jsondata.status == 'success'){
-							$('#rightcontent').html(jsondata.data.page).ready(function() {
-								Contacts.UI.loadHandlers();
-								localLoadContact(newid, bookid);
-							});
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
+		});
+		function propertyMenu(){
+			var menu = $('#contacts_propertymenu_dropdown');
+			if(menu.is(':hidden')) {
+				menu.show();
+				menu.find('li').first().focus();
+			} else {
+				menu.hide();
+			}
+		}
+		$('#contacts_propertymenu_button').click(propertyMenu);
+		$('#contacts_propertymenu_button').keydown(propertyMenu);
+		function propertyMenuItem(){
+			var type = $(this).data('type');
+			OC.Contacts.Card.addProperty(type);
+			$('#contacts_propertymenu_dropdown').hide();
+		}
+		$('#contacts_propertymenu_dropdown a').click(propertyMenuItem);
+		$('#contacts_propertymenu_dropdown a').keydown(propertyMenuItem);
+	},
+	Card:{
+		update:function(params) { // params {cid:int, aid:int}
+			if(!params) { params = {}; }
+			$('#contacts li,#contacts h3').removeClass('active');
+			console.log('Card, cid: ' + params.cid + ' aid: ' + params.aid);
+			var newid, bookid, firstitem;
+			if(!parseInt(params.cid) && !parseInt(params.aid)) {
+				firstitem = $('#contacts ul').first().find('li:first-child');
+				if(firstitem.length > 0) {
+					newid = parseInt(firstitem.data('id'));
+					bookid = parseInt(firstitem.data('bookid'));
+				}
+			} else if(!parseInt(params.cid) && parseInt(params.aid)) {
+				bookid = parseInt(params.aid);
+				newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
+			} else if(parseInt(params.cid) && !parseInt(params.aid)) {
+				newid = parseInt(params.cid);
+				var listitem = OC.Contacts.Contacts.getContact(newid); //$('#contacts li[data-id="'+newid+'"]');
+				console.log('Is contact in list? ' + listitem.length);
+				if(listitem.length) {
+					//bookid = parseInt($('#contacts li[data-id="'+newid+'"]').data('bookid'));
+					bookid = parseInt(OC.Contacts.Contacts.getContact(newid).data('bookid'));
+				} else { // contact isn't in list yet.
+					bookid = 'unknown';
 				}
-				else if(!newid) {
-					console.log('Loading intro');
-					// load intro page
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
+			} else {
+				newid = parseInt(params.cid);
+				bookid = parseInt(params.aid);
+			}
+			if(!bookid || !newid) {
+				bookid = parseInt($('#contacts h3').first().data('id'));
+				newid = parseInt($('#contacts').find('li[data-bookid="'+bookid+'"]').first().data('id'));
+			}
+			console.log('newid: ' + newid + ' bookid: ' +bookid);
+			var localLoadContact = function(newid, bookid) {
+				if($('.contacts li').length > 0) {
+					$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
 						if(jsondata.status == 'success'){
-							id = '';
-							$('#rightcontent').data('id','');
-							$('#rightcontent').html(jsondata.data.page);
+							if(bookid == 'unknown') {
+								bookid = jsondata.data.addressbookid;
+								var contact = OC.Contacts.Contacts.insertContact({
+									contactlist:$('#contacts ul[data-id="'+bookid+'"]'),
+									data:jsondata.data
+								});
+							}
+							$('#contacts li[data-id="'+newid+'"],#contacts h3[data-id="'+bookid+'"]').addClass('active');
+							$('#contacts ul[data-id="'+bookid+'"]').slideDown(300);
+							OC.Contacts.Card.loadContact(jsondata.data, bookid);
+							OC.Contacts.Contacts.scrollTo(newid);
 						} else {
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 						}
 					});
 				}
-				else {
-					localLoadContact(newid, bookid);
-				}
-			},
-			doExport:function() {
-				document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
-			},
-			editNew:function(){ // add a new contact
-				this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
-				//Contacts.UI.Card.add(t('contacts', 'Contact')+';'+t('contacts', 'New')+';;;', t('contacts', 'New Contact'), '', true);
-				Contacts.UI.Card.add(';;;;;', '', '', true);
-				return false;
-			},
-			add:function(n, fn, aid, isnew){ // add a new contact
-				console.log('Adding ' + fn);
-				aid = aid?aid:$('#contacts h3.active').first().data('id');
-				var localAddcontact = function(n, fn, aid, isnew) {
-					$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
-					function(jsondata) {
-						if (jsondata.status == 'success'){
-							$('#rightcontent').data('id',jsondata.data.id);
-							var id = jsondata.data.id;
-							var aid = jsondata.data.aid;
-							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
-								if(jsondata.status == 'success'){
-									Contacts.UI.Card.loadContact(jsondata.data, aid);
-									var item = Contacts.UI.Contacts.insertContact({data:jsondata.data});
-									if(isnew) { // add some default properties
-										Contacts.UI.Card.addProperty('EMAIL');
-										Contacts.UI.Card.addProperty('TEL');
-										$('#fn').focus();
-									}
-								}
-								else{
-									OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-								}
-							});
-							$('#contact_identity').show();
-							$('#actionbar').show();
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-
-				if(!$('#card').length) {
-					console.log('Loading card DOM');
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
-						if(jsondata.status == 'success'){
-							$('#rightcontent').html(jsondata.data.page).ready(function() {
-								Contacts.UI.loadHandlers();
-								localAddcontact(n, fn, aid, isnew);
-							});
-						} else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				} else {
-					localAddcontact(n, fn, aid, isnew);
-				}
-			},
-			delayedDelete:function() {
-				/* TODO:
-				$(window).unload(function() {
-					deleteFilesInQueue();
-				});
-				*/
-				$('#contacts_deletecard').tipsy('hide');
-				var newid = '', bookid;
-				var curlistitem = Contacts.UI.Contacts.getContact(this.id);
-				curlistitem.removeClass('active');
-				var newlistitem = curlistitem.prev('li');
-				if(!newlistitem) {
-					newlistitem = curlistitem.next('li');
-				}
-				curlistitem.detach();
-				if($(newlistitem).is('li')) {
-					newid = newlistitem.data('id');
-					bookid = newlistitem.data('bookid');
-				}
-				$('#rightcontent').data('id', newid);
-
-				Contacts.UI.Contacts.deletionQueue.push(this.id);
-				if(!window.onbeforeunload) {
-					window.onbeforeunload = Contacts.UI.Contacts.warnNotDeleted;
-				}
-
-				with(this) {
-					delete id; delete fn; delete fullname; delete shortname; delete famname;
-					delete givname; delete addname; delete honpre; delete honsuf; delete data;
-				}
+			}
 
-				if($('.contacts li').length > 0) {
-					Contacts.UI.Card.update({cid:newid, aid:bookid});
-				} else {
-					// load intro page
-					$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
-						if(jsondata.status == 'success'){
-							id = '';
-							$('#rightcontent').html(jsondata.data.page).removeData('id');
-						}
-						else{
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				}
-				Contacts.UI.notify({
-					data:curlistitem,
-					message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
-					timeouthandler:function(contact) {
-						Contacts.UI.Card.doDelete(contact.data('id'), true);
-						delete contact;
-					},
-					clickhandler:function(contact) {
-						Contacts.UI.Contacts.insertContact({contact:contact});
-						Contacts.UI.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
+			// Make sure proper DOM is loaded.
+			if(!$('#card').length && newid) {
+				console.log('Loading card DOM');
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{requesttoken:requesttoken},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#rightcontent').html(jsondata.data.page).ready(function() {
+							OC.Contacts.loadHandlers();
+							localLoadContact(newid, bookid);
+						});
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
-			},
-			doDelete:function(id, removeFromQueue) {
-				if(Contacts.UI.Contacts.deletionQueue.indexOf(id) == -1 && removeFromQueue) {
-					return;
-				}
-				$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':id},function(jsondata) {
-					if(jsondata.status == 'error'){
+			} else if(!newid) {
+				console.log('Loading intro');
+				// load intro page
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
+					if(jsondata.status == 'success'){
+						id = '';
+						$('#rightcontent').data('id','');
+						$('#rightcontent').html(jsondata.data.page);
+					} else {
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
-					if(removeFromQueue) {
-						Contacts.UI.Contacts.deletionQueue.splice(Contacts.UI.Contacts.deletionQueue.indexOf(id), 1);
+				});
+			}
+			else {
+				localLoadContact(newid, bookid);
+			}
+		},
+		doExport:function() {
+			document.location.href = OC.linkTo('contacts', 'export.php') + '?contactid=' + this.id;
+		},
+		editNew:function(){ // add a new contact
+			this.id = ''; this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
+			OC.Contacts.Card.add(';;;;;', '', '', true);
+			return false;
+		},
+		add:function(n, fn, aid, isnew){ // add a new contact
+			console.log('Adding ' + fn);
+			aid = aid?aid:$('#contacts h3.active').first().data('id');
+			var localAddcontact = function(n, fn, aid, isnew) {
+				$.post(OC.filePath('contacts', 'ajax', 'addcontact.php'), { n: n, fn: fn, aid: aid, isnew: isnew },
+				function(jsondata) {
+					if (jsondata.status == 'success'){
+						$('#rightcontent').data('id',jsondata.data.id);
+						var id = jsondata.data.id;
+						var aid = jsondata.data.aid;
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
+							if(jsondata.status == 'success'){
+								OC.Contacts.Card.loadContact(jsondata.data, aid);
+								var item = OC.Contacts.Contacts.insertContact({data:jsondata.data});
+								if(isnew) { // add some default properties
+									OC.Contacts.Card.addProperty('EMAIL');
+									OC.Contacts.Card.addProperty('TEL');
+									$('#fn').focus();
+								}
+							}
+							else{
+								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+							}
+						});
+						$('#contact_identity').show();
+						$('#actionbar').show();
 					}
-					if(Contacts.UI.Contacts.deletionQueue.length == 0) {
-						window.onbeforeunload = null;
+					else{
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
-			},
-			loadContact:function(jsondata, bookid){
-				this.data = jsondata;
-				this.id = this.data.id;
-				this.bookid = bookid;
-				$('#rightcontent').data('id',this.id);
-				this.populateNameFields();
-				this.loadPhoto();
-				this.loadMails();
-				this.loadPhones();
-				this.loadAddresses();
-				this.loadSingleProperties();
-				Contacts.UI.loadListHandlers();
-				var note = $('#note');
-				if(this.data.NOTE) {
-					note.data('checksum', this.data.NOTE[0]['checksum']);
-					var textarea = note.find('textarea');
-					var txt = this.data.NOTE[0]['value'];
-					var nheight = txt.split('\n').length > 4 ? txt.split('\n').length+2 : 5;
-					textarea.css('min-height', nheight+'em');
-					textarea.attr('rows', nheight);
-					textarea.val(txt);
-					note.show();
-					textarea.expandingTextarea();
-					$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
-				} else {
-					note.removeData('checksum');
-					note.find('textarea').val('');
-					note.hide();
-					$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
-				}
-			},
-			loadSingleProperties:function() {
-				var props = ['BDAY', 'NICKNAME', 'ORG', 'URL', 'CATEGORIES'];
-				// Clear all elements
-				$('#ident .propertycontainer').each(function(){
-					if(props.indexOf($(this).data('element')) > -1) {
-						$(this).data('checksum', '');
-						$(this).find('input').val('');
-						$(this).hide();
-						$(this).prev().hide();
+			}
+
+			if(!$('#card').length) {
+				console.log('Loading card DOM');
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
+					if(jsondata.status == 'success'){
+						$('#rightcontent').html(jsondata.data.page).ready(function() {
+							OC.Contacts.loadHandlers();
+							localAddcontact(n, fn, aid, isnew);
+						});
+					} else{
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
-				for(var prop in props) {
-					var propname = props[prop];
-					if(this.data[propname] != undefined) {
-						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
-						var property = this.data[propname][0];
-						var value = property['value'], checksum = property['checksum'];
+			} else {
+				localAddcontact(n, fn, aid, isnew);
+			}
+		},
+		delayedDelete:function() {
+			$('#contacts_deletecard').tipsy('hide');
+			var newid = '', bookid;
+			var curlistitem = OC.Contacts.Contacts.getContact(this.id);
+			curlistitem.removeClass('active');
+			var newlistitem = curlistitem.prev('li');
+			if(!newlistitem) {
+				newlistitem = curlistitem.next('li');
+			}
+			curlistitem.detach();
+			if($(newlistitem).is('li')) {
+				newid = newlistitem.data('id');
+				bookid = newlistitem.data('bookid');
+			}
+			$('#rightcontent').data('id', newid);
 
-						if(propname == 'BDAY') {
-							var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
-							value = $.datepicker.formatDate('dd-mm-yy', val);
-						}
-						var identcontainer = $('#contact_identity');
-						identcontainer.find('#'+propname.toLowerCase()).val(value);
-						identcontainer.find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
-						identcontainer.find('#'+propname.toLowerCase()+'_label').show();
-						identcontainer.find('#'+propname.toLowerCase()+'_value').show();
+			OC.Contacts.Contacts.deletionQueue.push(this.id);
+			if(!window.onbeforeunload) {
+				window.onbeforeunload = OC.Contacts.Contacts.warnNotDeleted;
+			}
+
+			with(this) {
+				delete id; delete fn; delete fullname; delete shortname; delete famname;
+				delete givname; delete addname; delete honpre; delete honsuf; delete data;
+			}
+
+			if($('.contacts li').length > 0) {
+				OC.Contacts.Card.update({cid:newid, aid:bookid});
+			} else {
+				// load intro page
+				$.getJSON(OC.filePath('contacts', 'ajax', 'loadintro.php'),{},function(jsondata){
+					if(jsondata.status == 'success'){
+						id = '';
+						$('#rightcontent').html(jsondata.data.page).removeData('id');
 					} else {
-						$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().show();
-					}
-				}
-			},
-			populateNameFields:function() {
-				var props = ['FN', 'N'];
-				// Clear all elements
-				$('#ident .propertycontainer').each(function(){
-					if(props.indexOf($(this).data('element')) > -1) {
-						$(this).data('checksum', '');
-						$(this).find('input').val('');
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
 				});
-
-				with(this) {
-					delete fn; delete fullname; delete givname; delete famname;
-					delete addname; delete honpre; delete honsuf;
-				}
-
-				if(this.data.FN) {
-					this.fn = this.data.FN[0]['value'];
-				}
-				else {
-					this.fn = '';
-				}
-				if(this.data.N == undefined) {
-					narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
-				} else {
-					narray = this.data.N[0]['value'];
+			}
+			OC.Contacts.notify({
+				data:curlistitem,
+				message:t('contacts','Click to undo deletion of "') + curlistitem.find('a').text() + '"',
+				timeouthandler:function(contact) {
+					OC.Contacts.Card.doDelete(contact.data('id'), true);
+					delete contact;
+				},
+				clickhandler:function(contact) {
+					OC.Contacts.Contacts.insertContact({contact:contact});
+					OC.Contacts.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
 				}
-				this.famname = narray[0] || '';
-				this.givname = narray[1] || '';
-				this.addname = narray[2] || '';
-				this.honpre = narray[3] || '';
-				this.honsuf = narray[4] || '';
-				if(this.honpre.length > 0) {
-					this.fullname += this.honpre + ' ';
+			});
+		},
+		doDelete:function(id, removeFromQueue) {
+			if(OC.Contacts.Contacts.deletionQueue.indexOf(id) == -1 && removeFromQueue) {
+				return;
+			}
+			$.post(OC.filePath('contacts', 'ajax', 'deletecard.php'),{'id':id},function(jsondata) {
+				if(jsondata.status == 'error'){
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 				}
-				if(this.givname.length > 0) {
-					this.fullname += ' ' + this.givname;
+				if(removeFromQueue) {
+					OC.Contacts.Contacts.deletionQueue.splice(OC.Contacts.Contacts.deletionQueue.indexOf(id), 1);
 				}
-				if(this.addname.length > 0) {
-					this.fullname += ' ' + this.addname;
+				if(OC.Contacts.Contacts.deletionQueue.length == 0) {
+					window.onbeforeunload = null;
 				}
-				if(this.famname.length > 0) {
-					this.fullname += ' ' + this.famname;
+			});
+		},
+		loadContact:function(jsondata, bookid){
+			this.data = jsondata;
+			this.id = this.data.id;
+			this.bookid = bookid;
+			$('#rightcontent').data('id',this.id);
+			this.populateNameFields();
+			this.loadPhoto();
+			this.loadMails();
+			this.loadPhones();
+			this.loadAddresses();
+			this.loadSingleProperties();
+			OC.Contacts.loadListHandlers();
+			var note = $('#note');
+			if(this.data.NOTE) {
+				note.data('checksum', this.data.NOTE[0]['checksum']);
+				var textarea = note.find('textarea');
+				var txt = this.data.NOTE[0]['value'];
+				var nheight = txt.split('\n').length > 4 ? txt.split('\n').length+2 : 5;
+				textarea.css('min-height', nheight+'em');
+				textarea.attr('rows', nheight);
+				textarea.val(txt);
+				note.show();
+				textarea.expandingTextarea();
+				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
+			} else {
+				note.removeData('checksum');
+				note.find('textarea').val('');
+				note.hide();
+				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().show();
+			}
+		},
+		loadSingleProperties:function() {
+			var props = ['BDAY', 'NICKNAME', 'ORG', 'URL', 'CATEGORIES'];
+			// Clear all elements
+			$('#ident .propertycontainer').each(function(){
+				if(props.indexOf($(this).data('element')) > -1) {
+					$(this).data('checksum', '');
+					$(this).find('input').val('');
+					$(this).hide();
+					$(this).prev().hide();
 				}
-				if(this.honsuf.length > 0) {
-					this.fullname += ', ' + this.honsuf;
+			});
+			for(var prop in props) {
+				var propname = props[prop];
+				if(this.data[propname] != undefined) {
+					$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
+					var property = this.data[propname][0];
+					var value = property['value'], checksum = property['checksum'];
+
+					if(propname == 'BDAY') {
+						var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
+						value = $.datepicker.formatDate('dd-mm-yy', val);
+					}
+					var identcontainer = $('#contact_identity');
+					identcontainer.find('#'+propname.toLowerCase()).val(value);
+					identcontainer.find('#'+propname.toLowerCase()+'_value').data('checksum', checksum);
+					identcontainer.find('#'+propname.toLowerCase()+'_label').show();
+					identcontainer.find('#'+propname.toLowerCase()+'_value').show();
+				} else {
+					$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().show();
 				}
-				$('#n').val(narray.join(';'));
-				$('#fn_select option').remove();
-				var names = [this.fn, this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
-				if(this.data.ORG) {
-					names[names.length]=this.data.ORG[0].value;
+			}
+		},
+		populateNameFields:function() {
+			var props = ['FN', 'N'];
+			// Clear all elements
+			$('#ident .propertycontainer').each(function(){
+				if(props.indexOf($(this).data('element')) > -1) {
+					$(this).data('checksum', '');
+					$(this).find('input').val('');
 				}
-				$.each(names, function(key, value) {
-					$('#fn_select')
-						.append($('<option></option>')
-						.text(value));
-				});
+			});
+
+			with(this) {
+				delete fn; delete fullname; delete givname; delete famname;
+				delete addname; delete honpre; delete honsuf;
+			}
+
+			if(this.data.FN) {
+				this.fn = this.data.FN[0]['value'];
+			}
+			else {
+				this.fn = '';
+			}
+			if(this.data.N == undefined) {
+				narray = [this.fn,'','','','']; // Checking for non-existing 'N' property :-P
+			} else {
+				narray = this.data.N[0]['value'];
+			}
+			this.famname = narray[0] || '';
+			this.givname = narray[1] || '';
+			this.addname = narray[2] || '';
+			this.honpre = narray[3] || '';
+			this.honsuf = narray[4] || '';
+			if(this.honpre.length > 0) {
+				this.fullname += this.honpre + ' ';
+			}
+			if(this.givname.length > 0) {
+				this.fullname += ' ' + this.givname;
+			}
+			if(this.addname.length > 0) {
+				this.fullname += ' ' + this.addname;
+			}
+			if(this.famname.length > 0) {
+				this.fullname += ' ' + this.famname;
+			}
+			if(this.honsuf.length > 0) {
+				this.fullname += ', ' + this.honsuf;
+			}
+			$('#n').val(narray.join(';'));
+			$('#fn_select option').remove();
+			var names = [this.fn, this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
+			if(this.data.ORG) {
+				names[names.length]=this.data.ORG[0].value;
+			}
+			$.each(names, function(key, value) {
+				$('#fn_select')
+				.append($('<option></option>')
+				.text(value));
+			});
 				$('#fn_select').combobox('value', this.fn);
 				$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
 				if(this.data.FN) {
 					$('#contact_identity').find('*[data-element="FN"]').data('checksum', this.data.FN[0]['checksum']);
 				}
 				$('#contact_identity').show();
-			},
-			hasCategory:function(category) {
-				if(this.data.CATEGORIES) {
-					var categories = this.data.CATEGORIES[0]['value'].split(/,\s*/);
-					for(var c in categories) {
-						var cat = this.data.CATEGORIES[0]['value'][c];
-						if(typeof cat === 'string' && (cat.toUpperCase() === category.toUpperCase())) {
-							return true;
-						}
+		},
+		hasCategory:function(category) {
+			if(this.data.CATEGORIES) {
+				var categories = this.data.CATEGORIES[0]['value'].split(/,\s*/);
+				for(var c in categories) {
+					var cat = this.data.CATEGORIES[0]['value'][c];
+					if(typeof cat === 'string' && (cat.toUpperCase() === category.toUpperCase())) {
+						return true;
 					}
 				}
-				return false;
-			},
-			categoriesChanged:function(newcategories) { // Categories added/deleted.
-				categories = $.map(newcategories, function(v) {return v;});
-				$('#categories').multiple_autocomplete('option', 'source', categories);
-				var categorylist = $('#categories_value').find('input');
-				$.getJSON(OC.filePath('contacts', 'ajax', 'categories/categoriesfor.php'),{'id':Contacts.UI.Card.id},function(jsondata){
-					if(jsondata.status == 'success'){
-						$('#categories_value').data('checksum', jsondata.data.checksum);
-						categorylist.val(jsondata.data.value);
+			}
+			return false;
+		},
+		categoriesChanged:function(newcategories) { // Categories added/deleted.
+			categories = $.map(newcategories, function(v) {return v;});
+			$('#categories').multiple_autocomplete('option', 'source', categories);
+			var categorylist = $('#categories_value').find('input');
+			$.getJSON(OC.filePath('contacts', 'ajax', 'categories/categoriesfor.php'),{'id':OC.Contacts.Card.id},function(jsondata){
+				if(jsondata.status == 'success'){
+					$('#categories_value').data('checksum', jsondata.data.checksum);
+					categorylist.val(jsondata.data.value);
+				} else {
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+				}
+			});
+		},
+		savePropertyInternal:function(name, fields, oldchecksum, checksum) {
+			// TODO: Add functionality for new fields.
+			//console.log('savePropertyInternal: ' + name + ', fields: ' + fields + 'checksum: ' + checksum);
+			//console.log('savePropertyInternal: ' + this.data[name]);
+			var multivalue = ['CATEGORIES'];
+			var params = {};
+			var value = multivalue.indexOf(name) != -1 ? new Array() : undefined;
+			jQuery.each(fields, function(i, field){
+				//.substring(11,'parameters[TYPE][]'.indexOf(']'))
+				if(field.name.substring(0, 5) === 'value') {
+					if(multivalue.indexOf(name) != -1) {
+						value.push(field.value);
 					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+						value = field.value;
 					}
-				});
-			},
-			savePropertyInternal:function(name, fields, oldchecksum, checksum){
-				// TODO: Add functionality for new fields.
-				//console.log('savePropertyInternal: ' + name + ', fields: ' + fields + 'checksum: ' + checksum);
-				//console.log('savePropertyInternal: ' + this.data[name]);
-				var multivalue = ['CATEGORIES'];
-				var params = {};
-				var value = multivalue.indexOf(name) != -1 ? new Array() : undefined;
-				jQuery.each(fields, function(i, field){
-					//.substring(11,'parameters[TYPE][]'.indexOf(']'))
-					if(field.name.substring(0, 5) === 'value') {
-						if(multivalue.indexOf(name) != -1) {
-							value.push(field.value);
-						} else {
-							value = field.value;
-						}
-					} else if(field.name.substring(0, 10) === 'parameters') {
-						var p = field.name.substring(11,'parameters[TYPE][]'.indexOf(']'));
-						if(!(p in params)) {
-							params[p] = [];
-						}
-						params[p].push(field.value);
-					}
-				});
-				for(var i in this.data[name]) {
-					if(this.data[name][i]['checksum'] == oldchecksum) {
-						this.data[name][i]['checksum'] = checksum;
-						this.data[name][i]['value'] = value;
-						this.data[name][i]['parameters'] = params;
+				} else if(field.name.substring(0, 10) === 'parameters') {
+					var p = field.name.substring(11,'parameters[TYPE][]'.indexOf(']'));
+					if(!(p in params)) {
+						params[p] = [];
 					}
+					params[p].push(field.value);
 				}
-			},
-			saveProperty:function(obj){
-				if(!$(obj).hasClass('contacts_property')) {
-					return false;
-				}
-				if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
-					OC.dialogs.alert(t('contacts', 'This property has to be non-empty.'), t('contacts', 'Error'));
-					return false;
-				}
-				container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
-				Contacts.UI.loading(obj, true);
-				var checksum = container.data('checksum');
-				var name = container.data('element');
-				var fields = container.find('input.contacts_property,select.contacts_property').serializeArray();
-				switch(name) {
-					case 'FN':
-						var nempty = true;
-						for(var i in Contacts.UI.Card.data.N[0]['value']) {
-							if(Contacts.UI.Card.data.N[0]['value'][i] != '') {
-								nempty = false;
-								break;
-							}
+			});
+					for(var i in this.data[name]) {
+						if(this.data[name][i]['checksum'] == oldchecksum) {
+							this.data[name][i]['checksum'] = checksum;
+							this.data[name][i]['value'] = value;
+							this.data[name][i]['parameters'] = params;
 						}
-						if(nempty) {
-							$('#n').val(fields[0].value + ';;;;');
-							Contacts.UI.Card.data.N[0]['value'] = Array(fields[0].value, '', '', '', '');
-							setTimeout(function() {Contacts.UI.Card.saveProperty($('#n'))}, 500);
+					}
+		},
+		saveProperty:function(obj) {
+			if(!$(obj).hasClass('contacts_property')) {
+				return false;
+			}
+			if($(obj).hasClass('nonempty') && $(obj).val().trim() == '') {
+				OC.dialogs.alert(t('contacts', 'This property has to be non-empty.'), t('contacts', 'Error'));
+				return false;
+			}
+			container = $(obj).parents('.propertycontainer').first(); // get the parent holding the metadata.
+			OC.Contacts.loading(obj, true);
+			var checksum = container.data('checksum');
+			var name = container.data('element');
+			var fields = container.find('input.contacts_property,select.contacts_property').serializeArray();
+			switch(name) {
+				case 'FN':
+					var nempty = true;
+					for(var i in OC.Contacts.Card.data.N[0]['value']) {
+						if(OC.Contacts.Card.data.N[0]['value'][i] != '') {
+							nempty = false;
+							break;
 						}
-						break;
-				}
-				var q = container.find('input.contacts_property,select.contacts_property,textarea.contacts_property').serialize();
-				if(q == '' || q == undefined) {
-					OC.dialogs.alert(t('contacts', 'Couldn\'t serialize elements.'), t('contacts', 'Error'));
-					Contacts.UI.loading(obj, false);
-					return false;
-				}
-				q = q + '&id=' + this.id + '&name=' + name;
-				if(checksum != undefined && checksum != '') { // save
+					}
+					if(nempty) {
+						$('#n').val(fields[0].value + ';;;;');
+						OC.Contacts.Card.data.N[0]['value'] = Array(fields[0].value, '', '', '', '');
+						setTimeout(function() {OC.Contacts.Card.saveProperty($('#n'))}, 500);
+					}
+					break;
+			}
+			var q = container.find('input.contacts_property,select.contacts_property,textarea.contacts_property').serialize();
+			if(q == '' || q == undefined) {
+				OC.dialogs.alert(t('contacts', 'Couldn\'t serialize elements.'), t('contacts', 'Error'));
+				OC.Contacts.loading(obj, false);
+				return false;
+			}
+			q = q + '&id=' + this.id + '&name=' + name;
+			if(checksum != undefined && checksum != '') { // save
 					q = q + '&checksum=' + checksum;
 					console.log('Saving: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'saveproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
-							Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							Contacts.UI.loading(obj, false);
+							OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return true;
 						}
 						else{
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							Contacts.UI.loading(obj, false);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return false;
 						}
 					},'json');
-				} else { // add
+			} else { // add
 					console.log('Adding: ' + q);
 					$(obj).attr('disabled', 'disabled');
 					$.post(OC.filePath('contacts', 'ajax', 'addproperty.php'),q,function(jsondata){
 						if(jsondata.status == 'success'){
 							container.data('checksum', jsondata.data.checksum);
 							// TODO: savePropertyInternal doesn't know about new fields
-							//Contacts.UI.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
-							Contacts.UI.loading(obj, false);
+							//OC.Contacts.Card.savePropertyInternal(name, fields, checksum, jsondata.data.checksum);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return true;
 						}
 						else{
 							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-							Contacts.UI.loading(obj, false);
+							OC.Contacts.loading(obj, false);
 							$(obj).removeAttr('disabled');
 							return false;
 						}
 					},'json');
-				}
-			},
-			addProperty:function(type){
-				switch (type) {
-					case 'NOTE':
-						$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-						$('#note').find('textarea').expandingTextarea().show().focus();
-						break;
-					case 'EMAIL':
-						if($('#emaillist>li').length == 1) {
-							$('#emails').show();
-						}
-						Contacts.UI.Card.addMail();
-						break;
-					case 'TEL':
-						if($('#phonelist>li').length == 1) {
-							$('#phones').show();
-						}
-						Contacts.UI.Card.addPhone();
-						break;
-					case 'ADR':
-						if($('#addressdisplay>dl').length == 1) {
-							$('#addresses').show();
-						}
-						Contacts.UI.Card.editAddress('new', true);
-						break;
-					case 'NICKNAME':
-					case 'URL':
-					case 'ORG':
-					case 'BDAY':
-					case 'CATEGORIES':
-						$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
-						$('dd[data-element="'+type+'"]').find('input').focus();
-						$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
-						break;
-				}
-			},
-			deleteProperty:function(obj, type){
-				console.log('deleteProperty');
-				Contacts.UI.loading(obj, true);
-				var checksum = Contacts.UI.checksumFor(obj);
-				if(checksum) {
-					$.post(OC.filePath('contacts', 'ajax', 'deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
-						if(jsondata.status == 'success'){
-							if(type == 'list') {
-								Contacts.UI.propertyContainerFor(obj).remove();
-							} else if(type == 'single') {
-								var proptype = Contacts.UI.propertyTypeFor(obj);
-								Contacts.UI.Card.data[proptype] = null;
-								var othertypes = ['NOTE', 'PHOTO'];
-								if(othertypes.indexOf(proptype) != -1) {
-									Contacts.UI.propertyContainerFor(obj).data('checksum', '');
-									if(proptype == 'PHOTO') {
-										Contacts.UI.Contacts.refreshThumbnail(Contacts.UI.Card.id);
-										Contacts.UI.Card.loadPhoto(true);
-									} else if(proptype == 'NOTE') {
-										$('#note').find('textarea').val('');
-										Contacts.UI.propertyContainerFor(obj).hide();
-									}
-								} else {
-									$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
-									$('dl dd[data-element="'+proptype+'"]').data('checksum', '').find('input').val('');
+			}
+		},
+		addProperty:function(type) {
+			switch (type) {
+				case 'NOTE':
+					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
+					$('#note').find('textarea').expandingTextarea().show().focus();
+					break;
+				case 'EMAIL':
+					if($('#emaillist>li').length == 1) {
+						$('#emails').show();
+					}
+					OC.Contacts.Card.addMail();
+					break;
+				case 'TEL':
+					if($('#phonelist>li').length == 1) {
+						$('#phones').show();
+					}
+					OC.Contacts.Card.addPhone();
+					break;
+				case 'ADR':
+					if($('#addressdisplay>dl').length == 1) {
+						$('#addresses').show();
+					}
+					OC.Contacts.Card.editAddress('new', true);
+					break;
+				case 'NICKNAME':
+				case 'URL':
+				case 'ORG':
+				case 'BDAY':
+				case 'CATEGORIES':
+					$('dl dt[data-element="'+type+'"],dd[data-element="'+type+'"]').show();
+					$('dd[data-element="'+type+'"]').find('input').focus();
+					$('#contacts_propertymenu_dropdown a[data-type="'+type+'"]').parent().hide();
+					break;
+			}
+		},
+		deleteProperty:function(obj, type) {
+			console.log('deleteProperty');
+			OC.Contacts.loading(obj, true);
+			var checksum = OC.Contacts.checksumFor(obj);
+			if(checksum) {
+				$.post(OC.filePath('contacts', 'ajax', 'deleteproperty.php'),{'id': this.id, 'checksum': checksum },function(jsondata){
+					if(jsondata.status == 'success'){
+						if(type == 'list') {
+							OC.Contacts.propertyContainerFor(obj).remove();
+						} else if(type == 'single') {
+							var proptype = OC.Contacts.propertyTypeFor(obj);
+							OC.Contacts.Card.data[proptype] = null;
+							var othertypes = ['NOTE', 'PHOTO'];
+							if(othertypes.indexOf(proptype) != -1) {
+								OC.Contacts.propertyContainerFor(obj).data('checksum', '');
+								if(proptype == 'PHOTO') {
+									OC.Contacts.Contacts.refreshThumbnail(OC.Contacts.Card.id);
+									OC.Contacts.Card.loadPhoto(true);
+								} else if(proptype == 'NOTE') {
+									$('#note').find('textarea').val('');
+									OC.Contacts.propertyContainerFor(obj).hide();
 								}
-								$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
-								Contacts.UI.loading(obj, false);
 							} else {
-								OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
-								Contacts.UI.loading(obj, false);
+								$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+								$('dl dd[data-element="'+proptype+'"]').data('checksum', '').find('input').val('');
 							}
+							$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
+							OC.Contacts.loading(obj, false);
+						} else {
+							OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
+							OC.Contacts.loading(obj, false);
 						}
-						else{
-							Contacts.UI.loading(obj, false);
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
-				} else { // Property hasn't been saved so there's nothing to delete.
-					if(type == 'list') {
-						Contacts.UI.propertyContainerFor(obj).remove();
-					} else if(type == 'single') {
-						var proptype = Contacts.UI.propertyTypeFor(obj);
-						$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
-						$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
-						Contacts.UI.loading(obj, false);
-					} else {
-						OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
 					}
-				}
-			},
-			editName:function() {
-				var params = {id: this.id};
-				/* Initialize the name edit dialog */
-				if($('#edit_name_dialog').dialog('isOpen') == true) {
-					$('#edit_name_dialog').dialog('moveToTop');
+					else{
+						OC.Contacts.loading(obj, false);
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			} else { // Property hasn't been saved so there's nothing to delete.
+				if(type == 'list') {
+					OC.Contacts.propertyContainerFor(obj).remove();
+				} else if(type == 'single') {
+					var proptype = OC.Contacts.propertyTypeFor(obj);
+					$('dl dt[data-element="'+proptype+'"],dd[data-element="'+proptype+'"]').hide();
+					$('#contacts_propertymenu_dropdown a[data-type="'+proptype+'"]').parent().show();
+					OC.Contacts.loading(obj, false);
 				} else {
-					$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata) {
-						if(jsondata.status == 'success') {
-							$('body').append('<div id="name_dialog"></div>');
-							$('#name_dialog').html(jsondata.data.page).find('#edit_name_dialog' ).dialog({
-								modal: true,
-								closeOnEscape: true,
-								title:  t('contacts', 'Edit name'),
-								height: 'auto', width: 'auto',
-								buttons: {
-									'Ok':function() {
-										Contacts.UI.Card.saveName(this);
-										$(this).dialog('close');
-									},
-									'Cancel':function() { $(this).dialog('close'); }
-								},
-								close: function(event, ui) {
-									$(this).dialog('destroy').remove();
-									$('#name_dialog').remove();
+					OC.dialogs.alert(t('contacts', '\'deleteProperty\' called without type argument. Please report at bugs.owncloud.org'), t('contacts', 'Error'));
+				}
+			}
+		},
+		editName:function() {
+			var params = {id: this.id};
+			/* Initialize the name edit dialog */
+			if($('#edit_name_dialog').dialog('isOpen') == true) {
+				$('#edit_name_dialog').dialog('moveToTop');
+			} else {
+				$.getJSON(OC.filePath('contacts', 'ajax', 'editname.php'),{id: this.id},function(jsondata) {
+					if(jsondata.status == 'success') {
+						$('body').append('<div id="name_dialog"></div>');
+						$('#name_dialog').html(jsondata.data.page).find('#edit_name_dialog' ).dialog({
+							modal: true,
+							closeOnEscape: true,
+							title:  t('contacts', 'Edit name'),
+							height: 'auto', width: 'auto',
+							buttons: {
+								'Ok':function() {
+									OC.Contacts.Card.saveName(this);
+									$(this).dialog('close');
 								},
-								open: function(event, ui) {
-									// load 'N' property - maybe :-P
-								}
-							});
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-						}
-					});
+								'Cancel':function() { $(this).dialog('close'); }
+							},
+							close: function(event, ui) {
+								$(this).dialog('destroy').remove();
+								$('#name_dialog').remove();
+							},
+							open: function(event, ui) {
+								// load 'N' property - maybe :-P
+							}
+						});
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
+			}
+		},
+		saveName:function(dlg) {
+			//console.log('saveName, id: ' + this.id);
+			var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
+			this.famname = n[0];
+			this.givname = n[1];
+			this.addname = n[2];
+			this.honpre = n[3];
+			this.honsuf = n[4];
+			this.fullname = '';
+
+			$('#n').val(n.join(';'));
+			if(n[3].length > 0) {
+				this.fullname = n[3] + ' ';
+			}
+			this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
+			if(n[4].length > 0) {
+				this.fullname += ', ' + n[4];
+			}
+
+			$('#fn_select option').remove();
+			//$('#fn_select').combobox('value', this.fn);
+			var tmp = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
+			var names = new Array();
+			for(var name in tmp) {
+				if(names.indexOf(tmp[name]) == -1) {
+					names.push(tmp[name]);
 				}
-			},
-			saveName:function(dlg){
-				//console.log('saveName, id: ' + this.id);
-				var n = new Array($(dlg).find('#fam').val().strip_tags(),$(dlg).find('#giv').val().strip_tags(),$(dlg).find('#add').val().strip_tags(),$(dlg).find('#pre').val().strip_tags(),$(dlg).find('#suf').val().strip_tags());
-				this.famname = n[0];
-				this.givname = n[1];
-				this.addname = n[2];
-				this.honpre = n[3];
-				this.honsuf = n[4];
-				this.fullname = '';
+			}
+			$.each(names, function(key, value) {
+				$('#fn_select')
+				.append($('<option></option>')
+				.text(value));
+			});
 
-				$('#n').val(n.join(';'));
-				if(n[3].length > 0) {
-					this.fullname = n[3] + ' ';
+			if(this.id == '') {
+				var aid = $(dlg).find('#aid').val();
+				OC.Contacts.Card.add(n.join(';'), $('#short').text(), aid);
+			} else {
+				OC.Contacts.Card.saveProperty($('#n'));
+			}
+		},
+		loadAddresses:function() {
+			$('#addresses').hide();
+			$('#addressdisplay dl.propertycontainer').remove();
+			var addresscontainer = $('#addressdisplay');
+			for(var adr in this.data.ADR) {
+				addresscontainer.find('dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
+				addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
+				addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+				var adrarray = this.data.ADR[adr]['value'];
+				var adrtxt = '';
+				if(adrarray[0] && adrarray[0].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
 				}
-				this.fullname += n[1] + ' ' + n[2] + ' ' + n[0];
-				if(n[4].length > 0) {
-					this.fullname += ', ' + n[4];
+				if(adrarray[1] && adrarray[1].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
 				}
-
-				$('#fn_select option').remove();
-				//$('#fn_select').combobox('value', this.fn);
-				var tmp = [this.fullname, this.givname + ' ' + this.famname, this.famname + ' ' + this.givname, this.famname + ', ' + this.givname];
-				var names = new Array();
-				for(var name in tmp) {
-					if(names.indexOf(tmp[name]) == -1) {
-						names.push(tmp[name]);
-					}
+				if(adrarray[2] && adrarray[2].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
 				}
-				$.each(names, function(key, value) {
-					$('#fn_select')
-						.append($('<option></option>')
-						.text(value));
-				});
-
-				if(this.id == '') {
-					var aid = $(dlg).find('#aid').val();
-					Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
-				} else {
-					Contacts.UI.Card.saveProperty($('#n'));
+				if((3 in adrarray && 5 in adrarray) && adrarray[3].length > 0 || adrarray[5].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
 				}
-			},
-			loadAddresses:function(){
-				$('#addresses').hide();
-				$('#addressdisplay dl.propertycontainer').remove();
-				var addresscontainer = $('#addressdisplay');
-				for(var adr in this.data.ADR) {
-					addresscontainer.find('dl').first().clone().insertAfter($('#addressdisplay dl').last()).show();
-					addresscontainer.find('dl').last().removeClass('template').addClass('propertycontainer');
-					addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
-					var adrarray = this.data.ADR[adr]['value'];
-					var adrtxt = '';
-					if(adrarray[0] && adrarray[0].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[0].strip_tags() + '</li>';
-					}
-					if(adrarray[1] && adrarray[1].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[1].strip_tags() + '</li>';
-					}
-					if(adrarray[2] && adrarray[2].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[2].strip_tags() + '</li>';
-					}
-					if((3 in adrarray && 5 in adrarray) && adrarray[3].length > 0 || adrarray[5].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[5].strip_tags() + ' ' + adrarray[3].strip_tags() + '</li>';
-					}
-					if(adrarray[4] && adrarray[4].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
-					}
-					if(adrarray[6] && adrarray[6].length > 0) {
-						adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
-					}
-					addresscontainer.find('dl').last().find('.addresslist').html(adrtxt);
-					var types = new Array();
-					var ttypes = new Array();
-					for(var param in this.data.ADR[adr]['parameters']) {
-						if(param.toUpperCase() == 'TYPE') {
-							types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
-							ttypes.push(this.data.ADR[adr]['parameters'][param]);
-						}
-					}
-					addresscontainer.find('dl').last().find('.adr_type_label').text(types.join('/'));
-					addresscontainer.find('dl').last().find('.adr_type').val(ttypes.join(','));
-					addresscontainer.find('dl').last().find('.adr').val(adrarray.join(';'));
-					addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+				if(adrarray[4] && adrarray[4].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[4].strip_tags() + '</li>';
 				}
-				if(addresscontainer.find('dl').length > 1) {
-					$('#addresses').show();
-					$('#contact_communication').show();
+				if(adrarray[6] && adrarray[6].length > 0) {
+					adrtxt = adrtxt + '<li>' + adrarray[6].strip_tags() + '</li>';
 				}
-				return false;
-			},
-			editAddress:function(obj, isnew){
-				var container = undefined;
-				var params = {id: this.id};
-				if(obj === 'new') {
-					isnew = true;
-					$('#addressdisplay dl').first().clone(true).insertAfter($('#addressdisplay dl').last()).show();
-					container = $('#addressdisplay dl').last();
-					container.removeClass('template').addClass('propertycontainer');
-				} else {
-					params['checksum'] = Contacts.UI.checksumFor(obj);
+				addresscontainer.find('dl').last().find('.addresslist').html(adrtxt);
+				var types = new Array();
+				var ttypes = new Array();
+				for(var param in this.data.ADR[adr]['parameters']) {
+					if(param.toUpperCase() == 'TYPE') {
+						types.push(t('contacts', ucwords(this.data.ADR[adr]['parameters'][param].toLowerCase())));
+						ttypes.push(this.data.ADR[adr]['parameters'][param]);
+					}
 				}
-				/* Initialize the address edit dialog */
-				if($('#edit_address_dialog').dialog('isOpen') == true){
-					$('#edit_address_dialog').dialog('moveToTop');
-				}else{
-					$.getJSON(OC.filePath('contacts', 'ajax', 'editaddress.php'),params,function(jsondata){
-						if(jsondata.status == 'success'){
-							$('body').append('<div id="address_dialog"></div>');
-							$('#address_dialog').html(jsondata.data.page).find('#edit_address_dialog' ).dialog({
-								height: 'auto', width: 'auto',
-								buttons: {
-									'Ok':function() {
-										if(isnew) {
-											Contacts.UI.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
-										} else {
-											Contacts.UI.Card.saveAddress(this, obj, isnew);
-										}
-										$(this).dialog('close');
-									},
-									'Cancel':function() {
-										$(this).dialog('close');
-										if(isnew) {
-											container.remove();
-										}
+				addresscontainer.find('dl').last().find('.adr_type_label').text(types.join('/'));
+				addresscontainer.find('dl').last().find('.adr_type').val(ttypes.join(','));
+				addresscontainer.find('dl').last().find('.adr').val(adrarray.join(';'));
+				addresscontainer.find('dl').last().data('checksum', this.data.ADR[adr]['checksum']);
+			}
+			if(addresscontainer.find('dl').length > 1) {
+				$('#addresses').show();
+				$('#contact_communication').show();
+			}
+			return false;
+		},
+		editAddress:function(obj, isnew){
+			var container = undefined;
+			var params = {id: this.id};
+			if(obj === 'new') {
+				isnew = true;
+				$('#addressdisplay dl').first().clone(true).insertAfter($('#addressdisplay dl').last()).show();
+				container = $('#addressdisplay dl').last();
+				container.removeClass('template').addClass('propertycontainer');
+			} else {
+				params['checksum'] = OC.Contacts.checksumFor(obj);
+			}
+			/* Initialize the address edit dialog */
+			if($('#edit_address_dialog').dialog('isOpen') == true){
+				$('#edit_address_dialog').dialog('moveToTop');
+			}else{
+				$.getJSON(OC.filePath('contacts', 'ajax', 'editaddress.php'),params,function(jsondata){
+					if(jsondata.status == 'success'){
+						$('body').append('<div id="address_dialog"></div>');
+						$('#address_dialog').html(jsondata.data.page).find('#edit_address_dialog' ).dialog({
+							height: 'auto', width: 'auto',
+							buttons: {
+								'Ok':function() {
+									if(isnew) {
+										OC.Contacts.Card.saveAddress(this, $('#addressdisplay dl:last-child').find('input').first(), isnew);
+									} else {
+										OC.Contacts.Card.saveAddress(this, obj, isnew);
 									}
+									$(this).dialog('close');
 								},
-								close : function(event, ui) {
-									$(this).dialog('destroy').remove();
-									$('#address_dialog').remove();
-								},
-								open : function(event, ui) {
-									$( "#adr_city" ).autocomplete({
-										source: function( request, response ) {
-											$.ajax({
-												url: "http://ws.geonames.org/searchJSON",
-												dataType: "jsonp",
-												data: {
-													featureClass: "P",
-													style: "full",
-													maxRows: 12,
-													lang: lang,
-													name_startsWith: request.term
-												},
-												success: function( data ) {
-													response( $.map( data.geonames, function( item ) {
-														return {
-															label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
-															value: item.name,
-															country: item.countryName
-														}
-													}));
-												}
-											});
-										},
-										minLength: 2,
-										select: function( event, ui ) {
-											if(ui.item && $('#adr_country').val().trim().length == 0) {
-												$('#adr_country').val(ui.item.country);
+								'Cancel':function() {
+									$(this).dialog('close');
+									if(isnew) {
+										container.remove();
+									}
+								}
+							},
+							close : function(event, ui) {
+								$(this).dialog('destroy').remove();
+								$('#address_dialog').remove();
+							},
+							open : function(event, ui) {
+								$( "#adr_city" ).autocomplete({
+									source: function( request, response ) {
+										$.ajax({
+											url: "http://ws.geonames.org/searchJSON",
+											dataType: "jsonp",
+											data: {
+												featureClass: "P",
+												style: "full",
+												maxRows: 12,
+												lang: lang,
+												name_startsWith: request.term
+											},
+											success: function( data ) {
+												response( $.map( data.geonames, function( item ) {
+													return {
+														label: item.name + (item.adminName1 ? ", " + item.adminName1 : "") + ", " + item.countryName,
+														value: item.name,
+														country: item.countryName
+													}
+												}));
 											}
-										},
-										open: function() {
-											$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-										},
-										close: function() {
-											$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+										});
+									},
+									minLength: 2,
+									select: function( event, ui ) {
+										if(ui.item && $('#adr_country').val().trim().length == 0) {
+											$('#adr_country').val(ui.item.country);
 										}
-									});
-									$('#adr_country').autocomplete({
-										source: function( request, response ) {
-											$.ajax({
-												url: "http://ws.geonames.org/searchJSON",
-												dataType: "jsonp",
-												data: {
-													/*featureClass: "A",*/
-													featureCode: "PCLI",
-													/*countryBias: "true",*/
-													/*style: "full",*/
-													lang: lang,
-													maxRows: 12,
-													name_startsWith: request.term
-												},
-												success: function( data ) {
-													response( $.map( data.geonames, function( item ) {
-														return {
-															label: item.name,
-															value: item.name
-														}
-													}));
-												}
-											});
-										},
-										minLength: 2,
-										select: function( event, ui ) {
-											/*if(ui.item) {
-												$('#adr_country').val(ui.item.country);
+									},
+									open: function() {
+										$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+									},
+									close: function() {
+										$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+									}
+								});
+								$('#adr_country').autocomplete({
+									source: function( request, response ) {
+										$.ajax({
+											url: "http://ws.geonames.org/searchJSON",
+											dataType: "jsonp",
+											data: {
+												/*featureClass: "A",*/
+												featureCode: "PCLI",
+												/*countryBias: "true",*/
+												/*style: "full",*/
+												lang: lang,
+												maxRows: 12,
+												name_startsWith: request.term
+											},
+											success: function( data ) {
+												response( $.map( data.geonames, function( item ) {
+													return {
+														label: item.name,
+														value: item.name
+													}
+												}));
 											}
-											log( ui.item ?
-												"Selected: " + ui.item.label :
-												"Nothing selected, input was " + this.value);*/
-										},
-										open: function() {
-											$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
-										},
-										close: function() {
-											$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+										});
+									},
+									minLength: 2,
+									select: function( event, ui ) {
+										/*if(ui.item) {
+											$('#adr_country').val(ui.item.country);
 										}
-									});
-								}
-							});
-						} else {
-							alert(jsondata.data.message);
-						}
-					});
-				}
-			},
-			saveAddress:function(dlg, obj, isnew){
-				if(isnew) {
-					container = $('#addressdisplay dl').last();
-					obj = container.find('input').first();
-				} else {
-					checksum = Contacts.UI.checksumFor(obj);
-					container = Contacts.UI.propertyContainerFor(obj);
-				}
-				var adr = new Array(
-					$(dlg).find('#adr_pobox').val().strip_tags(),
-					$(dlg).find('#adr_extended').val().strip_tags(),
-					$(dlg).find('#adr_street').val().strip_tags(),
-					$(dlg).find('#adr_city').val().strip_tags(),
-					$(dlg).find('#adr_region').val().strip_tags(),
-					$(dlg).find('#adr_zipcode').val().strip_tags(),
-					$(dlg).find('#adr_country').val().strip_tags()
-				);
-				container.find('.adr').val(adr.join(';'));
-				container.find('.adr_type').val($(dlg).find('#adr_type').val());
-				container.find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
-				Contacts.UI.Card.saveProperty($(container).find('input').first());
-				var adrtxt = '';
-				if(adr[0].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
-				}
-				if(adr[1].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
-				}
-				if(adr[2].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
-				}
-				if(adr[3].length > 0 || adr[5].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
-				}
-				if(adr[4].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
-				}
-				if(adr[6].length > 0) {
-					adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
-				}
-				container.find('.addresslist').html(adrtxt);
-			},
-			uploadPhoto:function(filelist) {
-				if(!filelist) {
-					OC.dialogs.alert(t('contacts','No files selected for upload.'), t('contacts', 'Error'));
-					return;
-				}
-				var file = filelist[0];
-				var target = $('#file_upload_target');
-				var form = $('#file_upload_form');
-				var totalSize=0;
-				if(file.size > $('#max_upload').val()){
-					OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts', 'Error'));
-					return;
-				} else {
-					target.load(function(){
-						var response=jQuery.parseJSON(target.contents().text());
-						if(response != undefined && response.status == 'success'){
-							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
-							//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
-						}else{
-							OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-						}
-					});
-					form.submit();
-				}
-			},
-			loadPhotoHandlers:function() {
-				var phototools = $('#phototools');
-				phototools.find('li a').tipsy('hide');
-				phototools.find('li a').tipsy();
-				if(this.data.PHOTO) {
-					phototools.find('.delete').click(function() {
-						$(this).tipsy('hide');
-						Contacts.UI.Card.deleteProperty($('#contacts_details_photo'), 'single');
-						$(this).hide();
-					});
-					phototools.find('.edit').click(function() {
-						$(this).tipsy('hide');
-						Contacts.UI.Card.editCurrentPhoto();
-					});
-					phototools.find('.delete').show();
-					phototools.find('.edit').show();
-				} else {
-					phototools.find('.delete').hide();
-					phototools.find('.edit').hide();
-				}
-			},
-			cloudPhotoSelected:function(path){
-				$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){
-					if(jsondata.status == 'success'){
-						//alert(jsondata.data.page);
-						Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
-						$('#edit_photo_dialog_img').html(jsondata.data.page);
-					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			},
-			loadPhoto:function(refresh){
-				var self = this;
-				var refreshstr = (refresh?'&refresh=1'+Math.random():'')
-				$('#phototools li a').tipsy('hide');
-				var wrapper = $('#contacts_details_photo_wrapper');
-				wrapper.addClass('loading').addClass('wait');
-				delete this.photo;
-				this.photo = new Image();
-				$(this.photo).load(function () {
-					$('img.contacts_details_photo').remove()
-					$(this).addClass('contacts_details_photo');
-					wrapper.removeClass('loading').removeClass('wait');
-					$(this).insertAfter($('#phototools')).fadeIn();
-				}).error(function () {
-					// notify the user that the image could not be loaded
-					Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
-				}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
-				this.loadPhotoHandlers()
-			},
-			editCurrentPhoto:function(){
-				$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
-					if(jsondata.status == 'success'){
-						//alert(jsondata.data.page);
-						Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
-						$('#edit_photo_dialog_img').html(jsondata.data.page);
-					}
-					else{
-						wrapper.removeClass('wait');
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			},
-			editPhoto:function(id, tmpkey){
-				//alert('editPhoto: ' + tmpkey);
-				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id, 'requesttoken':requesttoken},function(jsondata){
-					if(jsondata.status == 'success'){
-						//alert(jsondata.data.page);
-						$('#edit_photo_dialog_img').html(jsondata.data.page);
-					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+										log( ui.item ?
+											"Selected: " + ui.item.label :
+											"Nothing selected, input was " + this.value);*/
+									},
+									open: function() {
+										$( this ).removeClass( "ui-corner-all" ).addClass( "ui-corner-top" );
+									},
+									close: function() {
+										$( this ).removeClass( "ui-corner-top" ).addClass( "ui-corner-all" );
+									}
+								});
+							}
+						});
+					} else {
+						alert(jsondata.data.message);
 					}
 				});
-				if($('#edit_photo_dialog').dialog('isOpen') == true){
-					$('#edit_photo_dialog').dialog('moveToTop');
-				} else {
-					$('#edit_photo_dialog').dialog('open');
-				}
-			},
-			savePhoto:function(){
-				var target = $('#crop_target');
-				var form = $('#cropform');
-				var wrapper = $('#contacts_details_photo_wrapper');
-				var self = this;
-				wrapper.addClass('wait');
-				form.submit();
+			}
+		},
+		saveAddress:function(dlg, obj, isnew){
+			if(isnew) {
+				container = $('#addressdisplay dl').last();
+				obj = container.find('input').first();
+			} else {
+				checksum = OC.Contacts.checksumFor(obj);
+				container = OC.Contacts.propertyContainerFor(obj);
+			}
+			var adr = new Array(
+				$(dlg).find('#adr_pobox').val().strip_tags(),
+				$(dlg).find('#adr_extended').val().strip_tags(),
+				$(dlg).find('#adr_street').val().strip_tags(),
+				$(dlg).find('#adr_city').val().strip_tags(),
+				$(dlg).find('#adr_region').val().strip_tags(),
+				$(dlg).find('#adr_zipcode').val().strip_tags(),
+				$(dlg).find('#adr_country').val().strip_tags()
+			);
+			container.find('.adr').val(adr.join(';'));
+			container.find('.adr_type').val($(dlg).find('#adr_type').val());
+			container.find('.adr_type_label').html(t('contacts',ucwords($(dlg).find('#adr_type').val().toLowerCase())));
+			OC.Contacts.Card.saveProperty($(container).find('input').first());
+			var adrtxt = '';
+			if(adr[0].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[0] + '</li>';
+			}
+			if(adr[1].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[1] + '</li>';
+			}
+			if(adr[2].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[2] + '</li>';
+			}
+			if(adr[3].length > 0 || adr[5].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[5] + ' ' + adr[3] + '</li>';
+			}
+			if(adr[4].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[4] + '</li>';
+			}
+			if(adr[6].length > 0) {
+				adrtxt = adrtxt + '<li>' + adr[6] + '</li>';
+			}
+			container.find('.addresslist').html(adrtxt);
+		},
+		uploadPhoto:function(filelist) {
+			if(!filelist) {
+				OC.dialogs.alert(t('contacts','No files selected for upload.'), t('contacts', 'Error'));
+				return;
+			}
+			var file = filelist[0];
+			var target = $('#file_upload_target');
+			var form = $('#file_upload_form');
+			var totalSize=0;
+			if(file.size > $('#max_upload').val()){
+				OC.dialogs.alert(t('contacts','The file you are trying to upload exceed the maximum size for file uploads on this server.'), t('contacts', 'Error'));
+				return;
+			} else {
 				target.load(function(){
-					var response=jQuery.parseJSON(target.contents().text());
+				var response=jQuery.parseJSON(target.contents().text());
 					if(response != undefined && response.status == 'success'){
-						// load cropped photo.
-						self.loadPhoto(true);
-						Contacts.UI.Card.data.PHOTO = true;
+						OC.Contacts.Card.editPhoto(response.data.id, response.data.tmp);
+						//alert('File: ' + file.tmp + ' ' + file.name + ' ' + file.mime);
 					}else{
 						OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
-						wrapper.removeClass('wait');
 					}
 				});
-				Contacts.UI.Contacts.refreshThumbnail(this.id);
-			},
-			addMail:function() {
-				//alert('addMail');
-				var emaillist = $('#emaillist');
-				emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
-				emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
-				emaillist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
-				emaillist.find('li:last-child').find('input[type="email"]').focus();
-				return false;
-			},
-			loadMails:function() {
-				$('#emails').hide();
-				$('#emaillist li.propertycontainer').remove();
-				for(var mail in this.data.EMAIL) {
-					this.addMail();
-					//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
-					$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
-					$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
-					for(var param in this.data.EMAIL[mail]['parameters']) {
-						if(param.toUpperCase() == 'PREF') {
-							$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
-						}
-						else if(param.toUpperCase() == 'TYPE') {
-							for(etype in this.data.EMAIL[mail]['parameters'][param]) {
-								var et = this.data.EMAIL[mail]['parameters'][param][etype];
-								$('#emaillist li:last-child').find('select option').each(function(){
-									if($.inArray($(this).val().toUpperCase(), et.toUpperCase().split(',')) > -1) {
-										$(this).attr('selected', 'selected');
-									}
-								});
-							}
-						}
-					}
+				form.submit();
+			}
+		},
+		loadPhotoHandlers:function() {
+			var phototools = $('#phototools');
+			phototools.find('li a').tipsy('hide');
+			phototools.find('li a').tipsy();
+			if(this.data.PHOTO) {
+				phototools.find('.delete').click(function() {
+					$(this).tipsy('hide');
+					OC.Contacts.Card.deleteProperty($('#contacts_details_photo'), 'single');
+					$(this).hide();
+				});
+				phototools.find('.edit').click(function() {
+					$(this).tipsy('hide');
+					OC.Contacts.Card.editCurrentPhoto();
+				});
+				phototools.find('.delete').show();
+				phototools.find('.edit').show();
+			} else {
+				phototools.find('.delete').hide();
+				phototools.find('.edit').hide();
+			}
+		},
+		cloudPhotoSelected:function(path){
+			$.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':OC.Contacts.Card.id},function(jsondata){
+				if(jsondata.status == 'success'){
+					//alert(jsondata.data.page);
+					OC.Contacts.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
+					$('#edit_photo_dialog_img').html(jsondata.data.page);
 				}
-				if($('#emaillist li').length > 1) {
-					$('#emails').show();
-					$('#contact_communication').show();
+				else{
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 				}
-
-				$('#emaillist li:last-child').find('input[type="text"]').focus();
-				return false;
-			},
-			addPhone:function() {
-				var phonelist = $('#phonelist');
-				phonelist.find('li.template:first-child').clone(true).appendTo(phonelist); //.show();
-				phonelist.find('li.template:last-child').find('select').addClass('contacts_property');
-				phonelist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
-				phonelist.find('li:last-child').find('input[type="text"]').focus();
-				phonelist.find('li:last-child').find('select').multiselect({
-														noneSelectedText: t('contacts', 'Select type'),
-														header: false,
-														selectedList: 4,
-														classes: 'typelist'
-													});
-				phonelist.find('li:last-child').show();
-				return false;
-			},
-			loadPhones:function() {
-				$('#phones').hide();
-				$('#phonelist li.propertycontainer').remove();
-				var phonelist = $('#phonelist');
-				for(var phone in this.data.TEL) {
-					this.addPhone();
-					phonelist.find('li:last-child').find('select').multiselect('destroy');
-					phonelist.find('li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
-					phonelist.find('li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
-					for(var param in this.data.TEL[phone]['parameters']) {
-						if(param.toUpperCase() == 'PREF') {
-							phonelist.find('li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
-						}
-						else if(param.toUpperCase() == 'TYPE') {
-							for(ptype in this.data.TEL[phone]['parameters'][param]) {
-								var pt = this.data.TEL[phone]['parameters'][param][ptype];
-								phonelist.find('li:last-child').find('select option').each(function(){
-									//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
-									if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
-										$(this).attr('selected', 'selected');
-									}
-								});
-							}
-						}
-					}
-					phonelist.find('li:last-child').find('select').multiselect({
-											noneSelectedText: t('contacts', 'Select type'),
-											header: false,
-											selectedList: 4,
-											classes: 'typelist'
-										});
+			});
+		},
+		loadPhoto:function(refresh){
+			var self = this;
+			var refreshstr = (refresh?'&refresh=1'+Math.random():'')
+			$('#phototools li a').tipsy('hide');
+			var wrapper = $('#contacts_details_photo_wrapper');
+			wrapper.addClass('loading').addClass('wait');
+			delete this.photo;
+			this.photo = new Image();
+			$(this.photo).load(function () {
+				$('img.contacts_details_photo').remove()
+				$(this).addClass('contacts_details_photo');
+				wrapper.removeClass('loading').removeClass('wait');
+				$(this).insertAfter($('#phototools')).fadeIn();
+			}).error(function () {
+				// notify the user that the image could not be loaded
+				OC.Contacts.notify({message:t('contacts','Error loading profile picture.')});
+			}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
+			this.loadPhotoHandlers()
+		},
+		editCurrentPhoto:function(){
+			$.getJSON(OC.filePath('contacts', 'ajax', 'currentphoto.php'),{'id':this.id},function(jsondata){
+				if(jsondata.status == 'success'){
+					//alert(jsondata.data.page);
+					OC.Contacts.Card.editPhoto(jsondata.data.id, jsondata.data.tmp)
+					$('#edit_photo_dialog_img').html(jsondata.data.page);
 				}
-				if(phonelist.find('li').length > 1) {
-					$('#phones').show();
-					$('#contact_communication').show();
+				else{
+					wrapper.removeClass('wait');
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 				}
-				return false;
-			},
+			});
 		},
-		Contacts:{
-			contacts:{},
-			deletionQueue:[],
-			batchnum:50,
-			warnNotDeleted:function(e) {
-				e = e || window.event;
-				var warn = t('contacts', 'Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted.');
-				if (e) {
-					e.returnValue = String(warn);
+		editPhoto:function(id, tmpkey){
+			//alert('editPhoto: ' + tmpkey);
+			$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmpkey':tmpkey,'id':this.id, 'requesttoken':requesttoken},function(jsondata){
+				if(jsondata.status == 'success'){
+					//alert(jsondata.data.page);
+					$('#edit_photo_dialog_img').html(jsondata.data.page);
 				}
-				if(Contacts.UI.Contacts.deletionQueue.length > 0) {
-					setTimeout(Contacts.UI.Contacts.deleteFilesInQueue, 1);
+				else{
+					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 				}
-				return warn;
-			},
-			deleteFilesInQueue:function() {
-				var queue = Contacts.UI.Contacts.deletionQueue;
-				if(queue.length > 0) {
-					Contacts.UI.notify({cancel:true});
-					while(queue.length > 0) {
-						var id = queue.pop();
-						if(id) {
-							Contacts.UI.Card.doDelete(id, false);
-						}
-					}
+			});
+			if($('#edit_photo_dialog').dialog('isOpen') == true){
+				$('#edit_photo_dialog').dialog('moveToTop');
+			} else {
+				$('#edit_photo_dialog').dialog('open');
+			}
+		},
+		savePhoto:function(){
+			var target = $('#crop_target');
+			var form = $('#cropform');
+			var wrapper = $('#contacts_details_photo_wrapper');
+			var self = this;
+			wrapper.addClass('wait');
+			form.submit();
+			target.load(function(){
+				var response=jQuery.parseJSON(target.contents().text());
+				if(response != undefined && response.status == 'success'){
+					// load cropped photo.
+					self.loadPhoto(true);
+					OC.Contacts.Card.data.PHOTO = true;
+				}else{
+					OC.dialogs.alert(response.data.message, t('contacts', 'Error'));
+					wrapper.removeClass('wait');
 				}
-			},
-			getContact:function(id) {
-				if(!this.contacts[id]) {
-					this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
-						if(!this.contacts[id]) {
-							self = this;
-							$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
-								if(jsondata.status == 'success'){
-									self.contacts[id] = self.insertContact({data:jsondata.data});
-								}
-								else{
-									OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+			});
+			OC.Contacts.Contacts.refreshThumbnail(this.id);
+		},
+		addMail:function() {
+			//alert('addMail');
+			var emaillist = $('#emaillist');
+			emaillist.find('li.template:first-child').clone(true).appendTo(emaillist).show().find('a .tip').tipsy();
+			emaillist.find('li.template:last-child').find('select').addClass('contacts_property');
+			emaillist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
+			emaillist.find('li:last-child').find('input[type="email"]').focus();
+			return false;
+		},
+		loadMails:function() {
+			$('#emails').hide();
+			$('#emaillist li.propertycontainer').remove();
+			for(var mail in this.data.EMAIL) {
+				this.addMail();
+				//$('#emaillist li:first-child').clone().appendTo($('#emaillist')).show();
+				$('#emaillist li:last-child').data('checksum', this.data.EMAIL[mail]['checksum'])
+				$('#emaillist li:last-child').find('input[type="email"]').val(this.data.EMAIL[mail]['value']);
+				for(var param in this.data.EMAIL[mail]['parameters']) {
+					if(param.toUpperCase() == 'PREF') {
+						$('#emaillist li:last-child').find('input[type="checkbox"]').attr('checked', 'checked')
+					}
+					else if(param.toUpperCase() == 'TYPE') {
+						for(etype in this.data.EMAIL[mail]['parameters'][param]) {
+							var et = this.data.EMAIL[mail]['parameters'][param][etype];
+							$('#emaillist li:last-child').find('select option').each(function(){
+								if($.inArray($(this).val().toUpperCase(), et.toUpperCase().split(',')) > -1) {
+									$(this).attr('selected', 'selected');
 								}
 							});
 						}
+					}
 				}
-				return this.contacts[id];
-			},
-			drop:function(event, ui) {
-				var dragitem = ui.draggable, droptarget = $(this);
-				if(dragitem.is('li')) {
-					Contacts.UI.Contacts.dropContact(event, dragitem, droptarget);
-				} else {
-					Contacts.UI.Contacts.dropAddressbook(event, dragitem, droptarget);
-				}
-			},
-			dropContact:function(event, dragitem, droptarget) {
-				if(dragitem.data('bookid') == droptarget.data('id')) {
-					return false;
-				}
-				var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
-				$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
-					function(jsondata){
-						if(jsondata.status == 'success'){
-							dragitem.attr('data-bookid', droptarget.data('id'))
-							dragitem.data('bookid', droptarget.data('id'));
-							Contacts.UI.Contacts.insertContact({
-								contactlist:droplist,
-								contact:dragitem.detach()
+			}
+			if($('#emaillist li').length > 1) {
+				$('#emails').show();
+				$('#contact_communication').show();
+			}
+			$('#emaillist li:last-child').find('input[type="text"]').focus();
+			return false;
+		},
+		addPhone:function() {
+			var phonelist = $('#phonelist');
+			phonelist.find('li.template:first-child').clone(true).appendTo(phonelist); //.show();
+			phonelist.find('li.template:last-child').find('select').addClass('contacts_property');
+			phonelist.find('li.template:last-child').removeClass('template').addClass('propertycontainer');
+			phonelist.find('li:last-child').find('input[type="text"]').focus();
+			phonelist.find('li:last-child').find('select').multiselect({
+												noneSelectedText: t('contacts', 'Select type'),
+													header: false,
+													selectedList: 4,
+													classes: 'typelist'
+												});
+			phonelist.find('li:last-child').show();
+			return false;
+		},
+		loadPhones:function() {
+			$('#phones').hide();
+			$('#phonelist li.propertycontainer').remove();
+			var phonelist = $('#phonelist');
+			for(var phone in this.data.TEL) {
+				this.addPhone();
+				phonelist.find('li:last-child').find('select').multiselect('destroy');
+				phonelist.find('li:last-child').data('checksum', this.data.TEL[phone]['checksum'])
+				phonelist.find('li:last-child').find('input[type="text"]').val(this.data.TEL[phone]['value']);
+				for(var param in this.data.TEL[phone]['parameters']) {
+					if(param.toUpperCase() == 'PREF') {
+						phonelist.find('li:last-child').find('input[type="checkbox"]').attr('checked', 'checked');
+					}
+					else if(param.toUpperCase() == 'TYPE') {
+						for(ptype in this.data.TEL[phone]['parameters'][param]) {
+							var pt = this.data.TEL[phone]['parameters'][param][ptype];
+							phonelist.find('li:last-child').find('select option').each(function(){
+								//if ($(this).val().toUpperCase() == pt.toUpperCase()) {
+								if ($.inArray($(this).val().toUpperCase(), pt.toUpperCase().split(',')) > -1) {
+									$(this).attr('selected', 'selected');
+								}
 							});
-							Contacts.UI.Contacts.scrollTo(dragitem.data('id'));
-						} else {
-							OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 						}
-				});
-			},
-			dropAddressbook:function(event, dragitem, droptarget) {
-				alert('Dropping address books not implemented yet');
-			},
-			/**
-			 * @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
-			 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties
-			 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
-			 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
-			 */
-			insertContact:function(params) {
-				var id, bookid;
-				if(!params.contactlist) {
-					// FIXME: Check if contact really exists.
-					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-					id = params.data ? params.data.id : params.contact.data('id');
-					params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
-				}
-				if(!params.contacts) {
-					bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
-					id = params.data ? params.data.id : params.contact.data('id');
-					params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
-				}
-				var contact = params.data
-					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid+'" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='+params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'+params.data.displayname+'</a></li>')
-					: params.contact;
-				var added = false;
-				var name = params.data ? params.data.displayname.toLowerCase() : contact.find('a').text().toLowerCase();
-				if(params.contacts) {
-					params.contacts.each(function() {
-						if ($(this).text().toLowerCase() > name) {
-							$(this).before(contact);
-							added = true;
-							return false;
-						}
-					});
+					}
 				}
-				if(!added || !params.contacts) {
-					params.contactlist.append(contact);
+				phonelist.find('li:last-child').find('select').multiselect({
+										noneSelectedText: t('contacts', 'Select type'),
+										header: false,
+										selectedList: 4,
+										classes: 'typelist'
+									});
+			}
+			if(phonelist.find('li').length > 1) {
+				$('#phones').show();
+				$('#contact_communication').show();
+			}
+			return false;
+		},
+	},
+	Contacts:{
+		contacts:{},
+		deletionQueue:[],
+		batchnum:50,
+		warnNotDeleted:function(e) {
+			e = e || window.event;
+			var warn = t('contacts', 'Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted.');
+			if (e) {
+				e.returnValue = String(warn);
+			}
+			if(OC.Contacts.Contacts.deletionQueue.length > 0) {
+				setTimeout(OC.Contacts.Contacts.deleteFilesInQueue, 1);
+			}
+			return warn;
+		},
+		deleteFilesInQueue:function() {
+			var queue = OC.Contacts.Contacts.deletionQueue;
+			if(queue.length > 0) {
+				OC.Contacts.notify({cancel:true});
+				while(queue.length > 0) {
+					var id = queue.pop();
+					if(id) {
+						OC.Contacts.Card.doDelete(id, false);
+					}
 				}
-				//this.contacts[id] = contact;
-				return contact;
-			},
-			doImport:function(file, aid){
-				$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
-					function(jsondata){
-						if(jsondata.status != 'success'){
-							Contacts.UI.notify({message:jsondata.data.message});
-						}
-				});
+			}
+		},
+		getContact:function(id) {
+			if(!this.contacts[id]) {
+				this.contacts[id] = $('#contacts li[data-id="'+id+'"]');
+					if(!this.contacts[id]) {
+						self = this;
+						$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
+							if(jsondata.status == 'success'){
+								self.contacts[id] = self.insertContact({data:jsondata.data});
+							}
+							else{
+								OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+							}
+						});
+					}
+			}
+			return this.contacts[id];
+		},
+		drop:function(event, ui) {
+			var dragitem = ui.draggable, droptarget = $(this);
+			if(dragitem.is('li')) {
+				OC.Contacts.Contacts.dropContact(event, dragitem, droptarget);
+			} else {
+				OC.Contacts.Contacts.dropAddressbook(event, dragitem, droptarget);
+			}
+		},
+		dropContact:function(event, dragitem, droptarget) {
+			if(dragitem.data('bookid') == droptarget.data('id')) {
 				return false;
-			},
-			next:function(reverse) {
-				// TODO: Check if we're last-child/first-child and jump to next/prev address book.
-				var curlistitem = $('#contacts li[data-id="'+Contacts.UI.Card.id+'"]');
-				var newlistitem = reverse ? curlistitem.prev('li') : curlistitem.next('li');
-				if(newlistitem) {
-					curlistitem.removeClass('active');
-					Contacts.UI.Card.update({
-						cid:newlistitem.data('id'),
-						aid:newlistitem.data('bookid')
-					});
-				}
-			},
-			previous:function() {
-				this.next(true);
-			},
-			// Reload the contacts list.
-			update:function(params){
-				if(!params) { params = {}; }
-				if(!params.start) {
-					if(params.aid) {
-						$('#contacts h3[data-id="'+params.aid+'"],#contacts ul[data-id="'+params.aid+'"]').remove();
+			}
+			var droplist = (droptarget.is('ul'))?droptarget:droptarget.next();
+			$.post(OC.filePath('contacts', 'ajax', 'movetoaddressbook.php'), { ids: dragitem.data('id'), aid: droptarget.data('id') },
+				function(jsondata){
+					if(jsondata.status == 'success'){
+						dragitem.attr('data-bookid', droptarget.data('id'))
+						dragitem.data('bookid', droptarget.data('id'));
+						OC.Contacts.Contacts.insertContact({
+							contactlist:droplist,
+							contact:dragitem.detach()
+						});
+						OC.Contacts.Contacts.scrollTo(dragitem.data('id'));
 					} else {
-						$('#contacts').empty();
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
-				}
-				self = this;
-				console.log('update: ' + params.cid + ' ' + params.aid + ' ' + params.start);
-				var firstrun = false;
-				var opts = {};
-				opts['startat'] = (params.start?params.start:0);
+			});
+		},
+		dropAddressbook:function(event, dragitem, droptarget) {
+			alert('Dropping address books not implemented yet');
+		},
+		/**
+		 * @params params An object with the properties 'contactlist':a jquery object of the ul to insert into,
+		 * 'contacts':a jquery object of all items in the list and either 'data': an object with the properties
+		 * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
+		 * If 'contactlist' or 'contacts' aren't defined they will be search for based in the properties in 'data'.
+		 */
+		insertContact:function(params) {
+			var id, bookid;
+			if(!params.contactlist) {
+				// FIXME: Check if contact really exists.
+				bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+				id = params.data ? params.data.id : params.contact.data('id');
+				params.contactlist = $('#contacts ul[data-id="'+bookid+'"]');
+			}
+			if(!params.contacts) {
+				bookid = params.data ? params.data.addressbookid : params.contact.data('bookid');
+				id = params.data ? params.data.id : params.contact.data('id');
+				params.contacts = $('#contacts ul[data-id="'+bookid+'"] li');
+			}
+			var contact = params.data
+					? $('<li data-id="'+params.data.id+'" data-bookid="'+params.data.addressbookid
+						+ '" role="button"><a href="'+OC.linkTo('contacts', 'index.php')+'&id='
+						+ params.data.id+'"  style="background: url('+OC.filePath('contacts', '', 'thumbnail.php')
+						+ '?id='+params.data.id+') no-repeat scroll 0% 0% transparent;">'
+						+ params.data.displayname+'</a></li>')
+					: params.contact;
+			var added = false;
+			var name = params.data ? params.data.displayname.toLowerCase() : contact.find('a').text().toLowerCase();
+			if(params.contacts) {
+				params.contacts.each(function() {
+					if ($(this).text().toLowerCase() > name) {
+						$(this).before(contact);
+						added = true;
+						return false;
+					}
+				});
+			}
+			if(!added || !params.contacts) {
+				params.contactlist.append(contact);
+			}
+			//this.contacts[id] = contact;
+			return contact;
+		},
+		doImport:function(file, aid){
+			$.post(OC.filePath('contacts', '', 'import.php'), { id: aid, file: file, fstype: 'OC_FilesystemView' },
+				function(jsondata){
+					if(jsondata.status != 'success'){
+						OC.Contacts.notify({message:jsondata.data.message});
+					}
+			});
+			return false;
+		},
+		next:function(reverse) {
+			// TODO: Check if we're last-child/first-child and jump to next/prev address book.
+			var curlistitem = $('#contacts li[data-id="'+OC.Contacts.Card.id+'"]');
+			var newlistitem = reverse ? curlistitem.prev('li') : curlistitem.next('li');
+			if(newlistitem) {
+				curlistitem.removeClass('active');
+				OC.Contacts.Card.update({
+					cid:newlistitem.data('id'),
+					aid:newlistitem.data('bookid')
+				});
+			}
+		},
+		previous:function() {
+			this.next(true);
+		},
+		// Reload the contacts list.
+		update:function(params){
+			if(!params) { params = {}; }
+			if(!params.start) {
 				if(params.aid) {
-					opts['aid'] = params.aid;
+					$('#contacts h3[data-id="'+params.aid+'"],#contacts ul[data-id="'+params.aid+'"]').remove();
+				} else {
+					$('#contacts').empty();
 				}
-				$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
-					if(jsondata.status == 'success'){
-						var books = jsondata.data.entries;
-						$.each(books, function(b, book) {
-							if($('#contacts h3[data-id="'+b+'"]').length == 0) {
-								firstrun = true;
-								if($('#contacts h3').length == 0) {
-									$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
-								} else {
-									if(!$('#contacts h3[data-id="'+b+'"]').length) {
-										var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
-										var added = false;
-										$('#contacts h3').each(function(){
-											if ($(this).text().toLowerCase() > book.displayname.toLowerCase()) {
-												$(this).before(item).fadeIn('fast');
-												added = true;
-												return false;
-											}
-										});
-										if(!added) {
-											$('#contacts').append(item);
+			}
+			self = this;
+			console.log('update: ' + params.cid + ' ' + params.aid + ' ' + params.start);
+			var firstrun = false;
+			var opts = {};
+			opts['startat'] = (params.start?params.start:0);
+			if(params.aid) {
+				opts['aid'] = params.aid;
+			}
+			$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
+				if(jsondata.status == 'success'){
+					var books = jsondata.data.entries;
+					$.each(books, function(b, book) {
+						if($('#contacts h3[data-id="'+b+'"]').length == 0) {
+							firstrun = true;
+							if($('#contacts h3').length == 0) {
+								$('#contacts').html('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'
+									+ b+'">'+book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>');
+							} else {
+								if(!$('#contacts h3[data-id="'+b+'"]').length) {
+									var item = $('<h3 class="addressbook" contextmenu="addressbookmenu" data-id="'+b+'">'
+										+ book.displayname+'</h3><ul class="contacts hidden" data-id="'+b+'"></ul>')
+									var added = false;
+									$('#contacts h3').each(function(){
+										if ($(this).text().toLowerCase() > book.displayname.toLowerCase()) {
+											$(this).before(item).fadeIn('fast');
+											added = true;
+											return false;
 										}
-
-									}
-								}
-								$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
-									$('#contacts h3').removeClass('active');
-									$(this).addClass('active');
-									$('#contacts ul[data-id="'+b+'"]').slideToggle(300);
-									return false;
-								});
-								var accept = 'li:not([data-bookid="'+b+'"]),h3:not([data-id="'+b+'"])';
-								$('#contacts h3[data-id="'+b+'"],#contacts ul[data-id="'+b+'"]').droppable({
-									drop: Contacts.UI.Contacts.drop,
-									activeClass: 'ui-state-hover',
-									accept: accept
-								});
-							}
-							var contactlist = $('#contacts ul[data-id="'+b+'"]');
-							var contacts = $('#contacts ul[data-id="'+b+'"] li');
-							for(var c in book.contacts) {
-								if(book.contacts[c].id == undefined) { continue; }
-								if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
-									var contact = Contacts.UI.Contacts.insertContact({contactlist:contactlist, contacts:contacts, data:book.contacts[c]});
-									if(c == self.batchnum-10) {
-										contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
-											$(this).unbind(event);
-											var bookid = $(this).data('bookid');
-											var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
-											if (isInView && numsiblings >= self.batchnum) {
-												console.log('This would be a good time to load more contacts.');
-												Contacts.UI.Contacts.update({cid:params.cid, aid:bookid, start:$('#contacts li[data-bookid="'+bookid+'"]').length});
-											}
-										});
+									});
+									if(!added) {
+										$('#contacts').append(item);
 									}
 								}
 							}
-						});
-						if($('#contacts h3').length > 1) {
-							$('#contacts li,#contacts h3').draggable({
-								distance: 10,
-								revert: 'invalid',
-								axis: 'y', containment: '#contacts',
-								scroll: true, scrollSensitivity: 40,
-								opacity: 0.7, helper: 'clone'
+							$('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
+								$('#contacts h3').removeClass('active');
+								$(this).addClass('active');
+								$('#contacts ul[data-id="'+b+'"]').slideToggle(300);
+								return false;
+							});
+							var accept = 'li:not([data-bookid="'+b+'"]),h3:not([data-id="'+b+'"])';
+							$('#contacts h3[data-id="'+b+'"],#contacts ul[data-id="'+b+'"]').droppable({
+								drop: OC.Contacts.Contacts.drop,
+								activeClass: 'ui-state-hover',
+								accept: accept
 							});
-						} else {
-							$('#contacts h3').first().addClass('active');
 						}
-						if(opts['startat'] == 0) { // only update card on first load.
-							Contacts.UI.Card.update(params);
+						var contactlist = $('#contacts ul[data-id="'+b+'"]');
+						var contacts = $('#contacts ul[data-id="'+b+'"] li');
+						for(var c in book.contacts) {
+							if(book.contacts[c].id == undefined) { continue; }
+							if(!$('#contacts li[data-id="'+book.contacts[c]['id']+'"]').length) {
+								var contact = OC.Contacts.Contacts.insertContact({contactlist:contactlist, contacts:contacts, data:book.contacts[c]});
+								if(c == self.batchnum-10) {
+									contact.bind('inview', function(event, isInView, visiblePartX, visiblePartY) {
+										$(this).unbind(event);
+										var bookid = $(this).data('bookid');
+										var numsiblings = $('.contacts li[data-bookid="'+bookid+'"]').length;
+										if (isInView && numsiblings >= self.batchnum) {
+											console.log('This would be a good time to load more contacts.');
+											OC.Contacts.Contacts.update({cid:params.cid, aid:bookid, start:$('#contacts li[data-bookid="'+bookid+'"]').length});
+										}
+									});
+								}
+							}
 						}
+					});
+					if($('#contacts h3').length > 1) {
+						$('#contacts li,#contacts h3').draggable({
+							distance: 10,
+							revert: 'invalid',
+							axis: 'y', containment: '#contacts',
+							scroll: true, scrollSensitivity: 40,
+							opacity: 0.7, helper: 'clone'
+						});
+					} else {
+						$('#contacts h3').first().addClass('active');
 					}
-					else{
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					if(opts['startat'] == 0) { // only update card on first load.
+						OC.Contacts.Card.update(params);
 					}
-				});
-			},
-			refreshThumbnail:function(id){
-				var item = $('.contacts li[data-id="'+id+'"]').find('a');
-				item.html(Contacts.UI.Card.fn);
-				item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
-			},
-			scrollTo:function(id){
-				var item = $('#contacts li[data-id="'+id+'"]');
-				if(item && $.isNumeric(item.offset().top)) {
-					console.log('scrollTo ' + parseInt(item.offset().top));
-					$('#contacts').animate({
-						scrollTop: parseInt(item.offset()).top-40}, 'slow','swing');
+				} else {
+					OC.Contacts.notify({message:t('contacts', 'Error')+': '+jsondata.data.message});
 				}
+			});
+		},
+		refreshThumbnail:function(id){
+			var item = $('.contacts li[data-id="'+id+'"]').find('a');
+			item.html(OC.Contacts.Card.fn);
+			item.css('background','url('+OC.filePath('contacts', '', 'thumbnail.php')+'?id='+id+'&refresh=1'+Math.random()+') no-repeat');
+		},
+		scrollTo:function(id){
+			var item = $('#contacts li[data-id="'+id+'"]');
+			if(item && $.isNumeric(item.offset().top)) {
+				console.log('scrollTo ' + parseInt(item.offset().top));
+				$('#contacts').animate({
+					scrollTop: parseInt(item.offset()).top-40}, 'slow','swing');
 			}
 		}
 	}
 }
 $(document).ready(function(){
 
-	OCCategories.changed = Contacts.UI.Card.categoriesChanged;
+	OCCategories.changed = OC.Contacts.Card.categoriesChanged;
 	OCCategories.app = 'contacts';
 
-	//$('#chooseaddressbook').on('click keydown', Contacts.UI.Addressbooks.overview);
+	//$('#chooseaddressbook').on('click keydown', OC.Contacts.Addressbooks.overview);
 	$('#bottomcontrols .settings').on('click keydown', function() {
 		try {
 			OC.appSettings({appid:'contacts', loadJS:true, cache:false});
@@ -1656,7 +1646,7 @@ $(document).ready(function(){
 	$('#bottomcontrols .import').click(function() {
 		$('#import_upload_start').trigger('click');
 	});
-	$('#contacts_newcontact').on('click keydown', Contacts.UI.Card.editNew);
+	$('#contacts_newcontact').on('click keydown', OC.Contacts.Card.editNew);
 
 	var ninjahelp = $('#ninjahelp');
 
@@ -1668,7 +1658,7 @@ $(document).ready(function(){
 		console.log(event.which + ' ' + event.target.nodeName);
 		if(event.target.nodeName.toUpperCase() != 'BODY'
 			|| $('#contacts li').length == 0
-			|| !Contacts.UI.Card.id) {
+			|| !OC.Contacts.Card.id) {
 			return;
 		}
 		/**
@@ -1683,33 +1673,33 @@ $(document).ready(function(){
 				break;
 			case 46:
 				if(event.shiftKey) {
-					Contacts.UI.Card.delayedDelete();
+					OC.Contacts.Card.delayedDelete();
 				}
 				break;
 			case 32: // space
 				if(event.shiftKey) {
-					Contacts.UI.Contacts.previous();
+					OC.Contacts.Contacts.previous();
 					break;
 				}
 			case 40: // down
 			case 75: // k
-				Contacts.UI.Contacts.next();
+				OC.Contacts.Contacts.next();
 				break;
 			case 65: // a
 				if(event.shiftKey) {
 					// add addressbook
-					Contacts.UI.notImplemented();
+					OC.Contacts.notImplemented();
 					break;
 				}
-				Contacts.UI.Card.editNew();
+				OC.Contacts.Card.editNew();
 				break;
 			case 38: // up
 			case 74: // j
-				Contacts.UI.Contacts.previous();
+				OC.Contacts.Contacts.previous();
 				break;
 			case 78: // n
 				// next addressbook
-				Contacts.UI.notImplemented();
+				OC.Contacts.notImplemented();
 				break;
 			case 13: // Enter
 			case 79: // o
@@ -1720,10 +1710,10 @@ $(document).ready(function(){
 				break;
 			case 80: // p
 				// prev addressbook
-				Contacts.UI.notImplemented();
+				OC.Contacts.notImplemented();
 				break;
 			case 82: // r
-				Contacts.UI.Contacts.update({cid:Contacts.UI.Card.id});
+				OC.Contacts.Contacts.update({cid:OC.Contacts.Card.id});
 				break;
 			case 191: // ?
 				ninjahelp.toggle('fast');
@@ -1732,7 +1722,7 @@ $(document).ready(function(){
 
 	});
 
-	//$(window).on('beforeunload', Contacts.UI.Contacts.deleteFilesInQueue);
+	//$(window).on('beforeunload', OC.Contacts.Contacts.deleteFilesInQueue);
 
 	// Load a contact.
 	$('.contacts').keydown(function(event) {
@@ -1759,7 +1749,7 @@ $(document).ready(function(){
 			}
 			$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':id},function(jsondata){
 				if(jsondata.status == 'success'){
-					Contacts.UI.Card.loadContact(jsondata.data, bookid);
+					OC.Contacts.Card.loadContact(jsondata.data, bookid);
 				}
 				else{
 					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
@@ -1770,7 +1760,7 @@ $(document).ready(function(){
 	});
 
 	$('.contacts_property').live('change', function(){
-		Contacts.UI.Card.saveProperty(this);
+		OC.Contacts.Card.saveProperty(this);
 	});
 
 	$(function() {
@@ -1796,7 +1786,7 @@ $(document).ready(function(){
 					response = $.parseJSON(xhr.responseText);
 					if(response.status == 'success') {
 						if(xhr.status == 200) {
-							Contacts.UI.Card.editPhoto(response.data.id, response.data.tmp);
+							OC.Contacts.Card.editPhoto(response.data.id, response.data.tmp);
 						} else {
 							OC.dialogs.alert(xhr.status + ': ' + xhr.responseText, t('contacts', 'Error'));
 						}
@@ -1813,7 +1803,7 @@ $(document).ready(function(){
 					//}
 				}
 			};
-			xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+Contacts.UI.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
+			xhr.open('POST', OC.filePath('contacts', 'ajax', 'uploadphoto.php')+'?id='+OC.Contacts.Card.id+'&requesttoken='+requesttoken+'&imagefile='+encodeURIComponent(file.name), true);
 			xhr.setRequestHeader('Cache-Control', 'no-cache');
 			xhr.setRequestHeader('X-Requested-With', 'XMLHttpRequest');
 			xhr.setRequestHeader('X_FILE_NAME', encodeURIComponent(file.name));
@@ -1883,13 +1873,13 @@ $(document).ready(function(){
 										// import the file
 										uploadedfiles += 1;
 									} else {
-										Contacts.UI.notify({message:jsondata.data.message});
+										OC.Contacts.notify({message:jsondata.data.message});
 									}
 									return false;
 								})
 								.error(function(jqXHR, textStatus, errorThrown) {
 									console.log(textStatus);
-									Contacts.UI.notify({message:errorThrown + ': ' + textStatus,});
+									OC.Contacts.notify({message:errorThrown + ': ' + textStatus,});
 								});
 							uploadingFiles[fileName] = jqXHR;
 						}
@@ -1906,7 +1896,7 @@ $(document).ready(function(){
 								}
 								FileList.loadingDone(file.name);
 							} else {
-								Contacts.UI.notify({message:response.data.message});
+								OC.Contacts.notify({message:response.data.message});
 							}
 						});
 					}
@@ -1914,7 +1904,7 @@ $(document).ready(function(){
 			},
 			fail: function(e, data) {
 				console.log('fail');
-				Contacts.UI.notify({message:data.errorThrown + ': ' + data.textStatus});
+				OC.Contacts.notify({message:data.errorThrown + ': ' + data.textStatus});
 				// TODO: Remove file from upload queue.
 			},
 			progressall: function(e, data) {
@@ -1933,7 +1923,7 @@ $(document).ready(function(){
 				var importFiles = function(aid, fileList) {
 					// Create a closure that can be called from different places.
 					if(numfiles != uploadedfiles) {
-						Contacts.UI.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
+						OC.Contacts.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
 						retries += 1;
 						if(retries > 3) {
 							numfiles = uploadedfiles = retries = aid = 0;
@@ -1949,7 +1939,7 @@ $(document).ready(function(){
 					$('#uploadprogressbar').progressbar('value',50);
 					var todo = uploadedfiles;
 					$.each(fileList, function(fileName, data) {
-						Contacts.UI.Contacts.doImport(fileName, aid);
+						OC.Contacts.Contacts.doImport(fileName, aid);
 						delete fileList[fileName];
 						numfiles -= 1; uploadedfiles -= 1;
 						$('#uploadprogressbar').progressbar('value',50+(50/(todo-uploadedfiles)));
@@ -1957,7 +1947,7 @@ $(document).ready(function(){
 					$('#uploadprogressbar').progressbar('value',100);
 					$('#uploadprogressbar').fadeOut();
 					setTimeout(function() {
-						Contacts.UI.Contacts.update({aid:aid});
+						OC.Contacts.Contacts.update({aid:aid});
 						numfiles = uploadedfiles = retries = aid = 0;
 					}, 1000);
 				}
@@ -1983,7 +1973,7 @@ $(document).ready(function(){
 														return false;
 													}
 													$(this).dialog('close');
-													Contacts.UI.Addressbooks.addAddressbook(displayname, description, function(addressbook){
+													OC.Contacts.Addressbooks.addAddressbook(displayname, description, function(addressbook){
 														aid = addressbook.id;
 														setTimeout(function() {
 															importFiles(aid, uploadingFiles);
@@ -2030,6 +2020,6 @@ $(document).ready(function(){
 		})
 	});
 
-	Contacts.UI.loadHandlers();
-	Contacts.UI.Contacts.update({cid:id});
+	OC.Contacts.loadHandlers();
+	OC.Contacts.Contacts.update({cid:id});
 });
diff --git a/apps/contacts/js/settings.js b/apps/contacts/js/settings.js
index b79e52cb87a..6f0a8b88353 100644
--- a/apps/contacts/js/settings.js
+++ b/apps/contacts/js/settings.js
@@ -18,11 +18,11 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 					if(!active) {
 						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
 					} else {
-						Contacts.UI.Contacts.update();
+						OC.Contacts.Contacts.update();
 					}
 				} else {
 					console.log('Error:', jsondata.data.message);
-					Contacts.UI.notify(t('contacts', 'Error') + ': ' + jsondata.data.message);
+					OC.Contacts.notify(t('contacts', 'Error') + ': ' + jsondata.data.message);
 					tgt.checked = !active;
 				}
 			});
@@ -37,7 +37,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 					if (jsondata.status == 'success'){
 						$('#contacts h3[data-id="'+id+'"],#contacts ul[data-id="'+id+'"]').remove();
 						$('.addressbooks-settings tr[data-id="'+id+'"]').remove()
-						Contacts.UI.Contacts.update();
+						OC.Contacts.Contacts.update();
 					} else {
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}
@@ -100,7 +100,7 @@ OC.Contacts.Settings = OC.Contacts.Settings || {
 							row.find('td.name').text(jsondata.addressbook.displayname);
 							row.find('td.description').text(jsondata.addressbook.description);
 						}
-						Contacts.UI.Contacts.update();
+						OC.Contacts.Contacts.update();
 					} else {
 						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
 					}