From 3848c657ca756ea0f0cecbd36a1c670bf7ed478b Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 3 Feb 2017 10:13:25 +0530 Subject: [PATCH] [fix] hotkeys --- frappe/hooks.py | 1 - frappe/public/build.json | 5 +---- frappe/public/js/frappe/form/footer/timeline.js | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/frappe/hooks.py b/frappe/hooks.py index e3830fb783..28ff511e6c 100755 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -23,7 +23,6 @@ page_js = { app_include_js = [ "assets/js/libs.min.js", "assets/js/desk.min.js", - "assets/js/editor.min.js", "assets/js/list.min.js", "assets/js/form.min.js", "assets/js/report.min.js", diff --git a/frappe/public/build.json b/frappe/public/build.json index 1177f2f0da..cce5ae2798 100755 --- a/frappe/public/build.json +++ b/frappe/public/build.json @@ -22,10 +22,6 @@ "website/js/website.js", "public/js/frappe/misc/rating_icons.html" ], - "js/editor.min.js": [ - "public/js/lib/summernote/summernote.js", - "public/js/lib/summernote/summernote.css" - ], "js/dialog.min.js": [ "public/js/frappe/dom.js", "public/js/frappe/ui/modal.html", @@ -65,6 +61,7 @@ "public/js/lib/awesomplete/awesomplete.min.js", "public/js/lib/Sortable.min.js", "public/js/lib/taggle/taggle.min.js", + "public/js/lib/jquery/jquery.hotkeys.js", "public/js/lib/summernote/summernote.js", "public/js/lib/notify.js", "public/js/lib/bootstrap.min.js", diff --git a/frappe/public/js/frappe/form/footer/timeline.js b/frappe/public/js/frappe/form/footer/timeline.js index e182de61b1..dced067fd1 100644 --- a/frappe/public/js/frappe/form/footer/timeline.js +++ b/frappe/public/js/frappe/form/footer/timeline.js @@ -312,7 +312,7 @@ frappe.ui.form.Timeline = Class.extend({ }, is_communication_or_comment: function(c) { - return c.communication_type==="Communication" + return c.communication_type==="Communication" || c.communication_type==="Feedback" || (c.communication_type==="Comment" && (c.comment_type==="Comment"||c.comment_type==="Relinked")); },