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

Merge pull request #2445 from carlfeberhard/fix.raven

Browse Source 
Fix raven.js import order in galaxy.panels.mako
This commit is contained in:
Martin Cech
2016-06-02 10:24:55 -04:00
parent 25a26d8c9c f78d5404a2
commit ec476c7cb4
9 changed files with 43 additions and 1303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/bower.json
-1
View File
@@ -9,7 +9,6 @@
"homepage": "usegalaxy.org",
"dependencies": {
"jquery": "~1.12",
"tracekit": "*",
"ravenjs": "~3",
"underscore": "~1",
"backbone": "~1.3",
client/galaxy/scripts/libs/tracekit.js
-1244
View File
File diff suppressed because it is too large Load Diff
client/grunt-tasks/install-libs.js
-1
View File
@@ -12,7 +12,6 @@ module.exports = function( grunt ){
libraryLocations = {
'jquery': [ 'dist/jquery.js', 'jquery/jquery.js' ],
'jquery-migrate': [ 'jquery-migrate.js', 'jquery/jquery.migrate.js' ],
'traceKit': [ 'tracekit.js', 'tracekit.js' ],
'ravenjs': [ 'dist/raven.js', 'raven.js' ],
'underscore': [ 'underscore.js', 'underscore.js' ],
'backbone': [ 'backbone.js', 'backbone.js' ],
static/maps/libs/tracekit.js.map
-1
View File
File diff suppressed because one or more lines are too long
static/scripts/libs/tracekit.js
-2
View File
File diff suppressed because one or more lines are too long
templates/base.mako
+1 -1
View File
@@ -37,7 +37,7 @@
<%def name="javascripts()">
## Send errors to Sntry server if configured
%if app.config.sentry_dsn:
${h.js( "libs/tracekit", "libs/raven" )}
${h.js( "libs/raven" )}
<script>
Raven.config('${app.config.sentry_dsn_public}').install();
%if trans.user:
templates/base/base_panels.mako
+1 -1
View File
@@ -41,7 +41,7 @@
<%def name="javascripts()">
## Send errors to Sentry server if configured
%if app.config.sentry_dsn:
${h.js( "libs/tracekit", "libs/raven" )}
${h.js( "libs/raven" )}
<script>
Raven.config('${app.config.sentry_dsn_public}').install();
%if trans.user:
templates/js-app.mako
+1 -1
View File
@@ -57,7 +57,7 @@
<%def name="page_setup()">
## Send js errors to Sentry server if configured
%if app.config.sentry_dsn:
${h.js( "libs/tracekit", "libs/raven" )}
${h.js( "libs/raven" )}
<script>
Raven.config('${app.config.sentry_dsn_public}').install();
%if trans.user:
templates/webapps/galaxy/galaxy.panels.mako
+40 -51
View File
@@ -1,7 +1,7 @@
<%namespace name="masthead" file="/webapps/galaxy/galaxy.masthead.mako"/>
<%namespace name="galaxy_client" file="/galaxy_client_app.mako" />
<!DOCTYPE HTML>
<!DOCTYPE html>
## inject parameters parsed by controller config dictionary
<%
@@ -26,10 +26,10 @@
%>
<%def name="stylesheets()">
## load default style
${h.css("base")}
## load default style
${h.css("base")}
## modify default style
## modify default style
<style type="text/css">
#center {
%if not self.galaxy_config['left_panel']:
@@ -52,6 +52,16 @@
</%def>
<%def name="javascripts()">
## Send errors to Sentry server if configured
%if app.config.sentry_dsn:
${h.js( "libs/raven" )}
<script>
Raven.config('${app.config.sentry_dsn_public}').install();
%if trans.user:
Raven.setUser( { email: "${trans.user.email | h}" } );
%endif
</script>
%endif
## load jscript libraries
${h.js(
@@ -62,38 +72,14 @@
'libs/require',
)}
## send errors to Sntry server if configured
%if app.config.sentry_dsn:
${h.js( "libs/tracekit", "libs/raven" )}
<script>
Raven.config('${app.config.sentry_dsn_public}').install();
%if trans.user:
Raven.setUser( { email: "${trans.user.email|h}" } );
%endif
</script>
%endif
## make sure console exists
<script type="text/javascript">
// console protection
window.console = window.console ||
{
log : function(){},
debug : function(){},
info : function(){},
warn : function(){},
error : function(){},
assert : function(){}
};
</script>
## default script wrapper
<script type="text/javascript">
## configure require
// configure require
// due to our using both script tags and require, we need to access the same jq in both for plugin retention
define( 'jquery', [], function(){ return jQuery; })
require.config({
baseUrl: "${h.url_for('/static/scripts') }",
baseUrl: "${h.url_for('/static/scripts')}",
// cache buster based on templated server (re)start time
urlArgs: 'v=${app.server_starttime}',
shim: {
"libs/underscore": { exports: "_" },
"libs/backbone": {
@@ -102,11 +88,21 @@
},
"libs/d3": { exports: "d3" },
},
// cache buster based on templated server (re)start time
urlArgs: 'v=${app.server_starttime}'
});
var galaxy_config = ${ h.dumps( self.galaxy_config ) };
// console protection
// TODO: Only needed for IE <9 which I believe we dropped
window.console = window.console || {
log : function(){},
debug : function(){},
info : function(){},
warn : function(){},
error : function(){},
assert : function(){}
};
// extra configuration global
var galaxy_config = ${ h.dumps( self.galaxy_config ) };
</script>
</%def>
@@ -124,19 +120,13 @@
});
});
} else {
console.log("'galaxy_config.app.jscript' missing.");
console.error("'galaxy_config.app.jscript' missing.");
}
});
</script>
## load the Galaxy global js var and run 'app' from above
${ galaxy_client.load( app='app' ) }
## alternate call where the module calls itself when included (no call to GalaxyApp()) - the above won't be needed
##precondition: module must call jq onready itself
##${ galaxy_client.load( app=( app_config[ 'jscript' ] if 'jscript' in app_config else None )) }
##TODO: at that point, we can think about optimizing the various apps
</%def>
## default late-load javascripts
@@ -162,18 +152,17 @@
## document
<html>
<head>
<title>
%if self.galaxy_config['title']:
${self.galaxy_config['title']}
%endif
</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta charset="UTF-8">
## for mobile browsers, don't scale up
<meta name = "viewport" content = "maximum-scale=1.0">
## force IE to standards mode, and prefer Google Chrome Frame if the user has already installed it
<meta http-equiv="X-UA-Compatible" content="IE=Edge,chrome=1">
<meta http-equiv="x-ua-compatible" content="ie=edge,chrome=1">
<title>
%if self.galaxy_config['title']:
${self.galaxy_config['title']}
%endif
</title>
${self.stylesheets()}
${self.javascripts()}