Skip to content

Commit 27eccff

Browse files
committed
fixed volume setting to mute always when user scrolls down page
1 parent 5b92c5a commit 27eccff

7 files changed

Lines changed: 18 additions & 18 deletions

File tree

src/components/playbackRateBar/playbackRateBarContainer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@ const handlers = {
1515
const offset = getElementOffset(bar);
1616
const w = bar.getBoundingClientRect().width;
1717
const h = bar.getBoundingClientRect().height;
18-
const x = e.pageX - offset.left;
19-
const y = (h - e.pageY) + offset.top;
18+
const x = e.clientX - offset.left;
19+
const y = (h - e.clientY) + offset.top;
2020
let ratio;
2121

2222
if (props.verticalPlaybackRate) {

src/components/playbackRateBar/playbackRateBarContainer.spec.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ const mockBar = {
1818
}),
1919
};
2020
const mockClickEvent = {
21-
pageX: 20,
22-
pageY: 100,
21+
clientX: 20,
22+
clientY: 100,
2323
preventDefault: expect.createSpy(),
2424
};
2525
const mockTouchEvent = {
2626
touches: [
2727
{
28-
pageX: 20,
29-
pageY: 100,
28+
clientX: 20,
29+
clientY: 100,
3030
},
3131
],
3232
preventDefault: expect.createSpy(),

src/components/seekBar/seekBarContainer.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const mapStateToProps = ({ jPlayers }, { id }) => ({
1111
const handlers = {
1212
movePlayHead: props => (bar, e) => {
1313
const offset = getElementOffset(bar);
14-
const x = e.pageX - offset.left;
14+
const x = e.clientX - offset.left;
1515
const w = bar.getBoundingClientRect().width;
1616
const percentage = 100 * (x / w);
1717

src/components/seekBar/seekBarContainer.spec.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ const mockBar = {
1818
}),
1919
};
2020
const mockClickEvent = {
21-
pageX: 20,
22-
pageY: 100,
21+
clientX: 20,
22+
clientY: 100,
2323
preventDefault: expect.createSpy(),
2424
};
2525
const mockTouchEvent = {
2626
touches: [
2727
{
28-
pageX: 20,
29-
pageY: 100,
28+
clientX: 20,
29+
clientY: 100,
3030
},
3131
],
3232
preventDefault: expect.createSpy(),

src/components/volumeBar/volumeBarContainer.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ const handlers = {
1313
const offset = getElementOffset(bar);
1414
const w = bar.getBoundingClientRect().width;
1515
const h = bar.getBoundingClientRect().height;
16-
const y = (h - e.pageY) + offset.top;
17-
const x = e.pageX - offset.left;
16+
const y = (h - e.clientY) + offset.top;
17+
const x = e.clientX - offset.left;
1818

1919
if (props.verticalVolume) {
2020
props.setVolume(props.id, y / h);

src/components/volumeBar/volumeBarContainer.spec.jsx

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,15 @@ const mockBar = {
1818
}),
1919
};
2020
const mockClickEvent = {
21-
pageX: 20,
22-
pageY: 100,
21+
clientX: 20,
22+
clientY: 100,
2323
preventDefault: expect.createSpy(),
2424
};
2525
const mockTouchEvent = {
2626
touches: [
2727
{
28-
pageX: 20,
29-
pageY: 100,
28+
clientX: 20,
29+
clientY: 100,
3030
},
3131
],
3232
preventDefault: expect.createSpy(),

yarn.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5893,7 +5893,7 @@ react-addons-test-utils@^15.4.1:
58935893
version "15.6.2"
58945894
resolved "https://registry.yarnpkg.com/react-addons-test-utils/-/react-addons-test-utils-15.6.2.tgz#c12b6efdc2247c10da7b8770d185080a7b047156"
58955895

5896-
react-dom@15:
5896+
react-dom@^15.0.0:
58975897
version "15.6.2"
58985898
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-15.6.2.tgz#41cfadf693b757faf2708443a1d1fd5a02bef730"
58995899
dependencies:

0 commit comments

Comments
 (0)