Fix deferred form destructor

galaxyproject · Jun 19, 2017 · 2131213 · 2131213
1 parent 2c4c714
commit 2131213
Show file tree

Hide file tree

Showing 11 changed files with 57,229 additions and 51 deletions.
diff --git a/client/galaxy/scripts/mvc/tool/tool-form-base.js b/client/galaxy/scripts/mvc/tool/tool-form-base.js
@@ -22,18 +22,17 @@ define( [ 'utils/utils', 'utils/deferred', 'mvc/ui/ui-misc', 'mvc/form/form-view
                 });
             }
             // destroy dom elements
-            this.$el.on( 'remove', function() { self.remove() } );
+            this.$el.on( 'remove', function() { self._destroy() } );
         },
 
         /** Wait for deferred build processes before removal */
-        remove: function() {
-            window.console.log( 'destroy' );
+        _destroy: function() {
             var self = this;
-            this.$el.hide();
-            /*this.deferred.execute( function() {
+            this.$el.off().hide();
+            this.deferred.execute( function() {
                 FormBase.prototype.remove.call( self );
                 Galaxy.emit.debug( 'tool-form-base::remove()', 'Destroy view.' );
-            });*/
+            });
         },
 
         /** Build form */

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