Merge branch 'master' into 5720-ajax-loading-error

[arvados.git] / apps / workbench / app / assets / javascripts / tab_panes.js

diff --git a/apps/workbench/app/assets/javascripts/tab_panes.js b/apps/workbench/app/assets/javascripts/tab_panes.js
index a92582cf813e7fd0a553ee9c4986dd4478807ce7..eb574791a5922bbcdb0fc7de59ade55eeed13022 100644 (file)
--- a/apps/workbench/app/assets/javascripts/tab_panes.js
+++ b/apps/workbench/app/assets/javascripts/tab_panes.js
@@ -134,7 +134,7 @@ $(document).on('arv:pane:reload', '[data-pane-content-url]', function(e) {
             var errhtml;
             var contentType = jqxhr.getResponseHeader('Content-Type');
             if (jqxhr.readyState == 0 || jqxhr.status == 0) {
-              return;   // User may have navigated away; skip.
+              errhtml = "Cancelled.";
             } else if (contentType && contentType.match(/\btext\/html\b/)) {
                 var $response = $(jqxhr.responseText);
                 var $wrapper = $('div#page-wrapper', $response);