Skip to content

Commit

Permalink
Bundle libraries.
Browse files Browse the repository at this point in the history
  • Loading branch information
dannon committed Nov 21, 2017
1 parent 380e82c commit c92d958
Show file tree
Hide file tree
Showing 19 changed files with 125 additions and 35 deletions.
7 changes: 7 additions & 0 deletions client/galaxy/scripts/apps/library.js
@@ -0,0 +1,7 @@
import GalaxyLibrary from "galaxy.library";

export function tracksterApp(options) {

This comment has been minimized.

Copy link
@martenson

martenson Nov 21, 2017

Member

The name of the function does not look right.

This comment has been minimized.

Copy link
@martenson

martenson Nov 21, 2017

Member

Seems to be fixed in the next commit (76f0eb4), nevermind.

new GalaxyLibrary.GalaxyApp(options);
}

window.libraryApp = tracksterApp;
3 changes: 2 additions & 1 deletion client/webpack.config.js
Expand Up @@ -46,7 +46,8 @@ module.exports = {
admin: "./galaxy/scripts/apps/admin.js",
workflow: "./galaxy/scripts/apps/workflow.js",
masthead: "./galaxy/scripts/apps/masthead.js",
viz: "./galaxy/scripts/apps/viz.js"
viz: "./galaxy/scripts/apps/viz.js",
library: "./galaxy/scripts/apps/library.js"
},
output: {
path: path.join(__dirname, "../", "static/scripts/bundled"),
Expand Down
5 changes: 3 additions & 2 deletions lib/galaxy/webapps/galaxy/controllers/library.py
Expand Up @@ -13,9 +13,10 @@ class Library(BaseUIController):
def list(self, trans, **kwd):
# define app configuration for generic mako template
app = {
'jscript' : "galaxy.library"
'jscript' : "libraryApp"
}
return trans.fill_template('galaxy.panels.mako',
config={
'title': 'Data Libraries',
'app': app})
'app': app,
'bundle': 'library'})
8 changes: 7 additions & 1 deletion static/scripts/bundled/admin.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/admin.bundled.js.map

Large diffs are not rendered by default.

10 changes: 8 additions & 2 deletions static/scripts/bundled/analysis.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/analysis.bundled.js.map

Large diffs are not rendered by default.

50 changes: 50 additions & 0 deletions static/scripts/bundled/library.bundled.js

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions static/scripts/bundled/library.bundled.js.map

Large diffs are not rendered by default.

30 changes: 12 additions & 18 deletions static/scripts/bundled/libs.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/libs.bundled.js.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion static/scripts/bundled/login.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/login.bundled.js.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion static/scripts/bundled/masthead.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/masthead.bundled.js.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion static/scripts/bundled/viz.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/viz.bundled.js.map

Large diffs are not rendered by default.

8 changes: 7 additions & 1 deletion static/scripts/bundled/workflow.bundled.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/scripts/bundled/workflow.bundled.js.map

Large diffs are not rendered by default.

0 comments on commit c92d958

Please sign in to comment.