Browse Source

chore: fixed bad programming

version-14
lapardnemihk1099 3 years ago
parent
commit
b0c813ec21
3 changed files with 8 additions and 10 deletions
  1. +7
    -8
      frappe/public/js/frappe/desk.js
  2. +0
    -1
      frappe/public/js/frappe/ui/dialog.js
  3. +1
    -1
      frappe/public/js/frappe/ui/theme_switcher.js

+ 7
- 8
frappe/public/js/frappe/desk.js View File

@@ -54,19 +54,18 @@ frappe.Application = class Application {
this.setup_copy_doc_listener(); this.setup_copy_doc_listener();


frappe.ui.keys.setup(); frappe.ui.keys.setup();

let is_dialog_open = false;
frappe.ui.keys.add_shortcut({ frappe.ui.keys.add_shortcut({
shortcut: 'shift+ctrl+g', shortcut: 'shift+ctrl+g',
description: __('Switch Theme'), description: __('Switch Theme'),
action: () => { action: () => {
frappe.theme_switcher = new frappe.ui.ThemeSwitcher();
if (!is_dialog_open) {
frappe.theme_switcher.show();
is_dialog_open = true;
} else {
if (cur_dialog) {
frappe.theme_switcher.hide(); frappe.theme_switcher.hide();
is_dialog_open = false;
} else {
if (!frappe.theme_switcher) {
frappe.theme_switcher = new frappe.ui.ThemeSwitcher();
}
frappe.theme_switcher.show();
} }
} }
}); });


+ 0
- 1
frappe/public/js/frappe/ui/dialog.js View File

@@ -216,7 +216,6 @@ frappe.ui.Dialog = class Dialog extends frappe.ui.FieldGroup {
hide() { hide() {
this.$wrapper.modal("hide"); this.$wrapper.modal("hide");
this.is_visible = false; this.is_visible = false;
frappe.ui.hide_open_dialog();
} }


get_close_btn() { get_close_btn() {


+ 1
- 1
frappe/public/js/frappe/ui/theme_switcher.js View File

@@ -138,7 +138,7 @@ frappe.ui.ThemeSwitcher = class ThemeSwitcher {
} }


hide() { hide() {
this.dialog.hide();
frappe.ui.hide_open_dialog();
} }
}; };




Loading…
Cancel
Save