jepler/groovebasin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

client: code cleanup

Browse source
This commit is contained in:
Andrew Kelley 2014-04-13 00:13:55 -07:00
parent 453143040d
commit e1bd006566
1 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/client/app.js
View file

@ -1590,20 +1590,18 @@ function setUpPlaylistUi(){
return event.altKey;
});
$playlistItems.on('mousedown', '.pl-item', function(event){
var trackId, skip_drag;
if (started_drag) {
return true;
}
var trackId, skipDrag;
if (started_drag) return true;
$(document.activeElement).blur();
if (event.which === 1) {
event.preventDefault();
removeContextMenu();
trackId = $(this).attr('data-id');
skip_drag = false;
skipDrag = false;
if (!selection.isPlaylist()) {
selection.selectOnly('playlist', trackId);
} else if (event.ctrlKey || event.shiftKey) {
skip_drag = true;
skipDrag = true;
if (event.shiftKey && !event.ctrlKey) {
// range select click
selection.cursor = trackId;
@ -1619,7 +1617,7 @@ function setUpPlaylistUi(){
selection.selectOnly('playlist', trackId);
}
refreshSelection();
if (!skip_drag) {
if (!skipDrag) {
return performDrag(event, {
complete: function(result, event){
var delta, id;
@ -2182,11 +2180,11 @@ function genericTreeUi($elem, options){
function leftMouseDown(event){
event.preventDefault();
removeContextMenu();
var skip_drag = false;
var skipDrag = false;
if (!options.isSelectionOwner()) {
selection.selectOnly(type, key);
} else if (event.ctrlKey || event.shiftKey) {
skip_drag = true;
skipDrag = true;
selection.cursor = key;
selection.type = type;
if (!event.shiftKey && !event.ctrlKey) {
@ -2200,7 +2198,7 @@ function genericTreeUi($elem, options){
selection.selectOnly(type, key);
}
refreshSelection();
if (!skip_drag) {
if (!skipDrag) {
performDrag(event, {
complete: function(result, event){
var delta = {