瀏覽代碼

fix: Do not skip text in save while using shortcut

(cherry picked from commit 36d6d224df)
version-14
Suraj Shetty 4 年之前
committed by mergify-bot
父節點
當前提交
3b4382bf8b
共有 1 個檔案被更改,包括 13 行新增8 行删除
  1. +13
    -8
      frappe/public/js/frappe/desk.js

+ 13
- 8
frappe/public/js/frappe/desk.js 查看文件

@@ -474,14 +474,19 @@ frappe.Application = Class.extend({
$('<link rel="icon" href="' + link + '" type="image/x-icon">').appendTo("head"); $('<link rel="icon" href="' + link + '" type="image/x-icon">').appendTo("head");
}, },
trigger_primary_action: function() { trigger_primary_action: function() {
if(window.cur_dialog && cur_dialog.display) {
// trigger primary
cur_dialog.get_primary_btn().trigger("click");
} else if(cur_frm && cur_frm.page.btn_primary.is(':visible')) {
cur_frm.page.btn_primary.trigger('click');
} else if(frappe.container.page.save_action) {
frappe.container.page.save_action();
}
// to trigger change event on active input before triggering primary action
$(document.activeElement).blur();
// wait for possible JS validations triggered after blur (it might change primary button)
setTimeout(() => {
if (window.cur_dialog && cur_dialog.display) {
// trigger primary
cur_dialog.get_primary_btn().trigger("click");
} else if (cur_frm && cur_frm.page.btn_primary.is(':visible')) {
cur_frm.page.btn_primary.trigger('click');
} else if (frappe.container.page.save_action) {
frappe.container.page.save_action();
}
}, 100);
}, },


set_rtl: function() { set_rtl: function() {


Loading…
取消
儲存