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

fix: Render Signature and Geolocation after dialog is shown

Browse source 
Dialogs are hidden the first time they are created, some fields need to
calculate the dimensions of their container which is not possible when
they are hidden, we fix it by rendering them after the dialog is shown.
This commit is contained in:
Faris Ansari 2019-02-20 10:55:19 +05:30
parent 5e5c9f103d
commit 976fc2ffea
4 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/public/js/frappe/form/controls/geolocation.js
View file

@ -16,7 +16,7 @@ frappe.ui.form.ControlGeolocation = frappe.ui.form.ControlCode.extend({
if ($input_wrapper.is(':visible')) {
this.make_map();
} else {
$(document).on('quick-entry-dialog-open', () => {
$(document).on('frappe.ui.Dialog:shown', () => {
this.make_map();
});
}

9
frappe/public/js/frappe/form/controls/signature.js
View file

@ -7,7 +7,14 @@ frappe.ui.form.ControlSignature = frappe.ui.form.ControlData.extend({
// make jSignature field
this.body = $('<div class="signature-field"></div>').appendTo(me.wrapper);
this.make_pad();
if (this.body.is(':visible')) {
this.make_pad();
} else {
$(document).on('frappe.ui.Dialog:shown', () => {
this.make_pad();
});
}
this.img_wrapper = $(`<div class="signature-display">
<div class="missing-image attach-missing-image">

3
frappe/public/js/frappe/form/quick_entry.js
View file

@ -116,9 +116,6 @@ frappe.ui.form.QuickEntryForm = Class.extend({
this.dialog.onhide = () => frappe.quick_entry = null;
this.dialog.show();
this.dialog.$wrapper.on('shown.bs.modal', function() {
$(document).trigger('quick-entry-dialog-open');
});
this.dialog.refresh_dependency();
this.set_defaults();

3
frappe/public/js/frappe/ui/dialog.js
View file

@ -83,7 +83,8 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
window.cur_dialog = me;
frappe.ui.open_dialogs.push(me);
me.focus_on_first_input();
me.on_page_show && me.on_page_show();
me.on_page_show && me.on_page_show();
$(document).trigger('frappe.ui.Dialog:shown');
})
.on('scroll', function() {
var $input = $('input:focus');