Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <mattab@users.noreply.github.com>2016-10-06 05:10:50 +0300
committerGitHub <noreply@github.com>2016-10-06 05:10:50 +0300
commitd4ad50fc0f5c24ecb1e25703c9aa284e359120cb (patch)
tree032f5d4ad24a2193dbd191649f4b9724c860777e /plugins/Dashboard
parent2ffda92c7dcc381a9ddbfce60c82b0c7cf9169fe (diff)
UI tests tweaking, balance jobs between builds, add some wait, display error in case the widget metadata sync request fails (#10694)
* Balance the UI tests job, second half currently 8 min longer * Update app.js * Display error in UI when the Ajax request for widget metadata fails * Add some wait for the often failing UI test
Diffstat (limited to 'plugins/Dashboard')
-rw-r--r--plugins/Dashboard/javascripts/widgetMenu.js6
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/Dashboard/javascripts/widgetMenu.js b/plugins/Dashboard/javascripts/widgetMenu.js
index d3d96569eb..55eef4ab09 100644
--- a/plugins/Dashboard/javascripts/widgetMenu.js
+++ b/plugins/Dashboard/javascripts/widgetMenu.js
@@ -83,6 +83,12 @@ widgetsHelper.getAvailableWidgets = function (callback) {
}
}
);
+ ajaxRequest.setErrorCallback(function (deferred, status) {
+ if (status == 'abort' || !deferred || deferred.status < 400 || deferred.status >= 600) {
+ return;
+ }
+ $('#loadingError').show();
+ });
ajaxRequest.send(true);
}