[galaxy-commits] commit/galaxy-central: jgoecks: Fix bugs in Trackster refactoring.

18 Sep 2012

1 new commit in galaxy-central:


https://bitbucket.org/galaxy/galaxy-central/changeset/2f655fb9e6a8/
changeset:   2f655fb9e6a8
user:        jgoecks
date:        2012-09-18 19:48:06
summary:     Fix bugs in Trackster refactoring.
affected #:  1 file

diff -r aa1ad2112bb7918987dc31250ac214e45ba75641 -r 2f655fb9e6a8873f1faff3b0fed4c0288a2e4c2b static/scripts/viz/trackster_ui.js

--- a/static/scripts/viz/trackster_ui.js
+++ b/static/scripts/viz/trackster_ui.js
@@ -12,12 +12,12 @@
         this.baseURL = baseURL;
     },
 
-
     /**
      * Create button menu
      */ 
      createButtonMenu: function() {
-        var menu = create_icon_buttons_menu([
+        var self = this,
+            menu = create_icon_buttons_menu([
             { icon_class: 'plus-button', title: 'Add tracks', on_click: function() { 
                 add_datasets(add_datasets_url, add_track_async_url, function(tracks) {
                     _.each(tracks, function(track) {
@@ -36,8 +36,7 @@
                 icon_class: 'globe',
                 title: 'Circster',
                 on_click: function() {
-                    // Add viz id dynamically so that newly saved visualizations work as well.
-                    window.location = "${h.url_for( controller='visualization', action='circster' )}?id=" + view.vis_id;
+                    window.location = self.baseURL + 'visualization/circster?id=' + view.vis_id;
                 }
             },
             { icon_class: 'disk--arrow', title: 'Save', on_click: function() { 
@@ -86,7 +85,7 @@
                 });
             } },
             { icon_class: 'cross-circle', title: 'Close', on_click: function() { 
-                window.location = "${h.url_for( controller='visualization', action='list' )}";
+                window.location = self.baseURL + "visualization/list";
             } }
         ], 
         { 
@@ -126,7 +125,7 @@
                                     $.ajax({
                                         url: this.baseURL + "/visualization/bookmarks_from_dataset",
                                         data: data,
-                                        dataType: "json",
+                                        dataType: "json"
                                     }).then( function(data) {
                                         for( i = 0; i < data.data.length; i++ ) {
                                             var row = data.data[i];
@@ -254,7 +253,7 @@
             switch(e.which) {
                 case 37:
                     view.move_fraction(0.25);
-                    break
+                    break;
                 case 38:
                     var change = Math.round(view.viewport_container.height()/15.0);
                     view.viewport_container.scrollTop( view.viewport_container.scrollTop() - 20);

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.

    

[galaxy-commits] commit/galaxy-central: jgoecks: Fix bugs in Trackster refactoring.

Bitbucket