2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/69d502188765/ Changeset: 69d502188765 Branch: next-stable User: jgoecks Date: 2013-05-30 22:57:03 Summary: Remove manual JSON parsing because it is not needed. Affected #: 3 files diff -r 9e531f5ffaeefedbfdcb71d3e9d4f1ca1a2aa85b -r 69d502188765dacd378a5ac75b49d2b0a0b33032 templates/webapps/galaxy/tracks/browser.mako --- a/templates/webapps/galaxy/tracks/browser.mako +++ b/templates/webapps/galaxy/tracks/browser.mako @@ -89,7 +89,7 @@ container: $("#browser-container"), name: $("#new-title").val(), dbkey: $("#new-dbkey").val() - }, JSON.parse('${ h.to_json_string( viewport_config ) }')); + }, ${ h.to_json_string( viewport_config ) } ); view.editor = true; init_editor(); set_up_router({view: view}); diff -r 9e531f5ffaeefedbfdcb71d3e9d4f1ca1a2aa85b -r 69d502188765dacd378a5ac75b49d2b0a0b33032 templates/webapps/galaxy/visualization/display.mako --- a/templates/webapps/galaxy/visualization/display.mako +++ b/templates/webapps/galaxy/visualization/display.mako @@ -94,9 +94,9 @@ vis_id: "${config.get('vis_id')}", dbkey: "${config.get('dbkey')}" }, - JSON.parse('${ h.to_json_string( config.get( 'viewport', dict() ) ) }'), - JSON.parse('${ h.to_json_string( config['tracks'] ).replace("'", "\\'") }'), - JSON.parse('${ h.to_json_string( config.get('bookmarks') ) }') + ${ h.to_json_string( config.get( 'viewport', dict() ) ) }, + ${ h.to_json_string( config['tracks'] ) }, + ${ h.to_json_string( config.get('bookmarks') ) } ); // Set up keyboard navigation. diff -r 9e531f5ffaeefedbfdcb71d3e9d4f1ca1a2aa85b -r 69d502188765dacd378a5ac75b49d2b0a0b33032 templates/webapps/galaxy/visualization/phyloviz.mako --- a/templates/webapps/galaxy/visualization/phyloviz.mako +++ b/templates/webapps/galaxy/visualization/phyloviz.mako @@ -168,9 +168,9 @@ }; $(function firstVizLoad(){ // calls when viz is loaded for the first time - var config = JSON.parse( '${ h.to_json_string( config )}'); + var config = ${ h.to_json_string( config )}; window.config = config; - var data = JSON.parse('${h.to_json_string(data)}'); + var data = ${h.to_json_string(data)}; window.data = data; initPhyloViz(data, config); }); https://bitbucket.org/galaxy/galaxy-central/commits/babedb4715aa/ Changeset: babedb4715aa User: jgoecks Date: 2013-05-30 22:57:27 Summary: Automated merge with next-stable Affected #: 3 files diff -r f8174b474884ceabf61d5e591963ed5849da655c -r babedb4715aaa3afeeebfe162f9e089625b1533a templates/webapps/galaxy/tracks/browser.mako --- a/templates/webapps/galaxy/tracks/browser.mako +++ b/templates/webapps/galaxy/tracks/browser.mako @@ -89,7 +89,7 @@ container: $("#browser-container"), name: $("#new-title").val(), dbkey: $("#new-dbkey").val() - }, JSON.parse('${ h.to_json_string( viewport_config ) }')); + }, ${ h.to_json_string( viewport_config ) } ); view.editor = true; init_editor(); set_up_router({view: view}); diff -r f8174b474884ceabf61d5e591963ed5849da655c -r babedb4715aaa3afeeebfe162f9e089625b1533a templates/webapps/galaxy/visualization/display.mako --- a/templates/webapps/galaxy/visualization/display.mako +++ b/templates/webapps/galaxy/visualization/display.mako @@ -94,9 +94,9 @@ vis_id: "${config.get('vis_id')}", dbkey: "${config.get('dbkey')}" }, - JSON.parse('${ h.to_json_string( config.get( 'viewport', dict() ) ) }'), - JSON.parse('${ h.to_json_string( config['tracks'] ).replace("'", "\\'") }'), - JSON.parse('${ h.to_json_string( config.get('bookmarks') ) }') + ${ h.to_json_string( config.get( 'viewport', dict() ) ) }, + ${ h.to_json_string( config['tracks'] ) }, + ${ h.to_json_string( config.get('bookmarks') ) } ); // Set up keyboard navigation. diff -r f8174b474884ceabf61d5e591963ed5849da655c -r babedb4715aaa3afeeebfe162f9e089625b1533a templates/webapps/galaxy/visualization/phyloviz.mako --- a/templates/webapps/galaxy/visualization/phyloviz.mako +++ b/templates/webapps/galaxy/visualization/phyloviz.mako @@ -168,9 +168,9 @@ }; $(function firstVizLoad(){ // calls when viz is loaded for the first time - var config = JSON.parse( '${ h.to_json_string( config )}'); + var config = ${ h.to_json_string( config )}; window.config = config; - var data = JSON.parse('${h.to_json_string(data)}'); + var data = ${h.to_json_string(data)}; window.data = data; initPhyloViz(data, config); }); 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.