Fix merge conflicts

1 files changed, 0 insertions, 62 deletions

diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
index bc92965bb0b..de627927507 100644
--- a/apps/tasks/js/tasks.js
+++ b/apps/tasks/js/tasks.js
@@ -469,67 +469,5 @@ $(document).ready(function(){
 		return false;
 	});
 
-	$('#tasks_addtaskform input[type="submit"]').live('click',function(){
-		$.post('ajax/addtask.php',$('#tasks_addtaskform').serialize(),function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#task_details').data('id',jsondata.data.id);
-				$('#task_details').html(jsondata.data.page);
-				$('#tasks_list').append(OC.Tasks.create_task_div(jsondata.data.task));
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		}, 'json');
-		return false;
-	});
-
-	$('#tasks_edit').live('click',function(){
-		var id = $('#task_details').data('id');
-		$.getJSON('ajax/edittaskform.php',{'id':id},function(jsondata){
-			if(jsondata.status == 'success'){
-				$('#task_details').html(jsondata.data.page);
-				$('#task_details #categories').multiple_autocomplete({source: categories});
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		});
-		return false;
-	});
-
-	$('#tasks_edittaskform #percent_complete').live('change',function(event){
-		if ($(event.target).val() == 100){
-			$('#tasks_edittaskform #complete').show();
-		}else{
-			$('#tasks_edittaskform #complete').hide();
-		}
-	});
-
-	$('#tasks_edittaskform input[type="submit"]').live('click',function(){
-		$.post('ajax/edittask.php',$('#tasks_edittaskform').serialize(),function(jsondata){
-			$('.error_msg').remove();
-			$('.error').removeClass('error');
-			if(jsondata.status == 'success'){
-				var id = jsondata.data.id;
-				$('#task_details').data('id',id);
-				$('#task_details').html(jsondata.data.page);
-				var task = jsondata.data.task;
-				$('#tasks .task[data-id='+id+']')
-					.data('task', task)
-					.html(OC.Tasks.create_task_div(task).html());
-			}
-			else{
-				var errors = jsondata.data.errors;
-				for (k in errors){
-					$('#'+k).addClass('error')
-						.after('<span class="error_msg">'+errors[k]+'</span>');
-				}
-				$('.error_msg').effect('highlight', {}, 3000);
-				$('.error').effect('highlight', {}, 3000);
-			}
-		}, 'json');
-		return false;
-	});
-
 	OCCategories.app = 'calendar';
 });