mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

White space.

This commit is contained in:
Thomas Tanghus 2012-07-21 14:26:26 +02:00
parent 11aa571751
commit 00de757169
1 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
apps/contacts/js/contacts.js
View File

@ -114,7 +114,7 @@ Contacts={
$('.addresscard,.propertylist li,.propertycontainer').hover( $('.addresscard,.propertylist li,.propertycontainer').hover(
function () { function () {
$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {}); $(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 1.0 }, 200, function() {});
}, },
function () { function () {
$(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {}); $(this).find('.globe,.mail,.delete,.edit').animate({ opacity: 0.1 }, 200, function() {});
} }
@ -125,7 +125,7 @@ Contacts={
obj.tipsy('hide'); obj.tipsy('hide');
Contacts.UI.Card.deleteProperty(obj, 'single'); Contacts.UI.Card.deleteProperty(obj, 'single');
} }
var goToUrl = function(obj) { var goToUrl = function(obj) {
var url = Contacts.UI.propertyContainerFor(obj).find('#url').val(); var url = Contacts.UI.propertyContainerFor(obj).find('#url').val();
if(url != '') { if(url != '') {
@ -133,7 +133,7 @@ Contacts={
newWindow.focus(); newWindow.focus();
} }
} }
$('#identityprops a.delete').click( function() { deleteItem($(this)) }); $('#identityprops a.delete').click( function() { deleteItem($(this)) });
$('#identityprops a.delete').keydown( 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').click( function() { $(this).tipsy('hide');OCCategories.edit(); } );
@ -158,7 +158,7 @@ Contacts={
}); });
$('#edit_name').click(function(){Contacts.UI.Card.editName()}); $('#edit_name').click(function(){Contacts.UI.Card.editName()});
$('#edit_name').keydown(function(){Contacts.UI.Card.editName()}); $('#edit_name').keydown(function(){Contacts.UI.Card.editName()});
$('#phototools li a').click(function() { $('#phototools li a').click(function() {
$(this).tipsy('hide'); $(this).tipsy('hide');
}); });
@ -185,13 +185,13 @@ Contacts={
OC.dialogs.filepicker(t('contacts', 'Select photo'), Contacts.UI.Card.cloudPhotoSelected, false, 'image', true); OC.dialogs.filepicker(t('contacts', 'Select photo'), Contacts.UI.Card.cloudPhotoSelected, false, 'image', true);
}); });
/* Initialize the photo edit dialog */ /* Initialize the photo edit dialog */
$('#edit_photo_dialog').dialog({ $('#edit_photo_dialog').dialog({
autoOpen: false, modal: true, height: 'auto', width: 'auto' autoOpen: false, modal: true, height: 'auto', width: 'auto'
}); });
$('#edit_photo_dialog' ).dialog( 'option', 'buttons', [ $('#edit_photo_dialog' ).dialog( 'option', 'buttons', [
{ {
text: "Ok", text: "Ok",
click: function() { click: function() {
Contacts.UI.Card.savePhoto(this); Contacts.UI.Card.savePhoto(this);
$(this).dialog('close'); $(this).dialog('close');
} }
@ -201,7 +201,7 @@ Contacts={
click: function() { $(this).dialog('close'); } click: function() { $(this).dialog('close'); }
} }
] ); ] );
// Name has changed. Update it and reorder. // Name has changed. Update it and reorder.
$('#fn').change(function(){ $('#fn').change(function(){
var name = $('#fn').val().strip_tags(); var name = $('#fn').val().strip_tags();
@ -217,7 +217,7 @@ Contacts={
}); });
$('#contacts_deletecard').click( function() { Contacts.UI.Card.doDelete();return false;} ); $('#contacts_deletecard').click( function() { Contacts.UI.Card.doDelete();return false;} );
$('#contacts_deletecard').keydown( function(event) { $('#contacts_deletecard').keydown( function(event) {
if(event.which == 13 || event.which == 32) { if(event.which == 13 || event.which == 32) {
Contacts.UI.Card.doDelete(); Contacts.UI.Card.doDelete();
} }
@ -225,7 +225,7 @@ Contacts={
}); });
$('#contacts_downloadcard').click( function() { Contacts.UI.Card.doExport();return false;} ); $('#contacts_downloadcard').click( function() { Contacts.UI.Card.doExport();return false;} );
$('#contacts_downloadcard').keydown( function(event) { $('#contacts_downloadcard').keydown( function(event) {
if(event.which == 13 || event.which == 32) { if(event.which == 13 || event.which == 32) {
Contacts.UI.Card.doExport(); Contacts.UI.Card.doExport();
} }
@ -240,12 +240,12 @@ Contacts={
$('#contacts_details_photo_wrapper').bind('dragover',function(event){ $('#contacts_details_photo_wrapper').bind('dragover',function(event){
$(event.target).addClass('droppable'); $(event.target).addClass('droppable');
event.stopPropagation(); event.stopPropagation();
event.preventDefault(); event.preventDefault();
}); });
$('#contacts_details_photo_wrapper').bind('dragleave',function(event){ $('#contacts_details_photo_wrapper').bind('dragleave',function(event){
$(event.target).removeClass('droppable'); $(event.target).removeClass('droppable');
//event.stopPropagation(); //event.stopPropagation();
//event.preventDefault(); //event.preventDefault();
}); });
$('#contacts_details_photo_wrapper').bind('drop',function(event){ $('#contacts_details_photo_wrapper').bind('drop',function(event){
event.stopPropagation(); event.stopPropagation();
@ -331,10 +331,10 @@ Contacts={
if($('.contacts li').length > 0) { if($('.contacts li').length > 0) {
$.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){ $.getJSON(OC.filePath('contacts', 'ajax', 'contactdetails.php'),{'id':newid},function(jsondata){
if(jsondata.status == 'success'){ if(jsondata.status == 'success'){
if(bookid == 'unknown') { if(bookid == 'unknown') {
bookid = jsondata.data.addressbookid; bookid = jsondata.data.addressbookid;
var contact = Contacts.UI.Contacts.insertContact({ var contact = Contacts.UI.Contacts.insertContact({
contactlist:$('#contacts ul[data-id="'+bookid+'"]'), contactlist:$('#contacts ul[data-id="'+bookid+'"]'),
data:jsondata.data data:jsondata.data
}); });
} }
@ -348,7 +348,7 @@ Contacts={
}); });
} }
} }
// Make sure proper DOM is loaded. // Make sure proper DOM is loaded.
if(!$('#card').length && newid) { if(!$('#card').length && newid) {
console.log('Loading card DOM'); console.log('Loading card DOM');
@ -433,7 +433,7 @@ Contacts={
} }
}); });
} }
if(!$('#card').length) { if(!$('#card').length) {
console.log('Loading card DOM'); console.log('Loading card DOM');
$.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){ $.getJSON(OC.filePath('contacts', 'ajax', 'loadcard.php'),{'requesttoken': requesttoken},function(jsondata){
@ -470,7 +470,7 @@ Contacts={
$('#rightcontent').data('id',newid); $('#rightcontent').data('id',newid);
this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = ''; this.id = this.fn = this.fullname = this.shortname = this.famname = this.givname = this.addname = this.honpre = this.honsuf = '';
this.data = undefined; this.data = undefined;
if($('.contacts li').length > 0) { // Load first in list. if($('.contacts li').length > 0) { // Load first in list.
Contacts.UI.Card.update({cid:newid, aid:bookid}); Contacts.UI.Card.update({cid:newid, aid:bookid});
} else { } else {
@ -542,7 +542,7 @@ Contacts={
$('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide(); $('#contacts_propertymenu_dropdown a[data-type="'+propname+'"]').parent().hide();
var property = this.data[propname][0]; var property = this.data[propname][0];
var value = property['value'], checksum = property['checksum']; var value = property['value'], checksum = property['checksum'];
if(propname == 'BDAY') { if(propname == 'BDAY') {
var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10)); var val = $.datepicker.parseDate('yy-mm-dd', value.substring(0, 10));
value = $.datepicker.formatDate('dd-mm-yy', val); value = $.datepicker.formatDate('dd-mm-yy', val);
@ -607,7 +607,7 @@ Contacts={
$.each(names, function(key, value) { $.each(names, function(key, value) {
$('#fn_select') $('#fn_select')
.append($('<option></option>') .append($('<option></option>')
.text(value)); .text(value));
}); });
$('#fn_select').combobox('value', this.fn); $('#fn_select').combobox('value', this.fn);
$('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']); $('#contact_identity').find('*[data-element="N"]').data('checksum', this.data.N[0]['checksum']);
@ -858,7 +858,7 @@ Contacts={
title: t('contacts', 'Edit name'), title: t('contacts', 'Edit name'),
height: 'auto', width: 'auto', height: 'auto', width: 'auto',
buttons: { buttons: {
'Ok':function() { 'Ok':function() {
Contacts.UI.Card.saveName(this); Contacts.UI.Card.saveName(this);
$(this).dialog('close'); $(this).dialog('close');
}, },
@ -909,9 +909,9 @@ Contacts={
$.each(names, function(key, value) { $.each(names, function(key, value) {
$('#fn_select') $('#fn_select')
.append($('<option></option>') .append($('<option></option>')
.text(value)); .text(value));
}); });
if(this.id == '') { if(this.id == '') {
var aid = $(dlg).find('#aid').val(); var aid = $(dlg).find('#aid').val();
Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid); Contacts.UI.Card.add(n.join(';'), $('#short').text(), aid);
@ -975,7 +975,7 @@ Contacts={
container = $('#addressdisplay dl').last(); container = $('#addressdisplay dl').last();
container.removeClass('template').addClass('propertycontainer'); container.removeClass('template').addClass('propertycontainer');
} else { } else {
params['checksum'] = Contacts.UI.checksumFor(obj); params['checksum'] = Contacts.UI.checksumFor(obj);
} }
/* Initialize the address edit dialog */ /* Initialize the address edit dialog */
if($('#edit_address_dialog').dialog('isOpen') == true){ if($('#edit_address_dialog').dialog('isOpen') == true){
@ -1191,7 +1191,7 @@ Contacts={
$('#phototools li a').tipsy('hide'); $('#phototools li a').tipsy('hide');
var wrapper = $('#contacts_details_photo_wrapper'); var wrapper = $('#contacts_details_photo_wrapper');
wrapper.addClass('loading').addClass('wait'); wrapper.addClass('loading').addClass('wait');
var img = new Image(); var img = new Image();
$(img).load(function () { $(img).load(function () {
$('img.contacts_details_photo').remove() $('img.contacts_details_photo').remove()
@ -1200,9 +1200,9 @@ Contacts={
$(this).insertAfter($('#phototools')).fadeIn(); $(this).insertAfter($('#phototools')).fadeIn();
}).error(function () { }).error(function () {
// notify the user that the image could not be loaded // notify the user that the image could not be loaded
$(t('contacts','something went wrong.')).insertAfter($('#phototools')); Contacts.UI.notify({message:t('contacts','Error loading profile picture.')});
}).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr); }).attr('src', OC.linkTo('contacts', 'photo.php')+'?id='+self.id+refreshstr);
$.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){ $.getJSON(OC.filePath('contacts', 'ajax', 'loadphoto.php'),{'id':this.id, 'refresh': refresh},function(jsondata){
if(jsondata.status == 'success'){ if(jsondata.status == 'success'){
$('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum); $('#contacts_details_photo_wrapper').data('checksum', jsondata.data.checksum);
@ -1448,7 +1448,7 @@ Contacts={
var displayname = $("#displayname_"+bookid).val().trim(); var displayname = $("#displayname_"+bookid).val().trim();
var active = $("#edit_active_"+bookid+":checked").length; var active = $("#edit_active_"+bookid+":checked").length;
var description = $("#description_"+bookid).val(); var description = $("#description_"+bookid).val();
if(displayname.length == 0) { if(displayname.length == 0) {
OC.dialogs.alert(t('contacts', 'Displayname cannot be empty.'), t('contacts', 'Error')); OC.dialogs.alert(t('contacts', 'Displayname cannot be empty.'), t('contacts', 'Error'));
return false; return false;
@ -1517,7 +1517,7 @@ Contacts={
}, },
/** /**
* @params params An object with the propeties 'contactlist':a jquery object of the ul to insert into, * @params params An object with the propeties '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 * '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. * id, addressbookid and displayname or 'contact': a listitem to be inserted directly.
* If 'contacts' is defined the new contact will be inserted alphabetically into the list, otherwise * If 'contacts' is defined the new contact will be inserted alphabetically into the list, otherwise
* it will be appended. * it will be appended.
@ -1563,7 +1563,7 @@ Contacts={
$.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){ $.getJSON(OC.filePath('contacts', 'ajax', 'contacts.php'),opts,function(jsondata){
if(jsondata.status == 'success'){ if(jsondata.status == 'success'){
var books = jsondata.data.entries; var books = jsondata.data.entries;
$.each(books, function(b, book) { $.each(books, function(b, book) {
if($('#contacts h3[data-id="'+b+'"]').length == 0) { if($('#contacts h3[data-id="'+b+'"]').length == 0) {
firstrun = true; firstrun = true;
if($('#contacts h3').length == 0) { if($('#contacts h3').length == 0) {
@ -1582,7 +1582,7 @@ Contacts={
if(!added) { if(!added) {
$('#contacts').append(item); $('#contacts').append(item);
} }
} }
} }
$('#contacts h3[data-id="'+b+'"]').on('click', function(event) { $('#contacts h3[data-id="'+b+'"]').on('click', function(event) {
@ -1662,13 +1662,13 @@ $(document).ready(function(){
$('#notification').click(function(){ $('#notification').click(function(){
$('#notification').fadeOut(); $('#notification').fadeOut();
}); });
$('#chooseaddressbook').click(Contacts.UI.Addressbooks.overview); $('#chooseaddressbook').click(Contacts.UI.Addressbooks.overview);
$('#chooseaddressbook').keydown(Contacts.UI.Addressbooks.overview); $('#chooseaddressbook').keydown(Contacts.UI.Addressbooks.overview);
$('#contacts_newcontact').click(Contacts.UI.Card.editNew); $('#contacts_newcontact').click(Contacts.UI.Card.editNew);
$('#contacts_newcontact').keydown(Contacts.UI.Card.editNew); $('#contacts_newcontact').keydown(Contacts.UI.Card.editNew);
// Load a contact. // Load a contact.
$('.contacts').keydown(function(event) { $('.contacts').keydown(function(event) {
if(event.which == 13 || event.which == 32) { if(event.which == 13 || event.which == 32) {
@ -1740,7 +1740,7 @@ $(document).ready(function(){
} }
} }
}; };
fileUpload.onprogress = function(e){ fileUpload.onprogress = function(e){
if (e.lengthComputable){ if (e.lengthComputable){
var _progress = Math.round((e.loaded * 100) / e.total); var _progress = Math.round((e.loaded * 100) / e.total);
@ -1770,7 +1770,7 @@ $(document).ready(function(){
$(function() { $(function() {
var uploadingFiles = {}, numfiles = 0, uploadedfiles = 0, retries = 0; var uploadingFiles = {}, numfiles = 0, uploadedfiles = 0, retries = 0;
var aid; var aid;
$('#import_upload_start').fileupload({ $('#import_upload_start').fileupload({
dropZone: $('#contacts'), // restrict dropZone to contacts list. dropZone: $('#contacts'), // restrict dropZone to contacts list.
acceptFileTypes: /^text\/(directory|vcard|x-vcard)$/i, acceptFileTypes: /^text\/(directory|vcard|x-vcard)$/i,
@ -1932,7 +1932,7 @@ $(document).ready(function(){
$(this).dialog('close'); $(this).dialog('close');
} }
}, },
'Cancel':function() { 'Cancel':function() {
$(this).dialog('close'); $(this).dialog('close');
numfiles = uploadedfiles = retries = aid = 0; numfiles = uploadedfiles = retries = aid = 0;
uploadingFiles = {}; uploadingFiles = {};
@ -1959,11 +1959,11 @@ $(document).ready(function(){
} }
if(data.dataType != 'iframe ') { if(data.dataType != 'iframe ') {
$('#upload input.stop').hide(); $('#upload input.stop').hide();
} }
} }
}) })
}); });
Contacts.UI.loadHandlers(); Contacts.UI.loadHandlers();
Contacts.UI.Contacts.update({cid:id}); Contacts.UI.Contacts.update({cid:id});
}); });