1
0
mirror of https://github.com/owncloudarchive/contacts.git synced 2025-01-30 19:52:17 +01:00

Revert Android positioning 'fix'.

This reverts commit 20f1c1e6ca40c09b67c404729a4bf986b4732051 and 93ae945414a9511dfe5c396205cfccac1c40a153.
This commit is contained in:
Thomas Tanghus 2012-05-06 13:03:15 +02:00
parent 56191cc385
commit ea04d85f96

View File

@ -26,8 +26,8 @@ Contacts_Import={
$('#startimport').click(function(){
var filename = $('#filename').val();
var path = $('#path').val();
var addressbookid = $('#leftcontent option:selected').val();
if($('#leftcontent option:selected').val() == 'newaddressbook'){
var addressbookid = $('#contacts option:selected').val();
if($('#contacts option:selected').val() == 'newaddressbook'){
var method = 'new';
var addressbookname = $('#newaddressbook').val();
var addressbookname = $.trim(addressbookname);
@ -42,7 +42,7 @@ Contacts_Import={
var method = 'old';
}
$('#newaddressbook').attr('readonly', 'readonly');
$('#leftcontent').attr('disabled', 'disabled');
$('#contacts').attr('disabled', 'disabled');
var progressfile = $('#progressfile').val();
$.post(OC.filePath('contacts', '', 'import.php'), {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(data){
if(data.status == 'success'){
@ -54,8 +54,8 @@ Contacts_Import={
$('#progressbar_container').css('display', 'block');
window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
});
$('#leftcontent').change(function(){
if($('#leftcontent option:selected').val() == 'newaddressbook'){
$('#contacts').change(function(){
if($('#contacts option:selected').val() == 'newaddressbook'){
$('#newaddressbookform').slideDown('slow');
}else{
$('#newaddressbookform').slideUp('slow');