3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/120cd61c88ef/ Changeset: 120cd61c88ef User: jgoecks Date: 2014-07-09 16:39:05 Summary: Trackster: fixes for drawing groups from recent Backbone refactoring. Affected #: 2 files diff -r e9cef9ca217f8801f7efd72e913424c1cd0ded38 -r 120cd61c88efa535d3abb599fad933837ab4cec0 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -225,7 +225,8 @@ // unless flag set, create header. if (obj_dict.header !== false) { var header_view = new viz_views.TrackHeaderView({ - model: this + model: this, + id: this.id }); this.header_div = header_view.$el; @@ -552,6 +553,10 @@ // Set up filters. this.filters_manager = new filters_mod.FiltersManager(this); this.header_div.after(this.filters_manager.parent_div); + + // HACK: add div to clear floating elements. + this.filters_manager.parent_div.after( $("<div style='clear: both'/>") ); + // For saving drawables' filter managers when group-level filtering is done: this.saved_filters_managers = []; @@ -591,7 +596,7 @@ { name: "filters_icon", title: "Filters", - css_class: "filters-icon", + css_class: "ui-slider-050", on_click_fn: function(group) { // TODO: update Tooltip text. if (group.filters_manager.visible()) { diff -r e9cef9ca217f8801f7efd72e913424c1cd0ded38 -r 120cd61c88efa535d3abb599fad933837ab4cec0 static/scripts/viz/viz_views.js --- a/static/scripts/viz/viz_views.js +++ b/static/scripts/viz/viz_views.js @@ -20,14 +20,12 @@ // Icons container. this.action_icons = {}; this.render_action_icons(); - - this.$el.append( $("<div style='clear: both'/>") ); - + // Suppress double clicks in header so that they do not impact viz under header. this.$el.dblclick( function(e) { e.stopPropagation(); } ); // Needed for floating elts in header. - $("<div style='clear: both'/>").appendTo(this.container_div); + this.$el.append( $("<div style='clear: both'/>") ); }, update_name: function() { @@ -41,7 +39,7 @@ self.add_action_icon(icon_dict.name, icon_dict.title, icon_dict.css_class, icon_dict.on_click_fn, icon_dict.prepend, icon_dict.hide); }); - + // Set up behavior for modes popup. this.set_display_modes(this.model.display_modes); }, https://bitbucket.org/galaxy/galaxy-central/commits/b894ebecb393/ Changeset: b894ebecb393 User: jgoecks Date: 2014-07-09 16:51:15 Summary: Trackster: replace jQuery if/show/hide statements with simpler toggle. Affected #: 1 file diff -r 120cd61c88efa535d3abb599fad933837ab4cec0 -r b894ebecb393fe5f7cfe7717b0b8c3bb8a29201f static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -647,9 +647,7 @@ this.action_icons.filters_icon.hide(); } else if (num_drawables === 1) { - if (this.drawables[0] instanceof CompositeTrack) { - this.action_icons.composite_icon.show(); - } + this.action_icons.composite_icon.toggle(this.drawables[0] instanceof CompositeTrack); this.action_icons.filters_icon.hide(); } else { // There are 2 or more tracks. @@ -738,12 +736,7 @@ } // Show/hide icon based on filter availability. - if (this.filters_manager.filters.length > 0) { - this.action_icons.filters_icon.show(); - } - else { - this.action_icons.filters_icon.hide(); - } + this.action_icons.filters_icon.toggle(this.filters_manager.filters.length > 0); } else { this.action_icons.filters_icon.hide(); @@ -1134,12 +1127,7 @@ /** Add or remove intro div depending on view state. */ update_intro_div: function() { - if (this.drawables.length === 0) { - this.intro_div.show(); - } - else { - this.intro_div.hide(); - } + this.intro_div.toggle(this.drawables.length === 0); }, /** @@ -1716,12 +1704,7 @@ * Show or hide tool depending on tool visibility state. */ set_visible: function() { - if (this.model.is_visible()) { - this.$el.show(); - } - else { - this.$el.hide(); - } + this.$el.toggle(this.model.is_visible()); }, /** @@ -2691,24 +2674,13 @@ // // Show/hide filter icon. // - if (track.filters_available) { - track.action_icons.filters_icon.show(); - } - else { - track.action_icons.filters_icon.hide(); - } + track.action_icons.filters_icon.toggle(track.filters_available); // // Show/hide tool icons. // - if (track.tool) { - track.action_icons.tools_icon.show(); - track.action_icons.param_space_viz_icon.show(); - } - else { - track.action_icons.tools_icon.hide(); - track.action_icons.param_space_viz_icon.hide(); - } + track.action_icons.tools_icon.toggle(track.tool !== null); + track.action_icons.param_space_viz_icon.toggle(track.tool !== null); }, /** @@ -3834,12 +3806,7 @@ break; } } - if (!all_slotted) { - this.action_icons.show_more_rows_icon.show(); - } - else { - this.action_icons.show_more_rows_icon.hide(); - } + this.action_icons.show_more_rows_icon.toggle(!all_slotted); } else { this.action_icons.show_more_rows_icon.hide(); https://bitbucket.org/galaxy/galaxy-central/commits/f7000698a92d/ Changeset: f7000698a92d User: jgoecks Date: 2014-07-09 16:54:52 Summary: Automated merge Affected #: 1 file diff -r b894ebecb393fe5f7cfe7717b0b8c3bb8a29201f -r f7000698a92dd293b24563249cc50f7016b8ffcb lib/galaxy/webapps/galaxy/api/histories.py --- a/lib/galaxy/webapps/galaxy/api/histories.py +++ b/lib/galaxy/webapps/galaxy/api/histories.py @@ -201,7 +201,7 @@ delete( self, trans, id, **kwd ) * DELETE /api/histories/{id} delete the history with the given ``id`` - .. note:: Currently does not stop any active jobs in the history. + .. note:: Stops all active jobs in the history if purge is set. :type id: str :param id: the encoded id of the history to delete 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.