opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Swap all IES to require-less loading.

Browse Source
This commit is contained in:
Dannon Baker
2019-05-08 11:49:00 -04:00
parent bc2a84a4dd
commit e391f241cd
8 changed files with 23 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/interactive_environments/askomics/templates/askomics.mako
+2 -4
View File
@@ -34,15 +34,13 @@ url = ie_request.url_template('${PROXY_URL}/login_api_gie?key=' + askomics_api_k
<html>
<head>
${ ie.load_default_js() }
${ ie.load_default_app() }
</head>
<body>
<script type="text/javascript">
${ ie.default_javascript_variables() }
var url = '${ url }';
${ ie.plugin_require_config() }
requirejs(['plugin/main'], function(){
load_askomics(url);
});
load_askomics(url);
</script>
<div id="main" width="100%" height="100%">
</div>
config/plugins/interactive_environments/bam_iobio/templates/bam_iobio.mako
+3 -5
View File
@@ -24,6 +24,7 @@ root = h.url_for( '/' )
<html>
<head>
${ ie.load_default_js() }
${ ie.load_default_app() }
</head>
<body>
@@ -31,7 +32,6 @@ root = h.url_for( '/' )
${ ie.default_javascript_variables() }
var notebook_access_url = '${ notebook_access_url }';
${ ie.plugin_require_config() }
IES.display_spinner();
@@ -43,10 +43,8 @@ root = h.url_for( '/' )
var startup = function(){
// Load notebook
requirejs(['plugin/main'], function(){
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(notebook_access_url);
});
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(notebook_access_url);
});
};
config/plugins/interactive_environments/cellxgene/templates/cellxgene.mako
-1
View File
@@ -21,7 +21,6 @@
${ ie.default_javascript_variables() }
var url = '${ url }';
${ ie.plugin_require_config() }
$( document ).ready(function() {
IES.keepAlive(url);
config/plugins/interactive_environments/ethercalc/templates/ethercalc.mako
+4 -6
View File
@@ -18,19 +18,17 @@ url = ie_request.url_template('${PROXY_URL}/ethercalc/')
<html>
<head>
${ ie.load_default_js() }
${ ie.load_default_app() }
</head>
<body>
<script type="text/javascript">
${ ie.default_javascript_variables() }
var url = '${ url }';
${ ie.plugin_require_config() }
// Keep container running and load IE
requirejs(['plugin/main'], function(){
IES.keepAlive(url);
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(url);
});
IES.keepAlive(url);
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(url);
});
</script>
<div id="main" width="100%" height="100%">
config/plugins/interactive_environments/hicbrowser/templates/hicbrowser.mako
+2 -6
View File
@@ -29,18 +29,14 @@
<html>
<head>
${ ie.load_default_js() }
${ ie.load_default_app() }
</head>
<body>
<script type="text/javascript">
${ ie.default_javascript_variables() }
var url = '${ url }';
${ ie.plugin_require_config() }
requirejs(['plugin/main'], function () {
load_hicexplorer(url);
});
load_hicexplorer(url);
</script>
<div id="main" width="100%" height="100%">
config/plugins/interactive_environments/neo/templates/neo.mako
+4 -9
View File
@@ -23,19 +23,14 @@
<html>
<head>
${ ie.load_default_js() }
${ ie.load_default_app() }
</head>
<body>
<script type="text/javascript">
${ ie.default_javascript_variables() }
${ ie.default_javascript_variables() }
var url = '${ url }';
${ ie.plugin_require_config() }
requirejs(['plugin/main'], function () {
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(url);
});
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(url);
});
</script>
config/plugins/interactive_environments/phinch/templates/phinch.mako
+5 -7
View File
@@ -21,20 +21,18 @@ url = ie_request.url_template('${PROXY_URL}/phinch/')
%>
<html>
<head>
${ ie.load_default_js() }
${ ie.load_default_js() }
${ ie.load_default_app() }
</head>
<body>
<script type="text/javascript">
${ ie.default_javascript_variables() }
var url = '${ url }';
${ ie.plugin_require_config() }
// Keep container running and load notebook
requirejs(['plugin/main'], function(){
keep_alive(url);
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(url);
});
keep_alive(url);
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(url);
});
</script>
config/plugins/interactive_environments/rstudio/templates/rstudio.mako
+3 -5
View File
@@ -27,17 +27,15 @@ notebook_access_url = ie_request.url_template('${PROXY_URL}/rstudio/')
<html>
<head>
${ ie.load_default_js() }
${ ie.load_default_app() }
</head>
<body style="margin: 0px">
<script type="text/javascript">
${ ie.default_javascript_variables() }
var notebook_access_url = '${ notebook_access_url }';
${ ie.plugin_require_config() }
requirejs(['plugin/main'], function(){
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(notebook_access_url);
});
IES.load_when_ready(ie_readiness_url, function(){
load_notebook(notebook_access_url);
});
</script>
<div id="main" width="100%" height="100%">