diff --git a/frappe/public/js/frappe/widgets/base_widget.js b/frappe/public/js/frappe/widgets/base_widget.js index bc9b7db985..ae5d27c36e 100644 --- a/frappe/public/js/frappe/widgets/base_widget.js +++ b/frappe/public/js/frappe/widgets/base_widget.js @@ -66,13 +66,19 @@ export default class Widget { () => this.edit() ); - options.allow_resize && + if (options.allow_resize) { + const title = this.width == 'Full'? `${__('Collapse')}` : `${__('Expand')}`; this.add_custom_button( '', () => this.toggle_width(), - "", - `${__('Resize')}` + "resize-button", + title ); + + this.resize_button = this.action_area.find( + ".resize-button" + ); + } } make() { @@ -157,15 +163,18 @@ export default class Widget { } toggle_width() { - if (!this.width) { - this.widget.addClass("full-width"); - this.width = 'Full'; - this.refresh(); - } else { + if (this.width == 'Full') { this.widget.removeClass("full-width"); this.width = null; this.refresh(); + } else { + this.widget.addClass("full-width"); + this.width = 'Full'; + this.refresh(); } + + const title = this.width == 'Full' ? `${__('Collapse')}` : `${__('Expand')}`; + this.resize_button.attr('title', title); } hide_or_show() { diff --git a/frappe/public/js/frappe/widgets/chart_widget.js b/frappe/public/js/frappe/widgets/chart_widget.js index 425dcdf2b9..78026aa869 100644 --- a/frappe/public/js/frappe/widgets/chart_widget.js +++ b/frappe/public/js/frappe/widgets/chart_widget.js @@ -34,8 +34,6 @@ export default class ChartWidget extends Widget { this.widget.addClass("dashboard-widget-box"); if (this.width == "Full") { this.widget.addClass("full-width"); - } else { - this.widget.removeClass("full-width"); } }