Przeglądaj źródła

Fixed multiple dialog render (#4642)

version-14
Achilles Rasquinha 7 lat temu
committed by Faris Ansari
rodzic
commit
c4e1ba8bbf
2 zmienionych plików z 3 dodań i 2 usunięć
  1. +2
    -0
      frappe/public/js/frappe/ui/dialog.js
  2. +1
    -2
      frappe/public/js/frappe/ui/messages.js

+ 2
- 0
frappe/public/js/frappe/ui/dialog.js Wyświetl plik

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


+ 1
- 2
frappe/public/js/frappe/ui/messages.js Wyświetl plik

@@ -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({


Ładowanie…
Anuluj
Zapisz