From 58f7322a0968b7db88c6043b44839636aea7bae5 Mon Sep 17 00:00:00 2001 From: Hector Garcia Date: Tue, 10 Nov 2015 22:22:51 +0000 Subject: [PATCH] Tighten up drag and drop code * Break out of `defaultDragEnterTeam` immediately for non-file entities --- js/client-teambuilder.js | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/js/client-teambuilder.js b/js/client-teambuilder.js index 8ab4cafba..66999a063 100644 --- a/js/client-teambuilder.js +++ b/js/client-teambuilder.js @@ -463,11 +463,12 @@ } }, defaultDragEnterTeam: function (e) { - // Drag originated outside teambuilder - if (!e.originalEvent.dataTransfer) return; - if (!e.originalEvent.dataTransfer.files) return; - if (e.originalEvent.dataTransfer.files[0] && e.originalEvent.dataTransfer.files[0].name.slice(-4) !== '.txt') return; - // We're dragging a .txt file! It might be a team! + var dataTransfer = e.originalEvent.dataTransfer; + if (!dataTransfer) return; + if (dataTransfer.types.indexOf && dataTransfer.types.indexOf('Files') === -1) return; + if (dataTransfer.types.contains && !dataTransfer.types.contains('Files')) return; + if (dataTransfer.files[0] && dataTransfer.files[0].name.slice(-4) !== '.txt') return; + // We're dragging a file! It might be a team! this.$('.teamlist').append('
  • '); app.dragging = this.$('.dragging .team')[0]; app.draggingLoc = Storage.teams.length;