1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1479c52c26e2/ Changeset: 1479c52c26e2 User: jgoecks Date: 2013-11-12 16:10:13 Summary: More Trackster CSS cleanup. Affected #: 3 files diff -r cd12bf2ed5475c8c6ab72321e5865441c0805bd2 -r 1479c52c26e2bbc1fa4b367d1e718be966f5eb63 static/scripts/viz/trackster/tracks.js --- a/static/scripts/viz/trackster/tracks.js +++ b/static/scripts/viz/trackster/tracks.js @@ -1016,9 +1016,9 @@ } this.zo_link = $("<a/>").attr("id", "zoom-out").attr("title", "Zoom out").tooltip( {placement: 'bottom'} ) - .click(function() { view.zoom_out(); view.request_redraw(); }).appendTo(this.nav_controls); + .click(function() { view.zoom_out(); }).appendTo(this.nav_controls); this.zi_link = $("<a/>").attr("id", "zoom-in").attr("title", "Zoom in").tooltip( {placement: 'bottom'} ) - .click(function() { view.zoom_in(); view.request_redraw(); }).appendTo(this.nav_controls); + .click(function() { view.zoom_in(); }).appendTo(this.nav_controls); // Get initial set of chroms. this.load_chroms_deferred = this.load_chroms({low: 0}); @@ -1097,14 +1097,9 @@ // Dragging in the top label track allows selecting a region // to zoom in this.top_labeltrack.bind( "dragstart", function( e, d ) { - return $("<div />").css( { - "height": view.browser_content_div.height() + view.top_labeltrack.height() + view.nav_labeltrack.height() + 1, - "top": "0px", - "position": "absolute", - "background-color": "#ccf", - "opacity": 0.5, - "z-index": 1000 - } ).appendTo( $(this) ); + return $("<div/>").addClass('zoom-area').css( + "height", view.browser_content_div.height() + view.top_labeltrack.height() + view.nav_labeltrack.height() + 1 + ).appendTo( $(this) ); }).bind( "drag", function( e, d ) { $( d.proxy ).css({ left: Math.min( e.pageX, d.startX ) - view.container.offset().left, width: Math.abs( e.pageX - d.startX ) }); var min = Math.min(e.pageX, d.startX ) - view.container.offset().left, @@ -1549,6 +1544,7 @@ } this.low = Math.round(cur_center - new_half); this.high = Math.round(cur_center + new_half); + this.changed(); this.request_redraw(); }, @@ -3079,7 +3075,7 @@ // Step (c) for (re)moving tiles when clear_after is false. if (!clear_after) { this.tiles_div.children(".remove").removeClass("remove").remove(); } - // Use interval to check if tiles have been drawn. When all tiles are drawn, call post-draw actions. + // When all tiles are drawn, call post-draw actions. var track = this; $.when.apply($, tile_promises).then(function() { // Step (c) for (re)moving tiles when clear_after is true: @@ -3373,7 +3369,7 @@ if (this.left_offset) { left -= this.left_offset; } - tile_element.css({ position: 'absolute', top: 0, left: left }); + tile_element.css('left', left); if ( tile_element.hasClass("remove") ) { // Step (b) for (re)moving tiles. See _draw() function for description of algorithm @@ -3528,13 +3524,12 @@ tickDistance = Math.floor( Math.pow( 10, Math.floor( Math.log( range ) / Math.log( 10 ) ) ) ), position = Math.floor( view.low / tickDistance ) * tickDistance, width = this.view.container.width(), - new_div = $("<div style='position: relative; height: 1.3em;'></div>"); + new_div = $("<div/>").addClass('label-container'); while ( position < view.high ) { var screenPosition = ( position - view.low ) / range * width; - new_div.append( $("<div class='label'>" + commatize( position ) + "</div>").css( { - position: "absolute", + new_div.append( $("<div/>").addClass('label').text(commatize( position )).css( { // Reduce by one to account for border - left: screenPosition - 1 + left: screenPosition })); position += tickDistance; } diff -r cd12bf2ed5475c8c6ab72321e5865441c0805bd2 -r 1479c52c26e2bbc1fa4b367d1e718be966f5eb63 static/style/blue/trackster.css --- a/static/style/blue/trackster.css +++ b/static/style/blue/trackster.css @@ -26,14 +26,15 @@ .track-name{float:left;margin-top:2px} .tiles{background:url('../images/tracks/diag_bg.gif');position:relative;overflow:hidden} .overlay{position:absolute;left:0;top:0} -.track-tile{background:white}.track-tile canvas{position:relative;z-index:1} +.track-tile{position:absolute;background:white}.track-tile canvas{position:relative;z-index:1} .tile-message{border-bottom:solid 1px red;text-align:center;color:red;background-color:white} .track{border-bottom:1px solid #bbb}.track.error{background-color:#ECB4AF;background-image:none} .track.nodata .track-content{background-color:white;background-image:none} .track.pending .track-content{background-color:white;background-image:none} .track-content{text-align:center;position:relative;min-height:20px;padding:0px 0px 1px 0px} .loading{min-height:100px} -.label-track{font-size:10px;border:none;padding:0;margin:0;height:1.5em;overflow:hidden}.label-track .label{border-left:solid #999 1px;padding:1px;padding-bottom:2px;display:inline-block} +.label-track{font-size:10px;border:none;padding:0;margin:0;height:1.5em;overflow:hidden}.label-track .label-container{position:relative;height:1.3em} +.label-track .label{position:absolute;border-left:solid #999 1px;padding:1px;padding-bottom:2px;display:inline-block} .label-track .track-content{border:none;background:white} .reference-track{border:none;margin:0;padding:0;line-height:1}.reference-track .track-content{min-height:0px} .right-float{float:right;margin-left:5px} @@ -75,3 +76,4 @@ .icon.more-across{background:url('../images/fugue/arrow-transition-bw.png') no-repeat 0 0} .feature-popup{position:absolute;z-index:2;padding:5px;font-size:10px;filter:alpha(opacity=80);background-repeat:no-repeat;background-image:url(../images/tipsy.gif);background-position:top center} .feature-popup-inner{padding:5px 8px 4px 8px;background-color:black;color:white} +.zoom-area{position:absolute;top:0px;background-color:#ccf;opacity:0.5;z-index:2} diff -r cd12bf2ed5475c8c6ab72321e5865441c0805bd2 -r 1479c52c26e2bbc1fa4b367d1e718be966f5eb63 static/style/src/less/trackster.less --- a/static/style/src/less/trackster.less +++ b/static/style/src/less/trackster.less @@ -227,6 +227,7 @@ } .track-tile { + position: absolute; background: white; canvas { @@ -285,7 +286,13 @@ height: 1.5em; overflow: hidden; + .label-container { + position: relative; + height: 1.3em; + } + .label { + position: absolute; border-left: solid #999 1px; padding: 1px; padding-bottom: 2px; @@ -509,3 +516,11 @@ background-color: black; color: white; } + +.zoom-area { + position: absolute; + top: 0px; + background-color: #ccf; + opacity: 0.5; + z-index: @overlay-index; +} \ No newline at end of file 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.