[ARVADOS] updated: f809f3edb39aa33ada41059c95367e6d5a84f2ba

git at public.curoverse.com git at public.curoverse.com
Tue Nov 4 10:35:11 EST 2014


Summary of changes:
 apps/workbench/app/assets/javascripts/tab_panes.js              | 5 -----
 apps/workbench/app/controllers/pipeline_instances_controller.rb | 2 +-
 apps/workbench/app/views/application/_content.html.erb          | 2 +-
 3 files changed, 2 insertions(+), 7 deletions(-)

       via  f809f3edb39aa33ada41059c95367e6d5a84f2ba (commit)
      from  b17d41c12a0d2a49864722204829a25aafe759e8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f809f3edb39aa33ada41059c95367e6d5a84f2ba
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Tue Nov 4 10:35:09 2014 -0500

    4084: Remove "no-auto-reload" css class hint, tabs no longer reload on click by
    default so it is not necessary to have a class to suppress that behavior.

diff --git a/apps/workbench/app/assets/javascripts/tab_panes.js b/apps/workbench/app/assets/javascripts/tab_panes.js
index 747fb9b..4130488 100644
--- a/apps/workbench/app/assets/javascripts/tab_panes.js
+++ b/apps/workbench/app/assets/javascripts/tab_panes.js
@@ -66,11 +66,6 @@ $(document).on('arv:pane:reload', function(e) {
         return;
     }
 
-    if ($anchor.hasClass('pane-no-auto-reload') && $anchor.hasClass('pane-loaded')) {
-        // Have to explicitly remove pane-loaded if we want it to reload.
-        return;
-    }
-
     var throttle = $anchor.attr('data-load-throttle');
     if (!throttle) {
         throttle = 15000;
diff --git a/apps/workbench/app/controllers/pipeline_instances_controller.rb b/apps/workbench/app/controllers/pipeline_instances_controller.rb
index 1ad31fb..46fc3d7 100644
--- a/apps/workbench/app/controllers/pipeline_instances_controller.rb
+++ b/apps/workbench/app/controllers/pipeline_instances_controller.rb
@@ -245,7 +245,7 @@ class PipelineInstancesController < ApplicationController
     if @object and @object.state.in? ['New', 'Ready']
       panes = %w(Inputs) + panes
     else
-      panes.insert(1, {:name => "Log", :no_auto_reload => true})
+      panes.insert(1, {:name => "Log"})
     end
     if not @object.components.values.any? { |x| x[:job] rescue false }
       panes -= ['Graph']
diff --git a/apps/workbench/app/views/application/_content.html.erb b/apps/workbench/app/views/application/_content.html.erb
index 01da449..d69e358 100644
--- a/apps/workbench/app/views/application/_content.html.erb
+++ b/apps/workbench/app/views/application/_content.html.erb
@@ -7,7 +7,7 @@
       <% pane_name = (pane.is_a?(Hash) ? pane[:name] : pane) %>
       <li class="<%= 'active' if i==0 %>">
         <a href="#<%= pane_name %>"
-           class="pane-anchor <%= 'pane-no-auto-reload' if pane.is_a?(Hash) && pane[:no_auto_reload] %>"
+           class="pane-anchor"
            id="<%= pane_name %>-tab"
            data-toggle="tab"
            data-tab-history=true

-----------------------------------------------------------------------


hooks/post-receive
-- 




More information about the arvados-commits mailing list