diff --git a/app/assets/javascripts/desktop/journal_pages.js.erb b/app/assets/javascripts/desktop/journal_pages.js.erb index 74438aa02..9b7c0a03a 100644 --- a/app/assets/javascripts/desktop/journal_pages.js.erb +++ b/app/assets/javascripts/desktop/journal_pages.js.erb @@ -50,7 +50,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // return false; }) - $("div[container=true]").unbind("click").on("click",".journal_paper_edit",function(){ + $("div[container=true]").unbind(".edit").on("click.edit",".journal_paper_edit",function(){ $.ajax({ url : $(this).attr("href"), type : "get", @@ -64,7 +64,7 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // }) return false; }) - $("div[container=true]").unbind("click").on("click",".journal_paper_delete",function(){ + $("div[container=true]").unbind(".delete").on("click.delete",".journal_paper_delete",function(){ var delurl = $(this).attr("href"); var parent = $(this).parent(); o.confirm({ @@ -76,8 +76,11 @@ orbitDesktop.prototype.initializeJournalPapers = function(target,url,cache){ // $.ajax({ url : delurl, type : "DELETE", - success : function(){ - parent.slideOut(); + success : function(data){ + if(data.success){ + parent.hide("slide",function(){parent.remove();}); + o.notify(data.msg,"success"); + } } }) } diff --git a/app/controllers/desktop/journal_pages_controller.rb b/app/controllers/desktop/journal_pages_controller.rb index dfd374719..cebe3b6c6 100644 --- a/app/controllers/desktop/journal_pages_controller.rb +++ b/app/controllers/desktop/journal_pages_controller.rb @@ -83,6 +83,7 @@ class Desktop::JournalPagesController < ApplicationController def destroy @writing_journal = WritingJournal.find(params[:id]) @writing_journal.destroy + render :json => {success: true,msg: "Paper deleted successfully!"} end def get_journals_json