1 new changeset in galaxy-central:
http://bitbucket.org/galaxy/galaxy-central/changeset/1478b77001bd/
changeset: 1478b77001bd
user: jgoecks
date: 2011-09-30 20:21:51
summary: Trackster: fixes for adding a dataset to a new visualization.
affected #: 3 files (-1 bytes)
--- a/static/scripts/packed/trackster_ui.js Fri Sep 30 14:03:58 2011 -0400
+++ b/static/scripts/packed/trackster_ui.js Fri Sep 30 14:21:51 2011 -0400
@@ -1,1 +1,1 @@
-var add_bookmark=function(b,a){var
g=$("#bookmarks-container"),d=$("<div/>").addClass("bookmark").appendTo(g),c=$("<div/>").addClass("delete-icon-container").appendTo(d).click(function(){d.slideUp("fast");d.remove();view.has_changes=true;return
false}),e=$("<a href=''/>").addClass("icon-button
delete").appendTo(c),f=$("<div/>").addClass("position").appendTo(d),h=$("<a
href=''/>").text(b).appendTo(f).click(function(){view.go_to(b);return
false});annotation_div=get_editable_text_elt(a,true).addClass("annotation").appendTo(d);view.has_changes=true;return
d};var
addable_objects={LineTrack:LineTrack,FeatureTrack:FeatureTrack,ReadTrack:ReadTrack,DrawableGroup:DrawableGroup};var
track_from_dict=function(c,b){var a=new
addable_objects[c.track_type](c.name,view,b,c.hda_ldda,c.dataset_id,c.prefs,c.filters,c.tool);if(c.mode){a.change_mode(c.mode)}return
a};var drawable_collection_from_dict=function(f,a){var e=new
addable_objects[f.obj_type](f.name,view,a,f.prefs,view.viewport_container,view);for(var
d=0;d<f.drawables.length;d++){var
b=f.drawables[d],c;if(b.track_type){c=track_from_dict(b,e)}else{c=drawable_collection_from_dict(b)}e.add_drawable(c);e.content_div.append(c.container_div)}return
e};var
drawable_from_dict=function(b,a){return(b.track_type?track_from_dict(b,a):drawable_collection_from_dict(b,a))};var
create_visualization=function(b,e,g,c,a,d,f){view=new
View(b,e,g,c);view.editor=true;$.when(view.load_chroms_deferred).then(function(){var
k=a.chrom,p=a.start,h=a.end,m=a.overview;if(k&&(p!==undefined)&&h){view.change_chrom(k,p,h)}if(d){var
o;for(var j=0;j<d.length;j++){o=d[j];view.add_drawable(drawable_from_dict(o,view))}}var
n;for(var
j=0;j<view.tracks.length;j++){if(view.tracks[j].name==m){view.set_overview(view.tracks[j]);break}}if(f){var
l;for(var
j=0;j<f.length;j++){l=f[j];add_bookmark(l.position,l.annotation)}}view.has_changes=false});return
view};var
init_keyboard_nav=function(a){$(document).keydown(function(b){if($(b.srcElement).is(":input")){return}switch(b.which){case
37:a.move_fraction(0.25);break;case 38:var
c=Math.round(a.viewport_container.height()/15);a.viewport_container.scrollTo("-="+c+"px");break;case
39:a.move_fraction(-0.25);break;case 40:var
c=Math.round(a.viewport_container.height()/15);a.viewport_container.scrollTo("+="+c+"px");break}})};
\ No newline at end of file
+var add_bookmark=function(b,a){var
g=$("#bookmarks-container"),d=$("<div/>").addClass("bookmark").appendTo(g),c=$("<div/>").addClass("delete-icon-container").appendTo(d).click(function(){d.slideUp("fast");d.remove();view.has_changes=true;return
false}),e=$("<a href=''/>").addClass("icon-button
delete").appendTo(c),f=$("<div/>").addClass("position").appendTo(d),h=$("<a
href=''/>").text(b).appendTo(f).click(function(){view.go_to(b);return
false});annotation_div=get_editable_text_elt(a,true).addClass("annotation").appendTo(d);view.has_changes=true;return
d};var
addable_objects={LineTrack:LineTrack,FeatureTrack:FeatureTrack,ReadTrack:ReadTrack,DrawableGroup:DrawableGroup};var
track_from_dict=function(c,b){var a=new
addable_objects[c.track_type](c.name,view,b,c.hda_ldda,c.dataset_id,c.prefs,c.filters,c.tool);if(c.mode){a.change_mode(c.mode)}return
a};var drawable_collection_from_dict=function(f,a){var e=new
addable_objects[f.obj_type](f.name,view,a,f.prefs,view.viewport_container,view);for(var
d=0;d<f.drawables.length;d++){var
b=f.drawables[d],c;if(b.track_type){c=track_from_dict(b,e)}else{c=drawable_collection_from_dict(b)}e.add_drawable(c);e.content_div.append(c.container_div)}return
e};var
drawable_from_dict=function(b,a){return(b.track_type?track_from_dict(b,a):drawable_collection_from_dict(b,a))};var
create_visualization=function(b,e,g,c,a,d,f){view=new
View(b,e,g,c);view.editor=true;$.when(view.load_chroms_deferred).then(function(){if(a){var
k=a.chrom,p=a.start,h=a.end,m=a.overview;if(k&&(p!==undefined)&&h){view.change_chrom(k,p,h)}}if(d){var
o;for(var j=0;j<d.length;j++){o=d[j];view.add_drawable(drawable_from_dict(o,view))}}var
n;for(var
j=0;j<view.tracks.length;j++){if(view.tracks[j].name==m){view.set_overview(view.tracks[j]);break}}if(f){var
l;for(var
j=0;j<f.length;j++){l=f[j];add_bookmark(l.position,l.annotation)}}view.has_changes=false});return
view};var
init_keyboard_nav=function(a){$(document).keydown(function(b){if($(b.srcElement).is(":input")){return}switch(b.which){case
37:a.move_fraction(0.25);break;case 38:var
c=Math.round(a.viewport_container.height()/15);a.viewport_container.scrollTo("-="+c+"px");break;case
39:a.move_fraction(-0.25);break;case 40:var
c=Math.round(a.viewport_container.height()/15);a.viewport_container.scrollTo("+="+c+"px");break}})};
\ No newline at end of file
--- a/static/scripts/trackster_ui.js Fri Sep 30 14:03:58 2011 -0400
+++ b/static/scripts/trackster_ui.js Fri Sep 30 14:21:51 2011 -0400
@@ -89,15 +89,17 @@
view = new View(parent_elt, title, id, dbkey);
view.editor = true;
$.when( view.load_chroms_deferred ).then(function() {
- // Viewport config.
- var
- chrom = viewport_config.chrom,
- start = viewport_config.start,
- end = viewport_config.end,
- overview_track_name = viewport_config.overview;
+ // Viewport config.
+ if (viewport_config) {
+ var
+ chrom = viewport_config.chrom,
+ start = viewport_config.start,
+ end = viewport_config.end,
+ overview_track_name = viewport_config.overview;
- if (chrom && (start !== undefined) && end) {
- view.change_chrom(chrom, start, end);
+ if (chrom && (start !== undefined) && end) {
+ view.change_chrom(chrom, start, end);
+ }
}
// Add drawables to view.
--- a/templates/tracks/browser.mako Fri Sep 30 14:03:58 2011 -0400
+++ b/templates/tracks/browser.mako Fri Sep 30 14:21:51 2011 -0400
@@ -166,7 +166,7 @@
url: "${h.url_for( action='add_track_async' )}",
data: { hda_id: "${add_dataset}" },
dataType: "json",
- success: function(track_data) { view.add_drawable(
track_from_dict(track_data) ) }
+ success: function(track_data) { view.add_drawable(
track_from_dict(track_data, view) ) }
});
%endif
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.