vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

[fix] hotkeys

Browse source
This commit is contained in:
Rushabh Mehta 2017-02-03 10:13:25 +05:30
parent 54b2a613d9
commit 3848c657ca
3 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
frappe/hooks.py
View file

@ -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",

5
frappe/public/build.json
View file

@ -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",

2
frappe/public/js/frappe/form/footer/timeline.js
View file

@ -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"));
},