1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/611ec861bde5/ changeset: 611ec861bde5 user: jgoecks date: 2011-11-02 22:48:22 summary: Trackster: (a) give every Drawable unique id and (b) remove unused reference to jquery.scrollTo. affected #: 2 files diff -r 9e90faf2cb1c58b19dc715243f4766223a6b3a47 -r 611ec861bde5a6c31eace77f94ab8024159cc77c static/scripts/trackster.js --- a/static/scripts/trackster.js +++ b/static/scripts/trackster.js @@ -654,6 +654,8 @@ * associated with a view and container. They optionally have a drag handle class. */ var Drawable = function(name, view, container, prefs, drag_handle_class) { + if (!Drawable.id_counter) { Drawable.id_counter = 0; } + this.id = Drawable.id_counter++; this.name = name; this.view = view; this.container = container; @@ -804,13 +806,11 @@ DrawableCollection.call(this, "DrawableGroup", name, view, container, prefs, "group-handle"); // HTML elements. - if (!DrawableGroup.id_counter) { DrawableGroup.id_counter = 0; } - var group_id = DrawableGroup.id_counter++ - this.container_div = $("<div/>").addClass("group").attr("id", "group_" + group_id).appendTo(this.container.content_div); + this.container_div = $("<div/>").addClass("group").attr("id", "group_" + this.id).appendTo(this.container.content_div); this.header_div = $("<div/>").addClass("track-header").appendTo(this.container_div); this.header_div.append($("<div/>").addClass(this.drag_handle_class)); this.name_div = $("<div/>").addClass("group-name menubutton popup").text(this.name).appendTo(this.header_div); - this.content_div = $("<div/>").addClass("content-div").attr("id", "group_" + group_id + "_content_div").appendTo(this.container_div); + this.content_div = $("<div/>").addClass("content-div").attr("id", "group_" + this.id + "_content_div").appendTo(this.container_div); // Set up containers/moving for group: register both container_div and content div as container // because both are used as containers (container div to recognize container, content_div to @@ -2329,9 +2329,6 @@ this.data_url_extra_params = {} this.data_query_wait = (data_query_wait ? data_query_wait : DEFAULT_DATA_QUERY_WAIT); this.dataset_check_url = converted_datasets_state_url; - - if (!Track.id_counter) { Track.id_counter = 0; } - this.id = Track.id_counter++; // // Create HTML element structure for track. diff -r 9e90faf2cb1c58b19dc715243f4766223a6b3a47 -r 611ec861bde5a6c31eace77f94ab8024159cc77c templates/tracks/browser.mako --- a/templates/tracks/browser.mako +++ b/templates/tracks/browser.mako @@ -42,7 +42,7 @@ <script type='text/javascript' src="${h.url_for('/static/scripts/excanvas.js')}"></script><![endif]--> -${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jstorage", "jquery.event.drag", "jquery.mousewheel", "jquery.autocomplete", "trackster", "trackster_ui", "jquery.ui.sortable.slider", "jquery.scrollTo", "farbtastic", "jquery.tipsy" )} +${h.js( "galaxy.base", "galaxy.panels", "json2", "jquery", "jstorage", "jquery.event.drag", "jquery.mousewheel", "jquery.autocomplete", "trackster", "trackster_ui", "jquery.ui.sortable.slider", "farbtastic", "jquery.tipsy" )} <script type="text/javascript"> // 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.