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

Fixed multiple dialog render (#4642)

Browse source
This commit is contained in:
Achilles Rasquinha 2017-12-18 15:01:36 +05:30 • committed by Faris Ansari
parent 2760f049ac
commit c4e1ba8bbf
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -103,9 +103,11 @@ frappe.ui.Dialog = frappe.ui.FieldGroup.extend({
// show it
this.$wrapper.modal("show");
this.primary_action_fulfilled = false;
this.is_visible = true;
},
hide: function(from_event) {
this.$wrapper.modal("hide");
this.is_visible = false;
},
get_close_btn: function() {
return this.$wrapper.find(".btn-modal-close");

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

@ -235,8 +235,7 @@ frappe.verify_password = function(callback) {
}
frappe.show_progress = function(title, count, total=100, description) {
if(frappe.cur_progress && frappe.cur_progress.title === title
&& frappe.cur_progress.$wrapper.is(":visible")) {
if(frappe.cur_progress && frappe.cur_progress.title === title && frappe.cur_progress.is_visible) {
var dialog = frappe.cur_progress;
} else {
var dialog = new frappe.ui.Dialog({