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

Commit

Permalink
Revert "Merge pull request #11958 from brave/ca--11632-2"
Browse files Browse the repository at this point in the history
This reverts commit b053019, reversing
changes made to 7024bff.
  • Loading branch information
bsclifton committed Nov 15, 2017
1 parent 7944403 commit b12d8bd
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 10 deletions.
4 changes: 0 additions & 4 deletions app/renderer/components/tabs/tab.js
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,6 @@ class Tab extends React.Component {
// if mouse entered a tab we only trigger a new preview
// if user is in previewMode, which is defined by mouse move
windowActions.setTabHoverState(this.props.frameKey, true, this.props.previewMode)
// In case there's a tab preview happening, cancel the preview
// when mouse is over a tab
windowActions.setTabPageHoverState(this.props.tabPageIndex, false)
}

onMouseMove () {
Expand Down Expand Up @@ -265,7 +262,6 @@ class Tab extends React.Component {
props.tabWidth = currentWindow.getIn(['ui', 'tabs', 'fixTabWidth'])
props.themeColor = tabUIState.getThemeColor(currentWindow, frameKey)
props.title = frame.get('title')
props.tabPageIndex = frameStateUtil.getTabPageIndex(currentWindow)
props.partOfFullPageSet = partOfFullPageSet
props.showAudioTopBorder = audioState.showAudioTopBorder(currentWindow, frameKey, isPinned)
props.centralizeTabIcons = tabUIState.centralizeTabIcons(currentWindow, frameKey, isPinned)
Expand Down
8 changes: 2 additions & 6 deletions app/renderer/components/tabs/tabPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ class TabPage extends React.Component {
}

onCloseTabPage () {
// if a tab page is closed, cancel the tab preview
windowActions.setTabPageHoverState(this.props.index, false)

return this.props.tabPageFrames
.map(frame => appActions.tabCloseRequested(frame.get('tabId')))
}
Expand All @@ -95,13 +92,12 @@ class TabPage extends React.Component {
return
case 1:
// Close tab page with middle click
// and eventually cancel the hover state
this.onCloseTabPage()
windowActions.setTabPageHoverState(this.props.index, false)
break
default:
// Setting the new active tab page
// should also cancel tab preview
windowActions.setTabPageIndex(this.props.index)
windowActions.setTabPageHoverState(this.props.index, false)
}
}

Expand Down

0 comments on commit b12d8bd

Please sign in to comment.