1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/1eba2def5265/ changeset: 1eba2def5265 user: jgoecks date: 2012-09-13 16:18:22 summary: Clean up JavaScript loading: (1) ensure galaxy.base is always loaded and (2) remove all duplicate loading of jQuery, bootstrap, and galaxy.base affected #: 20 files diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/base.mako --- a/templates/base.mako +++ b/templates/base.mako @@ -29,6 +29,7 @@ ${h.js( "libs/jquery/jquery", + "libs/json2", "libs/bootstrap", "galaxy.base", "libs/underscore", diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/base_panels.mako --- a/templates/base_panels.mako +++ b/templates/base_panels.mako @@ -48,7 +48,7 @@ <!--[if lt IE 7]> ${h.js( 'libs/IE/IE7', 'libs/IE/ie7-recalc' )} <![endif]--> - ${h.js( 'libs/jquery/jquery', 'libs/bootstrap', 'libs/underscore', 'libs/backbone/backbone', 'libs/backbone/backbone-relational', 'libs/handlebars.runtime', 'mvc/ui' )} + ${h.js( 'libs/jquery/jquery', 'libs/json2', 'libs/bootstrap', 'libs/underscore', 'libs/backbone/backbone', 'libs/backbone/backbone-relational', 'libs/handlebars.runtime', 'mvc/ui' )} <script type="text/javascript"> // Set up needed paths. var galaxy_paths = new GalaxyPaths({ diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/dataset/copy_view.mako --- a/templates/dataset/copy_view.mako +++ b/templates/dataset/copy_view.mako @@ -4,7 +4,6 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery", "galaxy.base" )} <script type="text/javascript"> $(function() { diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/dataset/edit_attributes.mako --- a/templates/dataset/edit_attributes.mako +++ b/templates/dataset/edit_attributes.mako @@ -11,7 +11,7 @@ <%def name="javascripts()"> ${parent.javascripts()} ${message_ns.javascripts()} - ${h.js( "galaxy.base", "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging" )} + ${h.js( "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging" )} </%def><%def name="datatype( dataset, datatypes )"> diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/display_base.mako --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -32,7 +32,7 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery", "libs/bootstrap", "galaxy.base", "libs/json2", "libs/jquery/jstorage", "libs/jquery/jquery.autocomplete", "libs/jquery/jquery.rating", + ${h.js( "libs/jquery/jstorage", "libs/jquery/jquery.autocomplete", "libs/jquery/jquery.rating", "galaxy.autocom_tagging", "viz/trackster", "viz/trackster_ui", "libs/jquery/jquery.event.drag", "libs/jquery/jquery.mousewheel", "libs/jquery/jquery.autocomplete", "libs/jquery/jquery.ui.sortable.slider", "libs/farbtastic", "mvc/data", "viz/visualization" )} @@ -113,7 +113,7 @@ <%def name="stylesheets()"> ${parent.stylesheets()} - ${h.css( "autocomplete_tagging", "embed_item", "trackster", "jquery.rating", "overcast/jquery-ui-1.8.5.custom" )} + ${h.css( "autocomplete_tagging", "embed_item", "trackster", "jquery.rating", "jquery-ui/smoothness/jquery-ui-1.8.23.custom" )} <style type="text/css"> .page-body { diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/history/view.mako --- a/templates/history/view.mako +++ b/templates/history/view.mako @@ -13,7 +13,7 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "galaxy.base", "libs/jquery/jquery", "libs/json2", "libs/jquery/jstorage" )} + ${h.js( "libs/jquery/jstorage" )} <script type="text/javascript"> $(function() { init_history_items( $("div.historyItemWrapper"), false, "nochanges" ); diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/library/common/browse_library.mako --- a/templates/library/common/browse_library.mako +++ b/templates/library/common/browse_library.mako @@ -48,7 +48,6 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js("libs/json2")} ${h.js("libs/jquery/jstorage")} ${common_javascripts()} ${self.grid_javascripts()} diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/library/common/import_datasets_to_histories.mako --- a/templates/library/common/import_datasets_to_histories.mako +++ b/templates/library/common/import_datasets_to_histories.mako @@ -5,7 +5,6 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery", "galaxy.base" )} <script type="text/javascript"> $(function() { $("#select-multiple").click(function() { diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/page/editor.mako --- a/templates/page/editor.mako +++ b/templates/page/editor.mako @@ -21,8 +21,8 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.drop", "libs/jquery/jquery.event.hover", "libs/jquery/jquery.form", "libs/json2", "libs/jquery/jstorage", - "galaxy.base", "libs/jquery/jquery.wymeditor", "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging")} + ${h.js( "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.drop", "libs/jquery/jquery.event.hover", "libs/jquery/jquery.form", + "libs/jquery/jstorage", "libs/jquery/jquery.wymeditor", "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging")} <script type="text/javascript"> // Useful Galaxy stuff. diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/root/alternate_history.mako --- a/templates/root/alternate_history.mako +++ b/templates/root/alternate_history.mako @@ -286,7 +286,7 @@ ${parent.javascripts()} ${h.js( - "libs/json2", "libs/jquery/jstorage", "libs/jquery/jquery.autocomplete", + "libs/jquery/jstorage", "libs/jquery/jquery.autocomplete", ##"libs/handlebars.full", "galaxy.autocom_tagging", "mvc/base-mvc", "mvc/ui" diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/root/tool_menu.mako --- a/templates/root/tool_menu.mako +++ b/templates/root/tool_menu.mako @@ -17,7 +17,7 @@ <%def name="javascripts()"> ${parent.javascripts()} ${h.templates( "tool_link", "panel_section", "tool_search" )} - ${h.js( "galaxy.base", "libs/json2", "galaxy.autocom_tagging", "mvc/tools", "libs/bootstrap" )} + ${h.js( "galaxy.autocom_tagging", "mvc/tools" )} <% # Set up for creating tool panel. diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/tool_form.mako --- a/templates/tool_form.mako +++ b/templates/tool_form.mako @@ -12,7 +12,7 @@ </%def><%def name="javascripts()"> - ${h.js( "libs/jquery/jquery", "galaxy.panels", "galaxy.base", "libs/jquery/jquery.autocomplete", "libs/jquery/jstorage", "libs/bootstrap" )} + ${h.js( "galaxy.panels", "libs/jquery/jquery.autocomplete", "libs/jquery/jstorage" )} <script type="text/javascript"> $(function() { $(window).bind("refresh_on_change", function() { diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/tracks/browser.mako --- a/templates/tracks/browser.mako +++ b/templates/tracks/browser.mako @@ -21,7 +21,7 @@ <script type='text/javascript' src="${h.url_for('/static/scripts/libs/IE/excanvas.js')}"></script><![endif]--> -${h.js( "galaxy.base", "galaxy.panels", "libs/json2", "libs/jquery/jquery", "libs/bootstrap", "libs/jquery/jstorage", "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel", "libs/jquery/jquery-ui-1.8.23.custom.min", "mvc/data", "viz/visualization", "viz/trackster", "viz/trackster_ui", "libs/farbtastic" )} +${h.js( "galaxy.panels", "libs/jquery/jstorage", "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.hover","libs/jquery/jquery.mousewheel", "libs/jquery/jquery-ui-1.8.23.custom.min", "mvc/data", "viz/visualization", "viz/trackster", "viz/trackster_ui", "libs/farbtastic" )} <script type="text/javascript"> // diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/webapps/community/admin/index.mako --- a/templates/webapps/community/admin/index.mako +++ b/templates/webapps/community/admin/index.mako @@ -18,7 +18,6 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery", "galaxy.base" )} </%def><%def name="init()"> diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/webapps/community/index.mako --- a/templates/webapps/community/index.mako +++ b/templates/webapps/community/index.mako @@ -19,7 +19,6 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery", "galaxy.base" )} </%def><%def name="init()"> diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/webapps/galaxy/admin/index.mako --- a/templates/webapps/galaxy/admin/index.mako +++ b/templates/webapps/galaxy/admin/index.mako @@ -22,7 +22,6 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery", "galaxy.base" )} </%def><%def name="init()"> diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/webapps/reports/index.mako --- a/templates/webapps/reports/index.mako +++ b/templates/webapps/reports/index.mako @@ -26,7 +26,6 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery", "galaxy.base" )} </%def><%def name="left_panel()"> diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/workflow/edit_attributes.mako --- a/templates/workflow/edit_attributes.mako +++ b/templates/workflow/edit_attributes.mako @@ -9,7 +9,7 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "galaxy.base", "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging" )} + ${h.js( "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging" )} </%def> %if msg: diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/workflow/editor.mako --- a/templates/workflow/editor.mako +++ b/templates/workflow/editor.mako @@ -25,15 +25,11 @@ <script type='text/javascript' src="${h.url_for('/static/scripts/libs/IE/excanvas.js')}"></script><![endif]--> - ${h.js( "libs/jquery/jquery", - "libs/bootstrap", - "libs/jquery/jquery.event.drag", + ${h.js( "libs/jquery/jquery.event.drag", "libs/jquery/jquery.event.drop", "libs/jquery/jquery.event.hover", "libs/jquery/jquery.form", - "libs/json2", "libs/jquery/jstorage", - "galaxy.base", "galaxy.workflow_editor.canvas", "libs/jquery/jquery.autocomplete", "galaxy.autocom_tagging")} diff -r 7663ed1ce1779b78f5f39037def1c4610b96ce56 -r 1eba2def52653577163901c765fd4686c9d42dfc templates/workflow/run.mako --- a/templates/workflow/run.mako +++ b/templates/workflow/run.mako @@ -2,7 +2,7 @@ <%def name="javascripts()"> ${parent.javascripts()} - ${h.js( "libs/jquery/jquery.autocomplete", "libs/bootstrap" )} + ${h.js( "libs/jquery/jquery.autocomplete" )} <script type="text/javascript"> $( function() { function show_tool_body(title){ Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.