Merge branch 'dev' into visualization_header

client/galaxy/scripts/mvc/form/form-data.js

@@ -200,7 +200,7 @@ export var matchCase = (input, value) => {
  * @param{dict}   callback  - Called with the mapped dictionary object and corresponding model node
  */
 export var visitInputs = (inputs, callback, prefix, context) => {
-    context = $.extend(true, {}, context);
+    context = $.extend({}, context);
     _.each(inputs, input => {
         if (input && input.type && input.name) {
             context[input.name] = input;

client/galaxy/scripts/mvc/form/form-section.js

@@ -26,9 +26,8 @@ var View = Backbone.View.extend({
     },
 
     /** Add a new input element */
-    add: function(input) {
-        var input_def = jQuery.extend(true, {}, input);
-        input_def.id = input.id = Utils.uid();
+    add: function(input_def) {
+        input_def.id = Utils.uid();
         this.app.input_list[input_def.id] = input_def;
         switch (input_def.type) {
             case "conditional":

client/galaxy/scripts/mvc/form/form-view.js

@@ -80,7 +80,7 @@ export default Backbone.View.extend({
                     .first();
                 $panel.animate(
                     {
-                        scrollTop: $panel.scrollTop() + input_element.$el.offset().top - 120
+                        scrollTop: $panel.scrollTop() + input_element.$el.offset().top - $panel.position().top - 120
                     },
                     500
                 );

client/galaxy/scripts/mvc/tool/tool-form-composite.js

@@ -25,18 +25,6 @@ var View = Backbone.View.extend({
         $("body").append(this.$el);
         this._configure();
         this.render();
-        $(window).resize(() => {
-            self._refresh();
-        });
-    },
-
-    /** Refresh height of scrollable div below header, handle scrolling by lazy loading steps */
-    _refresh: function(step_index) {
-        var margin =
-            _.reduce(this.$el.children(), (memo, child) => memo + $(child).outerHeight(), 0) -
-            this.$steps.height() +
-            90;
-        this.$steps.css("height", $(window).height() - margin);
     },
 
     /** Configures form/step options for each workflow step */
@@ -432,7 +420,6 @@ var View = Backbone.View.extend({
             }
             self.forms[step.index] = form;
             self._append(self.$steps, form.$el);
-            self._refresh();
             step.needs_refresh && self._refreshStep(step);
             form.portlet[!self.show_progress ? "enable" : "disable"]();
             self.show_progress &&

client/galaxy/style/less/ui.less

@@ -486,6 +486,9 @@
 
 .ui-form-composite {
     max-width: 900px;
+    height: 100%;
+    flex-direction: column;
+    display: flex;
     .ui-form-header {
         &:extend(h3);
         margin-top: 0px;