75c4c3562c23ee4c95edb061f13924a8b10b5ef1 tdreszer Tue Jun 7 19:31:46 2011 -0700 fix for redmine 4216. JS bug was tolerated by some browser? Not sure why this one wasn't seen before. diff --git src/hg/js/hgTracks.js src/hg/js/hgTracks.js index 23f1f68..34a7983 100644 --- src/hg/js/hgTracks.js +++ src/hg/js/hgTracks.js @@ -1329,37 +1329,37 @@ if($(imgTable).length > 0) { $(imgTable).tableDnD({ onDragClass: "trDrag", dragHandle: "dragHandle", scrollAmount: 40, onDragStart: function(ev, table, row) { saveMouseOffset(ev); $(document).bind('mousemove',blockTheMapOnMouseMove); // Can drag a contiguous set of rows if dragging blue button table.tableDnDConfig.dragObjects = [ row ]; // defaults to just the one var btn = $( row ).find('p.btnBlue'); // btnBlue means cursor over left button if (btn.length == 1) { table.tableDnDConfig.dragObjects = imgTblContiguousRowSet(row); var compositeSet = imgTblCompositeSet(row); - if (compositeSet.length > 0) + if (compositeSet && compositeSet.length > 0) $( compositeSet ).find('p.btn').addClass('blueButtons'); // blue persists } }, onDrop: function(table, row, dragStartIndex) { var compositeSet = imgTblCompositeSet(row); - if (compositeSet.length > 0) + if (compositeSet && compositeSet.length > 0) $( compositeSet ).find('p.btn').removeClass('blueButtons'); // blue persists if($(row).attr('rowIndex') != dragStartIndex) { // NOTE Even if dragging a contiguous set of rows, // still only need to check the one under the cursor. if(imgTblSetOrder) { imgTblSetOrder(table); } imgTblZipButtons( table ); } $(document).unbind('mousemove',blockTheMapOnMouseMove); setTimeout('blockUseMap=false;',50); // Necessary incase the onDrop was over a map item. onDrop takes precedence. } }); } if(imgBoxPortal) {