578933212e6c900f4cda77f4d9cd1e7d01b9ace1 kate Thu Nov 3 16:09:25 2016 -0700 Initialize tissues from cart. refs #17369 diff --git src/hg/js/hgGtexTrackSettings.js src/hg/js/hgGtexTrackSettings.js index 6b6e89f..dbec966 100644 --- src/hg/js/hgGtexTrackSettings.js +++ src/hg/js/hgGtexTrackSettings.js @@ -91,45 +91,49 @@ isOn = true; } // below can likely replace 3 lines after //this.classList.toggle('tissueSelected'); el = _svgDoc.getElementById(svgId); if (el !== null) { el.classList.toggle('tissueSelected'); if (isOn) { el.style.fill = "black"; } else { el.style.fill = "#737373"; } } } - - function onClickSetTissue(tis) { - // mark selected in tissue table - $('#' + tis).addClass('tissueSelected'); - var el = _svgDoc.getElementById(tis + "_Text_Hi"); + function setMapTissueEl(el) { + // set label dark if (el !== null) { el.classList.add('tissueSelected'); el.style.fill = "black"; var count = el.childElementCount; for (var i = 0; i < count; i++) { el.children[i].style.fill = "black"; } } } + function onClickSetTissue(tis) { + // mark selected in tissue table + $('#' + tis).addClass('tissueSelected'); + var el = _svgDoc.getElementById(tis + "_Text_Hi"); + setMapTissueEl(el); + } + function onClickClearTissue(tis) { // mark selected in tissue table $(tis).removeClass('tissueSelected'); var el = _svgDoc.getElementById(tis + "_Text_Hi"); if (el !== null) { el.classList.remove('tissueSelected'); el.style.fill = "#737373"; var count = el.childElementCount; for (var i = 0; i < count; i++) { el.children[i].style.fill = "#737373"; } } } @@ -214,30 +218,33 @@ toggleHighlightTissue(tis); } //function animateTissue(tis, i, ignore) { function animateTissue(tis) { //console.log(tis); // add handlers to tissue table var textEl; var picEl; $('#' + tis).click(tis, onClickToggleTissue); $('#' + tis).hover(onHoverTissue, onHoverTissue); // add mouseover handler to tissue label textEl = _svgDoc.getElementById(tis + "_Text_Hi"); if (textEl !== null) { + if ($('#' + tis).hasClass('tissueSelected')) { + setMapTissueEl(textEl); + } textEl.addEventListener("click", onMapClickToggleTissue); textEl.addEventListener("mouseenter", onMapHoverTissue); textEl.addEventListener("mouseleave", onMapHoverTissue); // mouseover, mouseout ? } // add mouseover handler to tissue shape picEl = _svgDoc.getElementById(tis + "_Pic_Lo"); if (picEl !== null) { picEl.addEventListener("click", onMapClickToggleTissue); picEl.addEventListener("mouseenter", onMapHoverTissue); picEl.addEventListener("mouseleave", onMapHoverTissue); // mouseover, mouseout ? } }