41b33c613a673b9ccf2d13b8d87838e032ec6f12 max Fri Apr 6 15:20:43 2012 -0700 making pubs subtracks configurable, tdb changes + thanks to tim for help with javascript changes diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index bfb42b4..18c1322 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -2223,54 +2223,62 @@ o = new Object(); // console.dir(ele); str = "hilight mode"; if (!dragSelect.autoHideSetting) { str += selectedImg; } o[str] = { onclick: function(menuItemClicked, menuObject) { rightClick.hit(menuItemClicked, menuObject, "hilightMode"); return true; } }; menu.push(o); } //menu.push({"view image": {onclick: function(menuItemClicked, menuObject) { rightClick.hit(menuItemClicked, menuObject, "viewImg"); return true; }}}); } - if(rightClick.selectedMenuItem && rec && rec["configureBy"] != 'none') { + if(rightClick.selectedMenuItem && rec) { // Add cfg options at just shy of end... var o = new Object(); - if(tdbIsLeaf(rec) && (!tdbIsCompositeSubtrack(rec) || rec["configureBy"] != 'clickThrough')) { - // Note that subtracks never do clickThrough because composite cfg is the desired clickThrough + if(tdbIsLeaf(rec)) { + + if (rec["configureBy"] != 'none' + && (!tdbIsCompositeSubtrack(rec) || rec["configureBy"] != 'clickThrough')) { + // Note that subtracks never do clickThrough because + // parentTrack cfg is the desired clickThrough o[rightClick.makeImgTag("wrench.png")+" Configure "+rec.shortLabel] = { onclick: function(menuItemClicked, menuObject) { rightClick.hit(menuItemClicked, menuObject, "hgTrackUi_popup"); return true; } }; - if(rec.parentTrack != undefined) + } + if(rec.parentTrack != undefined) { o[rightClick.makeImgTag("folderWrench.png")+" Configure "+ rec.parentLabel + " track set..."] = { onclick: function(menuItemClicked, menuObject) { rightClick.hit(menuItemClicked,menuObject,"hgTrackUi_follow"); return true; } }; - } else + } + } else { + o[rightClick.makeImgTag("folderWrench.png")+" Configure "+rec.shortLabel + " track set..."] = { onclick: function(menuItemClicked, menuObject) { rightClick.hit(menuItemClicked, menuObject, "hgTrackUi_follow"); return true; } }; + } if(jQuery.floatMgr) { o[(rightClick.selectedMenuItem.id == rightClick.floatingMenuItem ? selectedImg : blankImg) + " float"] = { onclick: function(menuItemClicked, menuObject) { rightClick.hit(menuItemClicked, menuObject, "float"); return true; } }; } menu.push($.contextMenu.separator); menu.push(o); } // Add view image at end var o = new Object(); o[rightClick.makeImgTag("eye.png") + " View image"] = {