Skip to content

Conversation

@kafka-yu
Copy link
Contributor

fix the issue when open on-hold call in calls tab that still sees the previous merging call

  • add a switch in CallCtrlPage to control use multiple layouts supporting

@kafka-yu kafka-yu requested review from huanhulan and u9520107 August 24, 2018 09:11
@kafka-yu kafka-yu force-pushed the RCINT-7716-doublemerging branch from ea5875b to b316f15 Compare August 27, 2018 02:16
Copy link
Contributor

Choose a reason for hiding this comment

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

remove "/conferenceCall/mergeCtrl"

Copy link
Contributor

Choose a reason for hiding this comment

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

indexof

Copy link
Contributor

Choose a reason for hiding this comment

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

indexof

) {
if (
routerInteraction.currentPath === '/conferenceCall/mergeCtrl' ||
routerInteraction.currentPath.indexOf('/calls/active') === 0 ||
Copy link
Contributor

Choose a reason for hiding this comment

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

remove line 247&248

@kafka-yu kafka-yu merged commit b7be604 into ringcentral:master Aug 27, 2018
@kafka-yu kafka-yu deleted the RCINT-7716-doublemerging branch August 27, 2018 06:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants