Skip to content
This repository has been archived by the owner on Dec 11, 2019. It is now read-only.

Commit

Permalink
Drag tab to tab page should not create new window
Browse files Browse the repository at this point in the history
Instead it should move the tab into that tab page like it used to

Drag controller must know about valid drop targets in app store now.

Fix #8498

Auditors: @luixxiul
  • Loading branch information
bbondy committed Apr 26, 2017
1 parent 814f6f7 commit 50bf50c
Showing 1 changed file with 4 additions and 0 deletions.
4 changes: 4 additions & 0 deletions app/renderer/components/tabs/tabPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ const dragTypes = require('../../../../js/constants/dragTypes')
// Utils
const cx = require('../../../../js/lib/classSet')
const {onTabPageContextMenu} = require('../../../../js/contextMenus')
const {getCurrentWindowId} = require('../../currentWindow')
const dndData = require('../../../../js/dndData')

class TabPage extends ImmutableComponent {
Expand Down Expand Up @@ -46,6 +47,9 @@ class TabPage extends ImmutableComponent {
if (this.props.tabPageFrames.size === 0) {
return
}

appActions.dataDropped(getCurrentWindowId())

const moveToFrame = this.props.tabPageFrames.get(0)
const sourceDragData = dndData.getDragData(e.dataTransfer, dragTypes.TAB)
const sourceDragFromPageIndex = this.props.sourceDragFromPageIndex
Expand Down

1 comment on commit 50bf50c

@luixxiul
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

Please sign in to comment.