diff options
author | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-21 17:42:41 +0400 |
---|---|---|
committer | Thomas Steur <thomas.steur@googlemail.com> | 2014-07-21 17:42:41 +0400 |
commit | 5393ab7342b8937f0c248fc8c1c13199e0463e34 (patch) | |
tree | 411c0f8e053e5bf3d5eb8ea51aad5c25e3cbcd2f /plugins/CoreHome/javascripts/corehome.js | |
parent | ac360489b9b9800424b84de7b5d11ad6b7101be2 (diff) |
refs #5406 make sure it shows an error message in dimension, do not show an error if request was aborted and align the text left
Diffstat (limited to 'plugins/CoreHome/javascripts/corehome.js')
-rwxr-xr-x | plugins/CoreHome/javascripts/corehome.js | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/plugins/CoreHome/javascripts/corehome.js b/plugins/CoreHome/javascripts/corehome.js index de7232721b..e1e29b7770 100755 --- a/plugins/CoreHome/javascripts/corehome.js +++ b/plugins/CoreHome/javascripts/corehome.js @@ -153,8 +153,19 @@ // scroll to report piwikHelper.lazyScrollTo(report, 400); - }, function () { + }, function (deferred, status) { + if (status == 'abort') { + return; + } + loading.hide(); + + var errorMessage = _pk_translate('General_ErrorRequest', ['', '']); + if ($('#loadingError').html()) { + errorMessage = $('#loadingError').html(); + } + + report.css('display', 'inline-block').html('<div class="dimensionLoadingError">' + errorMessage + '</div>'); }); }); }); |