summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/widgets
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-03-01 19:43:25 +0100
committerChristophe Simonis <chs@odoo.com>2018-03-01 19:43:25 +0100
commit36945a5853b414b134278df55976619a335c3cfa (patch)
treef40c3fbdbe6dadfb625dd9fff8be249db41ecf19 /addons/web/static/src/js/widgets
parenta01933c9b4dc6ff4e1a0b73822df9097025c0e1c (diff)
parentc2e878e34c8e648099db34032e4a06807e80eb4d (diff)
[MERGE] forward port branch 11.0 up to c2e878e34c8
Diffstat (limited to 'addons/web/static/src/js/widgets')
-rw-r--r--addons/web/static/src/js/widgets/domain_selector_dialog.js6
-rw-r--r--addons/web/static/src/js/widgets/notification.js7
2 files changed, 12 insertions, 1 deletions
diff --git a/addons/web/static/src/js/widgets/domain_selector_dialog.js b/addons/web/static/src/js/widgets/domain_selector_dialog.js
index 5f41973951d..46b54089c5f 100644
--- a/addons/web/static/src/js/widgets/domain_selector_dialog.js
+++ b/addons/web/static/src/js/widgets/domain_selector_dialog.js
@@ -40,7 +40,11 @@ return Dialog.extend({
this.domainSelector = new DomainSelector(this, model, domain, options);
},
start: function () {
- this.$el.css("overflow", "visible").closest(".modal-dialog").css("height", "auto"); // This restores default modal height (bootstrap) and allows field selector to overflow
+ var self = this;
+ this.opened().then(function () {
+ // this restores default modal height (bootstrap) and allows field selector to overflow
+ self.$el.css('overflow', 'visible').closest('.modal-dialog').css('height', 'auto');
+ });
return $.when(
this._super.apply(this, arguments),
this.domainSelector.appendTo(this.$el)
diff --git a/addons/web/static/src/js/widgets/notification.js b/addons/web/static/src/js/widgets/notification.js
index 21c24c99e1b..2d987944d30 100644
--- a/addons/web/static/src/js/widgets/notification.js
+++ b/addons/web/static/src/js/widgets/notification.js
@@ -68,6 +68,13 @@ var Notification = Widget.extend({
self.$el.animate({height: 0}, 400, "swing", self.destroy.bind(self));
});
},
+ /**
+ * @override
+ */
+ start: function () {
+ this.$el.addClass('o_error');
+ return this._super.apply(this, arguments);
+ },
//--------------------------------------------------------------------------
// Handlers