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

[minor] [fix] trigger startup after page route in app.js so that dialogs created in startup do not auto-close

Browse source
This commit is contained in:
Anand Doshi 2013-07-10 12:00:26 +05:30
parent 98b0353b66
commit 2d0f99b80c
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
public/js/wn/app.js
View file

@ -53,14 +53,19 @@ wn.Application = Class.extend({
this.set_favicon();
if(user!="Guest") this.set_user_display_settings();
// trigger app startup
$(document).trigger('startup');
this.setup_keyboard_shortcuts();
// control panel startup code
this.run_custom_startup_code();
if(wn.boot) {
// route to home page
wn.route();
}
// trigger app startup
$(document).trigger('startup');
this.start_notification_updates();
@ -186,5 +191,26 @@ wn.Application = Class.extend({
var link = $('link[type="image/x-icon"]').remove().attr("href");
$('<link rel="shortcut icon" href="' + link + '" type="image/x-icon">').appendTo("head")
$('<link rel="icon" href="' + link + '" type="image/x-icon">').appendTo("head")
},
setup_keyboard_shortcuts: function() {
$(document).keydown("meta+g ctrl+g", function(e) {
wn.ui.toolbar.search.show();
return false;
});
$(document).keydown("meta+s ctrl+s", function(e) {
if(cur_frm) {
cur_frm.save_or_update();
}
else if(wn.container.page.save_action)
wn.container.page.save_action();
return false;
});
},
run_custom_startup_code: function() {
if(wn.control_panel.custom_startup_code)
eval(wn.control_panel.custom_startup_code);
}
})

2
public/js/wn/views/container.js
View file

@ -48,7 +48,7 @@ wn.views.Container = Class.extend({
}
// hide dialog
if(cur_dialog && cur_dialog.display) {
if(cur_dialog && cur_dialog.display && !cur_dialog.keep_open) {
cur_dialog.hide();
}