Merge #2167 manually to resolve conflicts.

galaxyproject · Apr 15, 2016 · 3e79a57 · 3e79a57
2 parents 8e72b30 + 03c8573
commit 3e79a57
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 4 deletions.
diff --git a/client/galaxy/scripts/mvc/history/multi-panel.js b/client/galaxy/scripts/mvc/history/multi-panel.js
@@ -131,6 +131,12 @@ var HistoryViewColumn = Backbone.View.extend( baseMVC.LoggableMixin ).extend({
             // assumes panel will take the longest to render
             'rendered': function(){
                 column.trigger( 'rendered', column );
+            },
+            // when a panel's view expands turn off the click handler on the rerun button so that it uses it's href
+            // this allows the button to open the tool rerun form in a new tab (instead of erroring)
+            // TODO: hack
+            'view:expanded view:rendered': function( view ){
+                view.$( '.rerun-btn' ).off();
             }
         }, this );
     },

diff --git a/static/maps/mvc/history/multi-panel.js.map b/static/maps/mvc/history/multi-panel.js.map
diff --git a/static/scripts/bundled/analysis.bundled.js b/static/scripts/bundled/analysis.bundled.js
diff --git a/static/scripts/bundled/analysis.bundled.js.map b/static/scripts/bundled/analysis.bundled.js.map
diff --git a/static/scripts/bundled/libs.bundled.js.map b/static/scripts/bundled/libs.bundled.js.map
diff --git a/static/scripts/mvc/history/multi-panel.js b/static/scripts/mvc/history/multi-panel.js