diff options
| author | Xavier Morel <xmo@openerp.com> | 2011-10-27 14:45:03 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2011-10-27 14:45:03 +0200 |
| commit | ab1bf880f13360aadde96ac229acf855db0af26d (patch) | |
| tree | 2c008a6d3b083dc6dc699064c831eaab9ea4ed75 /addons/web/static/src | |
| parent | 66ea5439741704346a45441b009240797628636f (diff) | |
[IMP] blockUI defaults configuration
* Set throbber image as the default message
* Ensure blockUI is on top of dialogs
bzr revid: xmo@openerp.com-20111027124503-i4u0fmqij3o80sy3
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/chrome.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/js/core.js | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index bdb8e23c20b..38923d268cf 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -343,7 +343,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database self.$option_id.find("form[name=create_db_form]").validate({ submitHandler: function (form) { var fields = $(form).serializeArray(); - $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'}); + $.blockUI(); self.rpc("/web/database/create", {'fields': fields}, function(result) { if (result.error) { $.unblockUI(); @@ -392,7 +392,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database .html(QWeb.render("BackupDB", self)) .find("form[name=backup_db_form]").validate({ submitHandler: function (form) { - $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'}); + $.blockUI(); self.session.get_file({ form: form, error: function (body) { @@ -413,7 +413,7 @@ openerp.web.Database = openerp.web.Widget.extend(/** @lends openerp.web.Database self.$option_id.find("form[name=restore_db_form]").validate({ submitHandler: function (form) { - $.blockUI({message:'<img src="/web/static/src/img/throbber2.gif">'}); + $.blockUI(); $(form).ajaxSubmit({ url: '/web/database/restore', type: 'POST', diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index ab0247e81b4..9563abea49a 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -1043,6 +1043,10 @@ openerp.web.TranslationDataBase = openerp.web.Class.extend(/** @lends openerp.we } }); +if ($.blockUI) { + $.blockUI.defaults.baseZ = 1100; + $.blockUI.defaults.message = '<img src="/web/static/src/img/throbber2.gif">'; +} openerp.web._t = new openerp.web.TranslationDataBase().build_translation_function(); openerp.web.qweb = new QWeb2.Engine(); openerp.web.qweb.debug = (window.location.search.indexOf('?debug') !== -1); |