From cd8f54ade2a961c5f55d0b137caa7f707c2d73e8 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Thu, 12 Jan 2012 22:06:53 +0100 Subject: [PATCH] update js of calendar import --- apps/calendar/js/loader.js | 29 ++++++++++++++++------------- 1 file changed, 16 insertions(+), 13 deletions(-) diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js index 6eafec8b10d..c21c20275e2 100644 --- a/apps/calendar/js/loader.js +++ b/apps/calendar/js/loader.js @@ -1,16 +1,19 @@ -function importdialog(directory, filename){ - $("body").append("
"); - $("#importdialogholder").load(OC.filePath('calendar', 'ajax', 'importdialog.php?filename=' + filename + '&path=' + directory)); +Calendar_Import={ + importdialog: function(filename){ + var path = $('#dir').val(); + $('body').append('
'); + $('#calendar_import').load(OC.filePath('calendar', 'ajax', 'importdialog.php'), {filename:filename, path:path}, Calendar_Import.initdialog()); + }, + initdialog: function(){ + + }, + getimportstatus: function(){ + + } } - $(document).ready(function(){ - $('tr[data-file$=".ics"]').attr("data-mime", "text/calendar"); - $('tr[data-file$=".vcs"]').attr("data-mime", "text/calendar"); - $('tr[data-file$=".ical"]').attr("data-mime", "text/calendar"); - if(typeof FileActions!=='undefined'){ - FileActions.register('text/calendar','Import to Calendar','',function(filename){ - importdialog($('#dir').val(),filename); - }); - FileActions.setDefault('text/calendar','Import to Calendar'); - } + if(typeof FileActions !== 'undefined'){ + FileActions.register('text/calendar','importcal', '', Calendar_Import.importdialog); + FileActions.setDefault('text/calendar','importcal'); + }; }); \ No newline at end of file -- 2.39.5