opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-28 02:58:18 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactored function calls

Browse Source
This commit is contained in:
Eric Rasche
2014-10-18 18:38:04 -04:00
parent d77ea5511c
commit 628e3c83ce
3 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/plugins/visualizations/ipython/static/ie.js
+15
View File
@@ -45,3 +45,18 @@ function test_ie_availability(url, success_callback){
});
}, 500);
}
/**
* Load an interactive environment (IE) from a remote URL
* @param {String} password: password used to authenticate to the remote resource
* @param {String} notebook_login_url: URL that should be POSTed to for login
* @param {String} notebook_access_url: the URL embeded in the page and loaded
*
*/
function load_notebook(password, notebook_login_url, notebook_access_url, callback_function){
$( document ).ready(function() {
test_ie_availability(notebook_access_url, function(){
callback_function(notebook_login_url, notebook_access_url);
});
});
}
config/plugins/visualizations/ipython/static/ipython.js
+4 -9
View File
@@ -25,28 +25,23 @@ function message_no_auth(){
/**
* Load an interactive environment (IE) from a remote URL
* @param {Boolean} password_auth Whether or not this resource requires password authentication
* @param {String} password: password used to authenticate to the remote resource
* @param {String} notebook_login_url: URL that should be POSTed to for login
* @param {String} notebook_access_url: the URL embeded in the page and loaded
* @param {Boolean} apache_urls: Proxying is done outside of galaxy in the webserver
* @param {String} galaxy_root: root of the galaxy server, used for finding the static spinner.gif that ships with galaxy.
*
* TODO: This function needs a lot of work to make it more generic:
* TODO: exchange login_url, password, password_auth for a single function which encapsulates all the authentication procedure, as that will differ between IEs.
*/
function load_notebook(password_auth, password, notebook_login_url, notebook_access_url, apache_urls, galaxy_root){
function load_notebook(password, notebook_login_url, notebook_access_url){
$( document ).ready(function() {
test_ie_availability(notebook_access_url, function(){
_handle_notebook_loading(password_auth, password, notebook_login_url, notebook_access_url, apache_urls);
_handle_notebook_loading(notebook_login_url, notebook_access_url);
});
});
}
/**
* Internal function
* Must be implemented by IEs
*/
function _handle_notebook_loading(password_auth, password, notebook_login_url, notebook_access_url, apache_urls){
function _handle_notebook_loading(notebook_login_url, notebook_access_url){
if ( password_auth ) {
// Make an AJAX POST
$.ajax({
config/plugins/visualizations/ipython/templates/ipython.mako
+1 -1
View File
@@ -54,7 +54,7 @@ require.config({
},
});
requirejs(['plugin/ie', 'plugin/ipython'], function(){
load_notebook(password_auth, password, notebook_login_url, notebook_access_url, apache_urls, galaxy_root);
load_notebook(password, notebook_login_url, notebook_access_url);
});
</script>
<div id="main" width="100%" height="100%">