@@ -10,7 +13,13 @@ Quill.register(Block, true);
// table
const Table = Quill.import('formats/table-container');
-Table.className = 'table';
+const superCreate = Table.create.bind(Table);
+Table.create = (value) => {
+ const node = superCreate(value);
+ node.classList.add('table');
+ node.classList.add('table-bordered');
+ return node;
+}
Quill.register(Table, true);
// inline style
diff --git a/frappe/public/js/frappe/ui/field_group.js b/frappe/public/js/frappe/ui/field_group.js
index 71464adc37..57050298ca 100644
--- a/frappe/public/js/frappe/ui/field_group.js
+++ b/frappe/public/js/frappe/ui/field_group.js
@@ -24,7 +24,13 @@ frappe.ui.FieldGroup = frappe.ui.form.Layout.extend({
// set default
$.each(this.fields_list, function(i, field) {
if (field.df["default"]) {
- field.set_input(field.df["default"]);
+ let def_value = field.df["default"];
+
+ if (def_value == 'Today' && field.df["fieldtype"] == 'Date') {
+ def_value = frappe.datetime.get_today();
+ }
+
+ field.set_input(def_value);
// if default and has depends_on, render its fields.
me.refresh_dependency();
}
diff --git a/frappe/public/js/frappe/views/communication.js b/frappe/public/js/frappe/views/communication.js
index 4923add7bc..9ea08bc9e4 100755
--- a/frappe/public/js/frappe/views/communication.js
+++ b/frappe/public/js/frappe/views/communication.js
@@ -78,8 +78,14 @@ frappe.views.CommunicationComposer = Class.extend({
{label:__("Subject"), fieldtype:"Data", reqd: 1,
fieldname:"subject", length:524288},
{fieldtype: "Section Break"},
- {label:__("Message"), fieldtype:"Text Editor", reqd: 1,
- fieldname:"content"},
+ {
+ label:__("Message"),
+ fieldtype:"Text Editor", reqd: 1,
+ fieldname:"content",
+ onchange: frappe.utils.debounce(this.save_as_draft.bind(this), 300),
+ default: localStorage.getItem(this.frm.doctype + this.frm.docname) || ''
+ },
+
{fieldtype: "Section Break"},
{fieldtype: "Column Break"},
{label:__("Send me a copy"), fieldtype:"Check",
@@ -113,7 +119,7 @@ frappe.views.CommunicationComposer = Class.extend({
},
prepare: function() {
this.setup_subject_and_recipients();
- this.setup_print_language()
+ this.setup_print_language();
this.setup_print();
this.setup_attach();
this.setup_email();
@@ -128,7 +134,10 @@ frappe.views.CommunicationComposer = Class.extend({
this.dialog.fields_dict.sender.set_value(this.sender || '');
}
this.dialog.fields_dict.subject.set_value(this.subject || '');
- this.setup_earlier_reply();
+
+ if(!localStorage.getItem(this.frm.doctype + this.frm.docname)) {
+ this.setup_earlier_reply();
+ }
},
setup_subject_and_recipients: function() {
@@ -488,6 +497,18 @@ frappe.views.CommunicationComposer = Class.extend({
return form_values;
},
+ save_as_draft: function() {
+ if (this.dialog) {
+ try {
+ localStorage.setItem(this.frm.doctype + this.frm.docname, this.dialog.get_value('content'));
+ } catch (e) {
+ // silently fail
+ console.log(e);
+ console.warn('[Communication] localStorage is full. Cannot save message as draft');
+ }
+ }
+ },
+
send_email: function(btn, form_values, selected_attachments, print_html, print_format) {
var me = this;
me.dialog.hide();
@@ -549,6 +570,16 @@ frappe.views.CommunicationComposer = Class.extend({
cur_frm.reload_doc();
}
+ if (localStorage.getItem(this.frm.doctype + this.frm.docname)) {
+ try {
+ localStorage.removeItem(this.frm.doctype + this.frm.docname);
+ } catch (e) {
+ // silently fail
+ console.log(e);
+ console.warn('[Communication] Failed to delete draft.');
+ }
+ }
+
// try the success callback if it exists
if (me.success) {
try {
diff --git a/frappe/templates/web.html b/frappe/templates/web.html
index 5724141618..2a8460ac76 100644
--- a/frappe/templates/web.html
+++ b/frappe/templates/web.html
@@ -7,7 +7,7 @@ id="page-{{ name or route }}" data-path="{{ pathname }}"
{% endmacro %}
{% block content %}
-