Enable labels for all modules, used shared building process

galaxyproject · Feb 21, 2017 · 3a7e6b0 · 3a7e6b0
1 parent 0f742a6
commit 3a7e6b0
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 21 deletions.
diff --git a/...cripts/mvc/workflow/workflow-view-form.js → ...xy/scripts/mvc/workflow/workflow-forms.js b/...cripts/mvc/workflow/workflow-view-form.js → ...xy/scripts/mvc/workflow/workflow-forms.js
@@ -1,12 +1,11 @@
 /** This is the workflow tool form. */
-define( [ 'utils/utils', 'mvc/tool/tool-form-base' ],
-    function( Utils, ToolFormBase ) {
-    var View = Backbone.View.extend({
+define( [ 'utils/utils', 'mvc/form/form-view', 'mvc/tool/tool-form-base' ],
+    function( Utils, Form, ToolFormBase ) {
+    var Tool = Backbone.View.extend({
         initialize: function( options ) {
             var self = this;
             this.workflow = options.workflow;
             this.node     = options.node;
-            this.setElement( '<div/>' );
             if ( this.node ) {
                 this.post_job_actions = this.node.post_job_actions || {};
                 Utils.deepeach( options.inputs, function( input ) {
@@ -64,7 +63,6 @@ define( [ 'utils/utils', 'mvc/tool/tool-form-base' ],
                         });
                     },
                 }));
-                this.$el.append( this.form.$el );
             } else {
                 Galaxy.emit.debug('tool-form-workflow::initialize()', 'Node not found in workflow.');
             }
@@ -247,7 +245,14 @@ define( [ 'utils/utils', 'mvc/tool/tool-form-base' ],
         }
     });
 
+    var Default = Backbone.View.extend({
+        initialize: function( options ) {
+            this.form = new Form( options );
+        }
+    });
+
     return {
-        View: View
+        Tool: Tool,
+        Default: Default
     };
 });
diff --git a/client/galaxy/scripts/mvc/workflow/workflow-view.js b/client/galaxy/scripts/mvc/workflow/workflow-view.js
@@ -6,13 +6,12 @@ define([
     'mvc/workflow/workflow-canvas',
     'mvc/workflow/workflow-node',
     'mvc/workflow/workflow-icons',
-    'mvc/workflow/workflow-view-form',
-    'mvc/form/form-view',
+    'mvc/workflow/workflow-forms',
     'mvc/ui/ui-misc',
     'utils/async-save-text',
     'libs/toastr',
     'ui/editable-text'
-], function( Utils, Globals, Workflow, WorkflowCanvas, Node, WorkflowIcons, ToolForm, Form, Ui, async_save_text, Toastr ){
+], function( Utils, Globals, Workflow, WorkflowCanvas, Node, WorkflowIcons, FormWrappers, Ui, async_save_text, Toastr ){
 
     // Reset tool search to start state.
     function reset_tool_search( initValue ) {
@@ -661,7 +660,7 @@ define([
             var $container = $( '#' + cls );
             if ( content && $container.find( '#' + id ).length == 0 ) {
                 var $el = $( '<div id="' + id + '" class="' + cls + '"/>' );
-                var form = null;
+                var form_wrapper = null;
                 content.node = node;
                 content.workflow = this.workflow;
                 content.datatypes = this.datatypes;
@@ -690,10 +689,10 @@ define([
                                 break;
                             }
                         }
-                        var input_id = form.data.match( '__label' );
-                        var input_element = form.element_list[ input_id ];
+                        var input_id = form_wrapper.form.data.match( '__label' );
+                        var input_element = form_wrapper.form.element_list[ input_id ];
                         input_element.model.set( 'error_text', duplicate && 'Duplicate label. Please fix this before saving the workflow.' );
-                        form.trigger( 'change' );
+                        form_wrapper.form.trigger( 'change' );
                     }
                 });
                 content.onchange = function() {
@@ -712,11 +711,11 @@ define([
                     });
                 };
                 if ( node.type == 'tool' ) {
-                    form = new ToolForm.View( content );
+                    form_wrapper = new FormWrappers.Tool( content );
                 } else {
-                    form = new Form( content );
+                    form_wrapper = new FormWrappers.Default( content );
                 }
-                $el.append( form.$el );
+                $el.append( form_wrapper.form.$el );
                 $container.append( $el );
             }
             $( '.' + cls ).hide();

diff --git a/static/maps/mvc/workflow/workflow-view-form.js.map b/static/maps/mvc/workflow/workflow-view-form.js.map