Merge branch 'master' into 3106-modal-loading-indicator

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

diff --git a/apps/workbench/app/assets/javascripts/select_modal.js b/apps/workbench/app/assets/javascripts/select_modal.js
index a22b990e30e76aa438b50df971dd246e80c36b70..0a58213eb9ffdea8d16efca470d59e1cc796a294 100644 (file)
--- a/apps/workbench/app/assets/javascripts/select_modal.js
+++ b/apps/workbench/app/assets/javascripts/select_modal.js
@@ -16,11 +16,15 @@ $(document).on('click', '.selectable', function() {
         prop('disabled', !any);
 
     if ($this.hasClass('active')) {
-        $(".modal-dialog-preview-pane").html('<img src="/assets/ajax-loader.gif"></img>');
-        $.ajax($(this).attr('data-preview-href'),
-               {dataType: "html"}).done(function(data, status, jqxhr) {
-                   $(".modal-dialog-preview-pane").html(data);
-               });
+        $(".modal-dialog-preview-pane").html('<div class="spinner spinner-32px spinner-h-center spinner-v-center"></div>');
+        $.ajax($this.attr('data-preview-href'),
+               {dataType: "html"}).
+           done(function(data, status, jqxhr) {
+                $(".modal-dialog-preview-pane").html(data);
+            }).
+            fail(function(data, status, jqxhr) {
+                $(".modal-dialog-preview-pane").text('Preview load failed.');
+            });
     }
 
 }).on('click', '.modal button[data-action-href]', function() {