From f2f5473ead184032d1de6208bc2530dfb88455fc Mon Sep 17 00:00:00 2001 From: Giovane Date: Mon, 9 Nov 2015 15:52:16 -0200 Subject: Adds style and tag information on 'No Mails available' message. - Issue #503 --- web-ui/app/js/dispatchers/middle_pane_dispatcher.js | 8 ++++---- web-ui/app/js/mail_view/ui/no_mails_available_pane.js | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) (limited to 'web-ui/app/js') diff --git a/web-ui/app/js/dispatchers/middle_pane_dispatcher.js b/web-ui/app/js/dispatchers/middle_pane_dispatcher.js index 59263af2..7a53b769 100644 --- a/web-ui/app/js/dispatchers/middle_pane_dispatcher.js +++ b/web-ui/app/js/dispatchers/middle_pane_dispatcher.js @@ -29,8 +29,8 @@ define(['flight/lib/component', 'page/events', 'helpers/triggering', 'mail_view/ return child_div; }; - this.resetChildDiv = function() { - this.select('middlePane').empty(); + this.resetChildDiv = function(component_id) { + $('#' + component_id).remove(); }; this.refreshMailList = function (ev, data) { @@ -52,12 +52,12 @@ define(['flight/lib/component', 'page/events', 'helpers/triggering', 'mail_view/ }; this.onMailsChange = function (ev, data) { + this.resetChildDiv(this.attr.noMailsAvailablePane); if (data.mails.length > 0) { NoMailsAvailablePane.teardownAll(); - this.resetChildDiv(); } else { var child_div = this.createChildDiv(this.attr.noMailsAvailablePane); - NoMailsAvailablePane.attachTo(child_div); + NoMailsAvailablePane.attachTo(child_div, {tag: data.tag}); } }; diff --git a/web-ui/app/js/mail_view/ui/no_mails_available_pane.js b/web-ui/app/js/mail_view/ui/no_mails_available_pane.js index edcaade0..32b6bc19 100644 --- a/web-ui/app/js/mail_view/ui/no_mails_available_pane.js +++ b/web-ui/app/js/mail_view/ui/no_mails_available_pane.js @@ -29,15 +29,17 @@ define( return defineComponent(noMailsAvailablePane); function noMailsAvailablePane() { + this.defaultAttrs({ + tag: null + }); this.render = function() { - this.$node.html(templates.noMailsAvailable()); + this.attr.tag = this.attr.tag.toUpperCase(); + this.$node.html(templates.noMailsAvailable(this.attr)); }; this.after('initialize', function () { this.render(); - - // this.on(document, events.dispatchers.middlePane.clear, this.teardown); }); } } -- cgit v1.2.3