Merge pull request #35 from dannon/workflowexport_mako

Fix require inclusion scoping in analysis.js
jmchilton · May 11, 2017 · 6f89bab · 6f89bab
2 parents 7374558 + 2e34b6c
commit 6f89bab
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 8 deletions.
diff --git a/client/galaxy/scripts/apps/analysis.js b/client/galaxy/scripts/apps/analysis.js
@@ -8,9 +8,9 @@ var jQuery = require( 'jquery' ),
     HistoryPanel = require( './history-panel' ),
     PAGE = require( 'layout/page' ),
     ToolForm = require( 'mvc/tool/tool-form' ),
-    UserPreferences = require( 'mvc/user/user-preferences' );
-    CustomBuilds = require( 'mvc/user/user-custom-builds' );
-    Tours = require( 'mvc/tours' );
+    UserPreferences = require( 'mvc/user/user-preferences' ),
+    CustomBuilds = require( 'mvc/user/user-custom-builds' ),
+    Tours = require( 'mvc/tours' ),
     Workflows = require( 'mvc/workflow/workflow' );
 
 /** define the 'Analyze Data'/analysis/main/home page for Galaxy

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