Merge pull request #6809 from NejcZdovc/hotfix/#6033-dnd-tabs

Fixed dnd for tabs
brave · Jan 22, 2017 · e642b2d · e642b2d
2 parents e22b87c + 2241a04
commit e642b2d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/js/dnd.js b/js/dnd.js
@@ -45,7 +45,7 @@ module.exports.onDragOver = (dragType, sourceBoundingRect, draggingOverKey, drag
 
   e.preventDefault()
   e.dataTransfer.dropEffect = 'move'
-  // Otherise, only accept it if we have some frameProps
+  // Otherwise, only accept it if we have some frameProps
   if (!dndData.hasDragData(e.dataTransfer, dragType)) {
     windowActions.setIsBeingDraggedOverDetail(dragType, draggingOverKey, {
       draggingOverLeftHalf: false,

diff --git a/js/dndData.js b/js/dndData.js
@@ -5,7 +5,7 @@
 const Immutable = require('immutable')
 
 module.exports.hasDragData = (dataTransfer, dragType) => {
-  return !!dataTransfer.getData(`application/x-brave-${dragType}`)
+  return dataTransfer.types.includes(`application/x-brave-${dragType}`)
 }
 
 module.exports.getDragData = (dataTransfer, dragType) => {