From 758189ca9ebf11309bb62fc27dd136e6f546865f Mon Sep 17 00:00:00 2001
From: Jeremy Goecks <jeremy.goecks@emory.edu>
Date: Thu, 30 May 2013 16:57:03 -0400
Subject: [PATCH] Remove manual JSON parsing because it is not needed.

---
 templates/webapps/galaxy/tracks/browser.mako         | 2 +-
 templates/webapps/galaxy/visualization/display.mako  | 6 +++---
 templates/webapps/galaxy/visualization/phyloviz.mako | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/webapps/galaxy/tracks/browser.mako b/templates/webapps/galaxy/tracks/browser.mako
index 34b83627334..819242fa1ac 100644
--- a/templates/webapps/galaxy/tracks/browser.mako
+++ b/templates/webapps/galaxy/tracks/browser.mako
@@ -89,7 +89,7 @@ ${render_trackster_js_files()}
                     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 --git a/templates/webapps/galaxy/visualization/display.mako b/templates/webapps/galaxy/visualization/display.mako
index 31d3ed5fb2d..7c3ec14808e 100644
--- 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 --git a/templates/webapps/galaxy/visualization/phyloviz.mako b/templates/webapps/galaxy/visualization/phyloviz.mako
index 7a8f8d7d62a..f9f56474a3f 100644
--- 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);
             });