Skip to content
Snippets Groups Projects
Commit 400ade06 authored by Thomas Tanghus's avatar Thomas Tanghus
Browse files

Revert Android positioning 'fix'.

This reverts commit 20f1c1e6 and 93ae9454.
parent f2ec68d4
Branches
No related tags found
No related merge requests found
...@@ -26,8 +26,8 @@ Contacts_Import={ ...@@ -26,8 +26,8 @@ Contacts_Import={
$('#startimport').click(function(){ $('#startimport').click(function(){
var filename = $('#filename').val(); var filename = $('#filename').val();
var path = $('#path').val(); var path = $('#path').val();
var addressbookid = $('#leftcontent option:selected').val(); var addressbookid = $('#contacts option:selected').val();
if($('#leftcontent option:selected').val() == 'newaddressbook'){ if($('#contacts option:selected').val() == 'newaddressbook'){
var method = 'new'; var method = 'new';
var addressbookname = $('#newaddressbook').val(); var addressbookname = $('#newaddressbook').val();
var addressbookname = $.trim(addressbookname); var addressbookname = $.trim(addressbookname);
...@@ -42,7 +42,7 @@ Contacts_Import={ ...@@ -42,7 +42,7 @@ Contacts_Import={
var method = 'old'; var method = 'old';
} }
$('#newaddressbook').attr('readonly', 'readonly'); $('#newaddressbook').attr('readonly', 'readonly');
$('#leftcontent').attr('disabled', 'disabled'); $('#contacts').attr('disabled', 'disabled');
var progressfile = $('#progressfile').val(); 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){ $.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'){ if(data.status == 'success'){
...@@ -54,8 +54,8 @@ Contacts_Import={ ...@@ -54,8 +54,8 @@ Contacts_Import={
$('#progressbar_container').css('display', 'block'); $('#progressbar_container').css('display', 'block');
window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500); window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
}); });
$('#leftcontent').change(function(){ $('#contacts').change(function(){
if($('#leftcontent option:selected').val() == 'newaddressbook'){ if($('#contacts option:selected').val() == 'newaddressbook'){
$('#newaddressbookform').slideDown('slow'); $('#newaddressbookform').slideDown('slow');
}else{ }else{
$('#newaddressbookform').slideUp('slow'); $('#newaddressbookform').slideUp('slow');
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment