diff options
| author | Aleksander Machniak <machniak@kolabsys.com> | 2019-02-28 17:14:53 +0300 |
|---|---|---|
| committer | Aleksander Machniak <machniak@kolabsys.com> | 2019-02-28 17:14:53 +0300 |
| commit | e3e95733913a9b97afce8807f7354478a1403721 (patch) | |
| tree | b1e95e38fe3a775adb9954fe948a08060ec914a9 | |
| parent | 0c01dad3989356081ceda9c55c34ee79325fe0c0 (diff) | |
Fix small issue when quota object does not specify 'title'1.4-rc1
| -rw-r--r-- | program/js/app.js | 2 | ||||
| -rw-r--r-- | skins/elastic/ui.js | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js index ae5cf6884..cab54dcd9 100644 --- a/program/js/app.js +++ b/program/js/app.js @@ -8346,7 +8346,7 @@ function rcube_webmail() this.set_quota = function(content) { if (this.gui_objects.quotadisplay && content && content.type == 'text') - $(this.gui_objects.quotadisplay).text((content.percent||0) + '%').attr('title', content.title); + $(this.gui_objects.quotadisplay).text((content.percent||0) + '%').attr('title', content.title || ''); this.triggerEvent('setquota', content); this.env.quota_content = content; diff --git a/skins/elastic/ui.js b/skins/elastic/ui.js index 0f9f33fe6..bf4719e75 100644 --- a/skins/elastic/ui.js +++ b/skins/elastic/ui.js @@ -3012,7 +3012,8 @@ function rcube_elastic_ui() } bar.find('.value').css('width', value + '%')[value >= 90 ? 'addClass' : 'removeClass']('warning'); - element.attr('title', element.find('.count').attr('title')); + // set title and reset tooltip's data (needed in case of empty title) + element.attr({'data-original-title': '', title: element.find('.count').attr('title')}); if (p.table) { element.css('cursor', 'pointer').data('popup-pos', 'top') |