open-dsi
/
nextcloud-server
mirror of https://github.com/nextcloud/server
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert Android positioning 'fix'.

Browse Source 
This reverts commit 20f1c1e6ca and 93ae945414.
remotes/origin/stable4
Thomas Tanghus 13 years ago
parent f2ec68d40c
commit 400ade063c
1 changed files with 81 additions and 81 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 10
      apps/contacts/js/loader.js

10
apps/contacts/js/loader.js
Unescape View File

@ -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={
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={
$('#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');

Write Preview
Loading…
Cancel
Save