odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX]modal: when closing a modal, focus previous one to allow several escape hit key 

bzr revid: csn@openerp.com-20140509094836-yhncaqp60od67w7k
This commit is contained in:
Cedric Snauwaert 2014-05-09 11:48:36 +02:00
parent 7d36f54288
commit dee000be14
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
addons/web/static/src/js/chrome.js
View File

@ -46,6 +46,8 @@ instance.web.Notification = instance.web.Widget.extend({
} }
}); });
var opened_modal = [];
instance.web.action_notify = function(element, action) { instance.web.action_notify = function(element, action) {
element.do_notify(action.params.title, action.params.text, action.params.sticky); element.do_notify(action.params.title, action.params.text, action.params.sticky);
}; };
@ -113,6 +115,8 @@ instance.web.Dialog = instance.web.Widget.extend({
this.init_dialog(); this.init_dialog();
} }
this.$buttons.insertAfter(this.$dialog_box.find(".modal-body")); this.$buttons.insertAfter(this.$dialog_box.find(".modal-body"));
//add to list of currently opened modal
opened_modal.push(this.$dialog_box);
return this; return this;
}, },
_add_buttons: function(buttons) { _add_buttons: function(buttons) {
@ -212,9 +216,13 @@ instance.web.Dialog = instance.web.Widget.extend({
//we need this to put the instruction to remove modal from DOM at the end //we need this to put the instruction to remove modal from DOM at the end
//of the queue, otherwise it might already have been removed before the modal-backdrop //of the queue, otherwise it might already have been removed before the modal-backdrop
//is removed when pressing escape key //is removed when pressing escape key
var $parent = this.$el.parents('.modal');
setTimeout(function () { setTimeout(function () {
$parent.remove(); //remove last modal from list of opened modal since we just destroy it
opened_modal.pop().remove();
if (opened_modal.length > 0){
//we still have other opened modal so we should focus it
opened_modal[opened_modal.length-1].focus()
}
},0); },0);
} }
this._super(); this._super();