Revert Android positioning 'fix'.

This reverts commit 20f1c1e6ca40c09b67c404729a4bf986b4732051 and 93ae945414a9511dfe5c396205cfccac1c40a153.

diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 9efb1030f235fbfb40c25f67aefbfa521478a8f3..95fd7dc94eadab603fcb3281ee11fc1241196056 100644 (file)
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -1,83 +1,83 @@
-/**\r
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>\r
- * This file is licensed under the Affero General Public License version 3 or\r
- * later.\r
- * See the COPYING-README file.\r
- */\r
-Contacts_Import={\r
-       importdialog: function(filename){\r
-               var path = $('#dir').val();\r
-               $('body').append('<div id="contacts_import"></div>');\r
-               $('#contacts_import').load(OC.filePath('contacts', 'ajax', 'importdialog.php'), {filename:filename, path:path}, function(){Contacts_Import.initdialog(filename);});\r
-       },\r
-       initdialog: function(filename){\r
-               $('#contacts_import_dialog').dialog({\r
-                       width : 500,\r
-                       close : function() {\r
-                               $(this).dialog('destroy').remove();\r
-                               $('#contacts_import').remove();\r
-                       }\r
-               });\r
-               $('#import_done_button').click(function(){\r
-                       $('#contacts_import_dialog').dialog('destroy').remove();\r
-                       $('#contacts_import').remove();\r
-               });\r
-               $('#progressbar').progressbar({value: 0});\r
-               $('#startimport').click(function(){\r
-                       var filename = $('#filename').val();\r
-                       var path = $('#path').val();\r
-                       var addressbookid = $('#leftcontent option:selected').val();\r
-                       if($('#leftcontent option:selected').val() == 'newaddressbook'){\r
-                               var method = 'new';\r
-                               var addressbookname = $('#newaddressbook').val();\r
-                               var addressbookname = $.trim(addressbookname);\r
-                               if(newaddressbook == ''){\r
-                                       $('#newaddressbook').css('background-color', '#FF2626');\r
-                                       $('#newaddressbook').focus(function(){\r
-                                               $('#newaddressbook').css('background-color', '#F8F8F8');\r
-                                       });\r
-                                       return false;\r
-                               }\r
-                       }else{\r
-                               var method = 'old';\r
-                       }\r
-                       $('#newaddressbook').attr('readonly', 'readonly');\r
-                       $('#leftcontent').attr('disabled', 'disabled');\r
-                       var progressfile = $('#progressfile').val();\r
-                       $.post(OC.filePath('contacts', '', 'import.php'), {method: String (method), addressbookname: String (addressbookname), path: String (path), file: String (filename), id: String (addressbookid)}, function(data){\r
-                               if(data.status == 'success'){\r
-                                       $('#progressbar').progressbar('option', 'value', 100);\r
-                                       $('#import_done').css('display', 'block');\r
-                               }\r
-                       });\r
-                       $('#form_container').css('display', 'none');\r
-                       $('#progressbar_container').css('display', 'block');\r
-                       window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);\r
-               });\r
-               $('#leftcontent').change(function(){\r
-                       if($('#leftcontent option:selected').val() == 'newaddressbook'){\r
-                               $('#newaddressbookform').slideDown('slow');\r
-                       }else{\r
-                               $('#newaddressbookform').slideUp('slow');\r
-                       }\r
-               });\r
-       },\r
-       getimportstatus: function(progressfile){\r
-               $.get(OC.filePath('contacts', 'import_tmp', progressfile), function(percent){\r
-                       $('#progressbar').progressbar('option', 'value', parseInt(percent));\r
-                       if(percent < 100){\r
-                               window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);\r
-                       }else{\r
+/**
+ * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
+ * This file is licensed under the Affero General Public License version 3 or
+ * later.
+ * See the COPYING-README file.
+ */
+Contacts_Import={
+       importdialog: function(filename){
+               var path = $('#dir').val();
+               $('body').append('<div id="contacts_import"></div>');
+               $('#contacts_import').load(OC.filePath('contacts', 'ajax', 'importdialog.php'), {filename:filename, path:path}, function(){Contacts_Import.initdialog(filename);});
+       },
+       initdialog: function(filename){
+               $('#contacts_import_dialog').dialog({
+                       width : 500,
+                       close : function() {
+                               $(this).dialog('destroy').remove();
+                               $('#contacts_import').remove();
+                       }
+               });
+               $('#import_done_button').click(function(){
+                       $('#contacts_import_dialog').dialog('destroy').remove();
+                       $('#contacts_import').remove();
+               });
+               $('#progressbar').progressbar({value: 0});
+               $('#startimport').click(function(){
+                       var filename = $('#filename').val();
+                       var path = $('#path').val();
+                       var addressbookid = $('#contacts option:selected').val();
+                       if($('#contacts option:selected').val() == 'newaddressbook'){
+                               var method = 'new';
+                               var addressbookname = $('#newaddressbook').val();
+                               var addressbookname = $.trim(addressbookname);
+                               if(newaddressbook == ''){
+                                       $('#newaddressbook').css('background-color', '#FF2626');
+                                       $('#newaddressbook').focus(function(){
+                                               $('#newaddressbook').css('background-color', '#F8F8F8');
+                                       });
+                                       return false;
+                               }
+                       }else{
+                               var method = 'old';
+                       }
+                       $('#newaddressbook').attr('readonly', 'readonly');
+                       $('#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'){
+                                       $('#progressbar').progressbar('option', 'value', 100);
+                                       $('#import_done').css('display', 'block');
+                               }
+                       });
+                       $('#form_container').css('display', 'none');
+                       $('#progressbar_container').css('display', 'block');
+                       window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+               });
+               $('#contacts').change(function(){
+                       if($('#contacts option:selected').val() == 'newaddressbook'){
+                               $('#newaddressbookform').slideDown('slow');
+                       }else{
+                               $('#newaddressbookform').slideUp('slow');
+                       }
+               });
+       },
+       getimportstatus: function(progressfile){
+               $.get(OC.filePath('contacts', 'import_tmp', progressfile), function(percent){
+                       $('#progressbar').progressbar('option', 'value', parseInt(percent));
+                       if(percent < 100){
+                               window.setTimeout('Contacts_Import.getimportstatus(\'' + progressfile + '\')', 500);
+                       }else{
                                $('#import_done').css('display', 'block');\r
-                       }\r
-               });\r
-       }\r
-}\r
-$(document).ready(function(){\r
-       if(typeof FileActions !== 'undefined'){\r
-               FileActions.register('text/vcard','importaddressbook', '', Contacts_Import.importdialog); \r
-               FileActions.setDefault('text/vcard','importaddressbook');\r
-               FileActions.register('text/x-vcard','importaddressbook', '', Contacts_Import.importdialog); \r
-               FileActions.setDefault('text/x-vcard','importaddressbook');\r
-       };\r
+                       }
+               });
+       }
+}
+$(document).ready(function(){
+       if(typeof FileActions !== 'undefined'){
+               FileActions.register('text/vcard','importaddressbook', '', Contacts_Import.importdialog); 
+               FileActions.setDefault('text/vcard','importaddressbook');
+               FileActions.register('text/x-vcard','importaddressbook', '', Contacts_Import.importdialog); 
+               FileActions.setDefault('text/x-vcard','importaddressbook');
+       };
 });
\ No newline at end of file