6f7dabcd1d87152560c0b66bb126bce0a0582415 larrym Wed Oct 19 16:53:59 2011 -0700 remove obsolete hgTracks.dragSelection diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 70bd049..8f3bd1a 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -1,34 +1,32 @@ // Javascript for use in hgTracks CGI // "use strict"; var debug = false; var browser; // browser ("msie", "safari" etc.) // move to utils.js? /* Data passed in from CGI via the hgTracks object: * * string cgiVersion // CGI_VERSION * string chromName // current chromosome * int winStart // genomic start coordinate (0-based, half-open) * int winEnd // genomic end coordinate * int newWinWidth // new width (in bps) if user clicks on the top ruler - * boolean dragSelection // true if we should allow drag and select * boolean revCmplDisp // true if we are in reverse display * int insideX // width of side-bar (in pixels) * int rulerClickHeight // height of ruler (in pixels) - zero if ruler is hidden - * boolean dragSelection // true if drag-and-select turned on * boolean inPlaceUpdate // true if in-place-update is turned on * int imgBox* // various drag-scroll values * boolean measureTiming // true if measureTiming is on * Object trackDb // hash of trackDb entries for tracks which are visible on current page */ function initVars() { // There are various entry points, so we call initVars in several places to make sure all is well if (!genomePos.original) { // remember initial position and size so we can restore it if user cancels genomePos.original = genomePos.getOriginalPos(); genomePos.originalSize = $('#size').text(); dragSelect.originalCursor = jQuery('body').css('cursor'); imageV2.imgTbl = $('#imgTbl'); // imageV2.enabled == true unless: advancedJavascript==false, or trackSearch, or config pg @@ -521,31 +519,31 @@ genomePos.set(genomePos.original, genomePos.originalSize); genomePos.original = genomePos.originalSize = null; } dragSelect.startTime = null; setTimeout('posting.allowMapClicks();',50); // Necessary incase the dragSelect.selectEnd was over a map item. select takes precedence. return true; }, load: function (firstTime) { var imgHeight = 0; if (imageV2.enabled) imgHeight = imageV2.imgTbl.height(); // No longer disable without ruler, because shift-drag still works - if(typeof(hgTracks) != "undefined" && hgTracks.dragSelection) { + if(typeof(hgTracks) != "undefined") { if (hgTracks.rulerClickHeight == undefined || hgTracks.rulerClickHeight == null) hgTracks.rulerClickHeight = 0; // will be zero if no ruler track var heights = hgTracks.rulerClickHeight; dragSelect.areaSelector = jQuery((imageV2.imgTbl).imgAreaSelect({ selectionColor: 'blue', outerColor: '', minHeight: imgHeight, maxHeight: imgHeight, onSelectStart: dragSelect.selectStart, onSelectChange: dragSelect.selectChange, onSelectEnd: dragSelect.selectEnd, autoHide: dragSelect.autoHideSetting, movable: false, @@ -1112,31 +1110,31 @@ // Trying to make sure there is always a imageV2.lastTrack so that we know where we are var id = ''; var a = /tr_(.*)/.exec($(this).attr('id')); // voodoo if(a && a[1]) { id = a[1]; } if (id.length > 0) { if (imageV2.lastTrack == null || imageV2.lastTrack.id != id) imageV2.lastTrack = rightClick.makeMapItem(id); // currentMapItem gets set by mapItemMapOver } // This is just backup }, mapItemMouseOver: function () { // Record data for current map area item - id = this.id; + var id = this.id; if (id == undefined || id == null || id.length == 0) { id = ''; var tr = $( this ).parents('tr.imgOrd'); if ( $(tr).length == 1 ) { var a = /tr_(.*)/.exec($(tr).attr('id')); // voodoo if(a && a[1]) { id = a[1]; } } } if (id.length > 0) { rightClick.currentMapItem = rightClick.makeMapItem(id); if(rightClick.currentMapItem != null) { rightClick.currentMapItem.href = this.href; rightClick.currentMapItem.title = this.title; @@ -3089,16 +3087,16 @@ // Track search uses tabs trackSearch.init(); // Drag select initialize if (imageV2.enabled) { // moved from window.load(). dragSelect.load(true); if($('#hgTrackUiDialog')) $('#hgTrackUiDialog').hide(); // Don't load contextMenu if jquery.contextmenu.js hasn't been loaded if (jQuery.fn.contextMenu) { rightClick.load(imageV2.imgTbl); } } -}); \ No newline at end of file +});