Add listener to properly clean up deferred form building processes

galaxyproject · Sep 23, 2016 · 42ebe00 · 42ebe00
1 parent 7a73681
commit 42ebe00
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 20 deletions.
diff --git a/client/galaxy/scripts/mvc/tool/tool-form-base.js b/client/galaxy/scripts/mvc/tool/tool-form-base.js
@@ -16,12 +16,14 @@ define(['utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view',
                     self._buildModel(process, options, true);
                 });
             }
-            // Listen to history panel
+            // listen to history panel
             if ( options.listen_to_history && parent.Galaxy && parent.Galaxy.currHistoryPanel ) {
                 this.listenTo( parent.Galaxy.currHistoryPanel.collection, 'change', function() {
                     this.refresh();
                 });
             }
+            // destroy dom elements
+            this.$el.on( 'remove', function() { self.remove() } );
         },
 
         /** Listen to history panel changes and update the tool form */

diff --git a/client/galaxy/scripts/mvc/tool/tool-form.js b/client/galaxy/scripts/mvc/tool/tool-form.js
@@ -47,10 +47,6 @@ define([ 'utils/utils', 'mvc/ui/ui-misc', 'mvc/ui/ui-modal', 'mvc/tool/tool-form
             this.$el.append( this.form.$el );
         },
 
-        remove: function() {
-            this.form.remove();
-        },
-
         /** Submit a regular job.
          * @param{dict}     options   - Specifies tool id and version
          * @param{function} callback  - Called when request has completed

diff --git a/static/maps/mvc/tool/tool-form-base.js.map b/static/maps/mvc/tool/tool-form-base.js.map