projects
/
arvados.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into 2380-ssh-doc
[arvados.git]
/
apps
/
workbench
/
app
/
views
/
application
/
_content.html.erb
diff --git
a/apps/workbench/app/views/application/_content.html.erb
b/apps/workbench/app/views/application/_content.html.erb
index 33ec16f5ae69b5f720ef070d71ea5066f2362acc..c9522de3f2548e81f0544d8afb9088f4afd03640 100644
(file)
--- a/
apps/workbench/app/views/application/_content.html.erb
+++ b/
apps/workbench/app/views/application/_content.html.erb
@@
-25,11
+25,9
@@
function ajaxRefreshTabPane(pane) {
if (!tab_pane_valid_state[pane]) {
tab_pane_valid_state[pane] = true;
function ajaxRefreshTabPane(pane) {
if (!tab_pane_valid_state[pane]) {
tab_pane_valid_state[pane] = true;
- $(document).trigger('ajax:send');
- $.ajax('<%=j url_for() %>?tab_pane='+pane, {dataType: 'html', type: 'GET'}).
+ $.ajax('<%=j url_for() %>?<%= raw(controller.request.query_string) %>&tab_pane='+pane, {dataType: 'html', type: 'GET'}).
done(function(data, status, jqxhr) {
$('#' + pane + ' > div > div').html(data);
done(function(data, status, jqxhr) {
$('#' + pane + ' > div > div').html(data);
- $(document).trigger('ajax:complete');
ajaxRefreshTabPane(pane);
});
}
ajaxRefreshTabPane(pane);
});
}
@@
-68,7
+66,7
@@
<% else %>
data-object-uuid="<%= @object.uuid %>"
<% end %>
<% else %>
data-object-uuid="<%= @object.uuid %>"
<% end %>
->
+
>
<% content_for :js do %>
<% if i == 0 %>
<% content_for :js do %>
<% if i == 0 %>
@@
-87,7
+85,7
@@
<%= render(partial: 'show_' + pane.downcase,
locals: { comparable: comparable, objects: @objects }) %>
<% else %>
<%= render(partial: 'show_' + pane.downcase,
locals: { comparable: comparable, objects: @objects }) %>
<% else %>
- <
%= image_tag 'ajax-loader.gif' %
>
+ <
div class="spinner spinner-32px spinner-h-center"></div
>
<% end %>
</div>
</div>
<% end %>
</div>
</div>