mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-21 17:25:36 +00:00
Bug 1319950 - Use consistent naming with viewport properties. r=gl
Use "change" instead of "update" terminology with viewport properties. Remove redundant "viewport" word from viewport changes. MozReview-Commit-ID: HSFLiZyTVYy --HG-- rename : devtools/client/responsive.html/test/unit/test_change_viewport_device.js => devtools/client/responsive.html/test/unit/test_change_device.js extra : rebase_source : ddf227119edc0e022d586cf46b448e1891d059aa
This commit is contained in:
parent
cff6bbb553
commit
cb11da5ada
@ -39,7 +39,10 @@ createEnum([
|
|||||||
// The pixel ratio of the viewport has changed. This may be triggered by the user
|
// The pixel ratio of the viewport has changed. This may be triggered by the user
|
||||||
// when changing the device displayed in the viewport, or when a pixel ratio is
|
// when changing the device displayed in the viewport, or when a pixel ratio is
|
||||||
// selected from the DPR dropdown.
|
// selected from the DPR dropdown.
|
||||||
"CHANGE_VIEWPORT_PIXEL_RATIO",
|
"CHANGE_PIXEL_RATIO",
|
||||||
|
|
||||||
|
// Change the touch simulation state.
|
||||||
|
"CHANGE_TOUCH_SIMULATION",
|
||||||
|
|
||||||
// Indicates that the device list is being loaded
|
// Indicates that the device list is being loaded
|
||||||
"LOAD_DEVICE_LIST_START",
|
"LOAD_DEVICE_LIST_START",
|
||||||
@ -68,7 +71,4 @@ createEnum([
|
|||||||
// Update the device modal open state.
|
// Update the device modal open state.
|
||||||
"UPDATE_DEVICE_MODAL_OPEN",
|
"UPDATE_DEVICE_MODAL_OPEN",
|
||||||
|
|
||||||
// Update the touch simulation enabled state.
|
|
||||||
"UPDATE_TOUCH_SIMULATION_ENABLED",
|
|
||||||
|
|
||||||
], module.exports);
|
], module.exports);
|
||||||
|
@ -7,14 +7,14 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const {
|
const {
|
||||||
UPDATE_TOUCH_SIMULATION_ENABLED
|
CHANGE_TOUCH_SIMULATION
|
||||||
} = require("./index");
|
} = require("./index");
|
||||||
|
|
||||||
module.exports = {
|
module.exports = {
|
||||||
|
|
||||||
updateTouchSimulationEnabled(enabled = false) {
|
changeTouchSimulation(enabled) {
|
||||||
return {
|
return {
|
||||||
type: UPDATE_TOUCH_SIMULATION_ENABLED,
|
type: CHANGE_TOUCH_SIMULATION,
|
||||||
enabled,
|
enabled,
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
const {
|
const {
|
||||||
ADD_VIEWPORT,
|
ADD_VIEWPORT,
|
||||||
CHANGE_DEVICE,
|
CHANGE_DEVICE,
|
||||||
CHANGE_VIEWPORT_PIXEL_RATIO,
|
CHANGE_PIXEL_RATIO,
|
||||||
RESIZE_VIEWPORT,
|
RESIZE_VIEWPORT,
|
||||||
ROTATE_VIEWPORT
|
ROTATE_VIEWPORT
|
||||||
} = require("./index");
|
} = require("./index");
|
||||||
@ -37,9 +37,9 @@ module.exports = {
|
|||||||
/**
|
/**
|
||||||
* Change the viewport pixel ratio.
|
* Change the viewport pixel ratio.
|
||||||
*/
|
*/
|
||||||
changeViewportPixelRatio(id, pixelRatio = 0) {
|
changePixelRatio(id, pixelRatio = 0) {
|
||||||
return {
|
return {
|
||||||
type: CHANGE_VIEWPORT_PIXEL_RATIO,
|
type: CHANGE_PIXEL_RATIO,
|
||||||
id,
|
id,
|
||||||
pixelRatio,
|
pixelRatio,
|
||||||
};
|
};
|
||||||
|
@ -17,10 +17,10 @@ const {
|
|||||||
} = require("./actions/devices");
|
} = require("./actions/devices");
|
||||||
const { changeNetworkThrottling } = require("./actions/network-throttling");
|
const { changeNetworkThrottling } = require("./actions/network-throttling");
|
||||||
const { takeScreenshot } = require("./actions/screenshot");
|
const { takeScreenshot } = require("./actions/screenshot");
|
||||||
const { updateTouchSimulationEnabled } = require("./actions/touch-simulation");
|
const { changeTouchSimulation } = require("./actions/touch-simulation");
|
||||||
const {
|
const {
|
||||||
changeDevice,
|
changeDevice,
|
||||||
changeViewportPixelRatio,
|
changePixelRatio,
|
||||||
resizeViewport,
|
resizeViewport,
|
||||||
rotateViewport
|
rotateViewport
|
||||||
} = require("./actions/viewports");
|
} = require("./actions/viewports");
|
||||||
@ -47,6 +47,16 @@ let App = createClass({
|
|||||||
window.postMessage({ type: "browser-mounted" }, "*");
|
window.postMessage({ type: "browser-mounted" }, "*");
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onChangeDevice(id, device) {
|
||||||
|
window.postMessage({
|
||||||
|
type: "change-device",
|
||||||
|
device,
|
||||||
|
}, "*");
|
||||||
|
this.props.dispatch(changeDevice(id, device.name));
|
||||||
|
this.props.dispatch(changeTouchSimulation(device.touch));
|
||||||
|
this.props.dispatch(changePixelRatio(id, device.pixelRatio));
|
||||||
|
},
|
||||||
|
|
||||||
onChangeNetworkThrottling(enabled, profile) {
|
onChangeNetworkThrottling(enabled, profile) {
|
||||||
window.postMessage({
|
window.postMessage({
|
||||||
type: "change-network-throtting",
|
type: "change-network-throtting",
|
||||||
@ -56,23 +66,20 @@ let App = createClass({
|
|||||||
this.props.dispatch(changeNetworkThrottling(enabled, profile));
|
this.props.dispatch(changeNetworkThrottling(enabled, profile));
|
||||||
},
|
},
|
||||||
|
|
||||||
onChangeViewportDevice(id, device) {
|
onChangePixelRatio(pixelRatio) {
|
||||||
window.postMessage({
|
window.postMessage({
|
||||||
type: "change-viewport-device",
|
type: "change-pixel-ratio",
|
||||||
device,
|
|
||||||
}, "*");
|
|
||||||
this.props.dispatch(changeDevice(id, device.name));
|
|
||||||
this.props.dispatch(updateTouchSimulationEnabled(device.touch));
|
|
||||||
this.props.dispatch(changeViewportPixelRatio(id, device.pixelRatio));
|
|
||||||
},
|
|
||||||
|
|
||||||
onChangeViewportPixelRatio(pixelRatio) {
|
|
||||||
window.postMessage({
|
|
||||||
type: "change-viewport-pixel-ratio",
|
|
||||||
pixelRatio,
|
pixelRatio,
|
||||||
}, "*");
|
}, "*");
|
||||||
|
this.props.dispatch(changePixelRatio(0, pixelRatio));
|
||||||
|
},
|
||||||
|
|
||||||
this.props.dispatch(changeViewportPixelRatio(0, pixelRatio));
|
onChangeTouchSimulation(enabled) {
|
||||||
|
window.postMessage({
|
||||||
|
type: "change-touch-simulation",
|
||||||
|
enabled,
|
||||||
|
}, "*");
|
||||||
|
this.props.dispatch(changeTouchSimulation(enabled));
|
||||||
},
|
},
|
||||||
|
|
||||||
onContentResize({ width, height }) {
|
onContentResize({ width, height }) {
|
||||||
@ -111,15 +118,6 @@ let App = createClass({
|
|||||||
this.props.dispatch(updateDeviceModalOpen(isOpen));
|
this.props.dispatch(updateDeviceModalOpen(isOpen));
|
||||||
},
|
},
|
||||||
|
|
||||||
onUpdateTouchSimulation(isEnabled) {
|
|
||||||
window.postMessage({
|
|
||||||
type: "update-touch-simulation",
|
|
||||||
enabled: isEnabled,
|
|
||||||
}, "*");
|
|
||||||
|
|
||||||
this.props.dispatch(updateTouchSimulationEnabled(isEnabled));
|
|
||||||
},
|
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
let {
|
let {
|
||||||
devices,
|
devices,
|
||||||
@ -133,9 +131,10 @@ let App = createClass({
|
|||||||
|
|
||||||
let {
|
let {
|
||||||
onBrowserMounted,
|
onBrowserMounted,
|
||||||
|
onChangeDevice,
|
||||||
onChangeNetworkThrottling,
|
onChangeNetworkThrottling,
|
||||||
onChangeViewportDevice,
|
onChangePixelRatio,
|
||||||
onChangeViewportPixelRatio,
|
onChangeTouchSimulation,
|
||||||
onContentResize,
|
onContentResize,
|
||||||
onDeviceListUpdate,
|
onDeviceListUpdate,
|
||||||
onExit,
|
onExit,
|
||||||
@ -144,7 +143,6 @@ let App = createClass({
|
|||||||
onScreenshot,
|
onScreenshot,
|
||||||
onUpdateDeviceDisplayed,
|
onUpdateDeviceDisplayed,
|
||||||
onUpdateDeviceModalOpen,
|
onUpdateDeviceModalOpen,
|
||||||
onUpdateTouchSimulation,
|
|
||||||
} = this;
|
} = this;
|
||||||
|
|
||||||
let selectedDevice = "";
|
let selectedDevice = "";
|
||||||
@ -168,10 +166,10 @@ let App = createClass({
|
|||||||
selectedPixelRatio,
|
selectedPixelRatio,
|
||||||
touchSimulation,
|
touchSimulation,
|
||||||
onChangeNetworkThrottling,
|
onChangeNetworkThrottling,
|
||||||
onChangeViewportPixelRatio,
|
onChangePixelRatio,
|
||||||
|
onChangeTouchSimulation,
|
||||||
onExit,
|
onExit,
|
||||||
onScreenshot,
|
onScreenshot,
|
||||||
onUpdateTouchSimulation,
|
|
||||||
}),
|
}),
|
||||||
Viewports({
|
Viewports({
|
||||||
devices,
|
devices,
|
||||||
@ -179,7 +177,7 @@ let App = createClass({
|
|||||||
screenshot,
|
screenshot,
|
||||||
viewports,
|
viewports,
|
||||||
onBrowserMounted,
|
onBrowserMounted,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onContentResize,
|
onContentResize,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
|
@ -17,7 +17,7 @@ module.exports = createClass({
|
|||||||
propTypes: {
|
propTypes: {
|
||||||
devices: PropTypes.shape(Types.devices).isRequired,
|
devices: PropTypes.shape(Types.devices).isRequired,
|
||||||
selectedDevice: PropTypes.string.isRequired,
|
selectedDevice: PropTypes.string.isRequired,
|
||||||
onChangeViewportDevice: PropTypes.func.isRequired,
|
onChangeDevice: PropTypes.func.isRequired,
|
||||||
onResizeViewport: PropTypes.func.isRequired,
|
onResizeViewport: PropTypes.func.isRequired,
|
||||||
onUpdateDeviceModalOpen: PropTypes.func.isRequired,
|
onUpdateDeviceModalOpen: PropTypes.func.isRequired,
|
||||||
},
|
},
|
||||||
@ -27,7 +27,7 @@ module.exports = createClass({
|
|||||||
onSelectChange({ target }) {
|
onSelectChange({ target }) {
|
||||||
let {
|
let {
|
||||||
devices,
|
devices,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onUpdateDeviceModalOpen,
|
onUpdateDeviceModalOpen,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
@ -40,7 +40,7 @@ module.exports = createClass({
|
|||||||
for (let device of devices[type]) {
|
for (let device of devices[type]) {
|
||||||
if (device.name === target.value) {
|
if (device.name === target.value) {
|
||||||
onResizeViewport(device.width, device.height);
|
onResizeViewport(device.width, device.height);
|
||||||
onChangeViewportDevice(device);
|
onChangeDevice(device);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -37,7 +37,7 @@ module.exports = createClass({
|
|||||||
displayPixelRatio: Types.pixelRatio.value.isRequired,
|
displayPixelRatio: Types.pixelRatio.value.isRequired,
|
||||||
selectedDevice: PropTypes.string.isRequired,
|
selectedDevice: PropTypes.string.isRequired,
|
||||||
selectedPixelRatio: PropTypes.shape(Types.pixelRatio).isRequired,
|
selectedPixelRatio: PropTypes.shape(Types.pixelRatio).isRequired,
|
||||||
onChangeViewportPixelRatio: PropTypes.func.isRequired,
|
onChangePixelRatio: PropTypes.func.isRequired,
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [ addons.PureRenderMixin ],
|
mixins: [ addons.PureRenderMixin ],
|
||||||
@ -55,7 +55,7 @@ module.exports = createClass({
|
|||||||
},
|
},
|
||||||
|
|
||||||
onSelectChange({ target }) {
|
onSelectChange({ target }) {
|
||||||
this.props.onChangeViewportPixelRatio(+target.value);
|
this.props.onChangePixelRatio(+target.value);
|
||||||
},
|
},
|
||||||
|
|
||||||
render() {
|
render() {
|
||||||
|
@ -24,10 +24,10 @@ module.exports = createClass({
|
|||||||
selectedPixelRatio: PropTypes.shape(Types.pixelRatio).isRequired,
|
selectedPixelRatio: PropTypes.shape(Types.pixelRatio).isRequired,
|
||||||
touchSimulation: PropTypes.shape(Types.touchSimulation).isRequired,
|
touchSimulation: PropTypes.shape(Types.touchSimulation).isRequired,
|
||||||
onChangeNetworkThrottling: PropTypes.func.isRequired,
|
onChangeNetworkThrottling: PropTypes.func.isRequired,
|
||||||
onChangeViewportPixelRatio: PropTypes.func.isRequired,
|
onChangePixelRatio: PropTypes.func.isRequired,
|
||||||
|
onChangeTouchSimulation: PropTypes.func.isRequired,
|
||||||
onExit: PropTypes.func.isRequired,
|
onExit: PropTypes.func.isRequired,
|
||||||
onScreenshot: PropTypes.func.isRequired,
|
onScreenshot: PropTypes.func.isRequired,
|
||||||
onUpdateTouchSimulation: PropTypes.func.isRequired,
|
|
||||||
},
|
},
|
||||||
|
|
||||||
mixins: [ addons.PureRenderMixin ],
|
mixins: [ addons.PureRenderMixin ],
|
||||||
@ -42,10 +42,10 @@ module.exports = createClass({
|
|||||||
selectedPixelRatio,
|
selectedPixelRatio,
|
||||||
touchSimulation,
|
touchSimulation,
|
||||||
onChangeNetworkThrottling,
|
onChangeNetworkThrottling,
|
||||||
onChangeViewportPixelRatio,
|
onChangePixelRatio,
|
||||||
|
onChangeTouchSimulation,
|
||||||
onExit,
|
onExit,
|
||||||
onScreenshot,
|
onScreenshot,
|
||||||
onUpdateTouchSimulation
|
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
let touchButtonClass = "toolbar-button devtools-button";
|
let touchButtonClass = "toolbar-button devtools-button";
|
||||||
@ -73,14 +73,14 @@ module.exports = createClass({
|
|||||||
displayPixelRatio,
|
displayPixelRatio,
|
||||||
selectedDevice,
|
selectedDevice,
|
||||||
selectedPixelRatio,
|
selectedPixelRatio,
|
||||||
onChangeViewportPixelRatio,
|
onChangePixelRatio,
|
||||||
}),
|
}),
|
||||||
dom.button({
|
dom.button({
|
||||||
id: "global-touch-simulation-button",
|
id: "global-touch-simulation-button",
|
||||||
className: touchButtonClass,
|
className: touchButtonClass,
|
||||||
title: (touchSimulation.enabled ?
|
title: (touchSimulation.enabled ?
|
||||||
getStr("responsive.disableTouch") : getStr("responsive.enableTouch")),
|
getStr("responsive.disableTouch") : getStr("responsive.enableTouch")),
|
||||||
onClick: () => onUpdateTouchSimulation(!touchSimulation.enabled),
|
onClick: () => onChangeTouchSimulation(!touchSimulation.enabled),
|
||||||
}),
|
}),
|
||||||
dom.button({
|
dom.button({
|
||||||
id: "global-screenshot-button",
|
id: "global-screenshot-button",
|
||||||
|
@ -28,7 +28,7 @@ module.exports = createClass({
|
|||||||
swapAfterMount: PropTypes.bool.isRequired,
|
swapAfterMount: PropTypes.bool.isRequired,
|
||||||
viewport: PropTypes.shape(Types.viewport).isRequired,
|
viewport: PropTypes.shape(Types.viewport).isRequired,
|
||||||
onBrowserMounted: PropTypes.func.isRequired,
|
onBrowserMounted: PropTypes.func.isRequired,
|
||||||
onChangeViewportDevice: PropTypes.func.isRequired,
|
onChangeDevice: PropTypes.func.isRequired,
|
||||||
onContentResize: PropTypes.func.isRequired,
|
onContentResize: PropTypes.func.isRequired,
|
||||||
onResizeViewport: PropTypes.func.isRequired,
|
onResizeViewport: PropTypes.func.isRequired,
|
||||||
onRotateViewport: PropTypes.func.isRequired,
|
onRotateViewport: PropTypes.func.isRequired,
|
||||||
@ -109,7 +109,7 @@ module.exports = createClass({
|
|||||||
// Change the device selector back to an unselected device
|
// Change the device selector back to an unselected device
|
||||||
// TODO: Bug 1313140: We should avoid calling this for every resize event, since it
|
// TODO: Bug 1313140: We should avoid calling this for every resize event, since it
|
||||||
// triggers RDP calls each time.
|
// triggers RDP calls each time.
|
||||||
this.props.onChangeViewportDevice({ name: "" });
|
this.props.onChangeDevice({ name: "" });
|
||||||
|
|
||||||
this.setState({
|
this.setState({
|
||||||
lastClientX,
|
lastClientX,
|
||||||
@ -125,7 +125,7 @@ module.exports = createClass({
|
|||||||
swapAfterMount,
|
swapAfterMount,
|
||||||
viewport,
|
viewport,
|
||||||
onBrowserMounted,
|
onBrowserMounted,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onContentResize,
|
onContentResize,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
@ -149,7 +149,7 @@ module.exports = createClass({
|
|||||||
ViewportToolbar({
|
ViewportToolbar({
|
||||||
devices,
|
devices,
|
||||||
selectedDevice: viewport.device,
|
selectedDevice: viewport.device,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
onUpdateDeviceModalOpen,
|
onUpdateDeviceModalOpen,
|
||||||
|
@ -15,7 +15,7 @@ module.exports = createClass({
|
|||||||
|
|
||||||
propTypes: {
|
propTypes: {
|
||||||
viewport: PropTypes.shape(Types.viewport).isRequired,
|
viewport: PropTypes.shape(Types.viewport).isRequired,
|
||||||
onChangeViewportDevice: PropTypes.func.isRequired,
|
onChangeDevice: PropTypes.func.isRequired,
|
||||||
onResizeViewport: PropTypes.func.isRequired,
|
onResizeViewport: PropTypes.func.isRequired,
|
||||||
},
|
},
|
||||||
|
|
||||||
@ -114,7 +114,7 @@ module.exports = createClass({
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Change the device selector back to an unselected device
|
// Change the device selector back to an unselected device
|
||||||
this.props.onChangeViewportDevice({ name: "" });
|
this.props.onChangeDevice({ name: "" });
|
||||||
this.props.onResizeViewport(parseInt(this.state.width, 10),
|
this.props.onResizeViewport(parseInt(this.state.width, 10),
|
||||||
parseInt(this.state.height, 10));
|
parseInt(this.state.height, 10));
|
||||||
},
|
},
|
||||||
|
@ -17,7 +17,7 @@ module.exports = createClass({
|
|||||||
propTypes: {
|
propTypes: {
|
||||||
devices: PropTypes.shape(Types.devices).isRequired,
|
devices: PropTypes.shape(Types.devices).isRequired,
|
||||||
selectedDevice: PropTypes.string.isRequired,
|
selectedDevice: PropTypes.string.isRequired,
|
||||||
onChangeViewportDevice: PropTypes.func.isRequired,
|
onChangeDevice: PropTypes.func.isRequired,
|
||||||
onResizeViewport: PropTypes.func.isRequired,
|
onResizeViewport: PropTypes.func.isRequired,
|
||||||
onRotateViewport: PropTypes.func.isRequired,
|
onRotateViewport: PropTypes.func.isRequired,
|
||||||
onUpdateDeviceModalOpen: PropTypes.func.isRequired,
|
onUpdateDeviceModalOpen: PropTypes.func.isRequired,
|
||||||
@ -29,7 +29,7 @@ module.exports = createClass({
|
|||||||
let {
|
let {
|
||||||
devices,
|
devices,
|
||||||
selectedDevice,
|
selectedDevice,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
onUpdateDeviceModalOpen,
|
onUpdateDeviceModalOpen,
|
||||||
@ -42,7 +42,7 @@ module.exports = createClass({
|
|||||||
DeviceSelector({
|
DeviceSelector({
|
||||||
devices,
|
devices,
|
||||||
selectedDevice,
|
selectedDevice,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onUpdateDeviceModalOpen,
|
onUpdateDeviceModalOpen,
|
||||||
}),
|
}),
|
||||||
|
@ -22,20 +22,20 @@ module.exports = createClass({
|
|||||||
swapAfterMount: PropTypes.bool.isRequired,
|
swapAfterMount: PropTypes.bool.isRequired,
|
||||||
viewport: PropTypes.shape(Types.viewport).isRequired,
|
viewport: PropTypes.shape(Types.viewport).isRequired,
|
||||||
onBrowserMounted: PropTypes.func.isRequired,
|
onBrowserMounted: PropTypes.func.isRequired,
|
||||||
onChangeViewportDevice: PropTypes.func.isRequired,
|
onChangeDevice: PropTypes.func.isRequired,
|
||||||
onContentResize: PropTypes.func.isRequired,
|
onContentResize: PropTypes.func.isRequired,
|
||||||
onResizeViewport: PropTypes.func.isRequired,
|
onResizeViewport: PropTypes.func.isRequired,
|
||||||
onRotateViewport: PropTypes.func.isRequired,
|
onRotateViewport: PropTypes.func.isRequired,
|
||||||
onUpdateDeviceModalOpen: PropTypes.func.isRequired,
|
onUpdateDeviceModalOpen: PropTypes.func.isRequired,
|
||||||
},
|
},
|
||||||
|
|
||||||
onChangeViewportDevice(device) {
|
onChangeDevice(device) {
|
||||||
let {
|
let {
|
||||||
viewport,
|
viewport,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
onChangeViewportDevice(viewport.id, device);
|
onChangeDevice(viewport.id, device);
|
||||||
},
|
},
|
||||||
|
|
||||||
onResizeViewport(width, height) {
|
onResizeViewport(width, height) {
|
||||||
@ -69,7 +69,7 @@ module.exports = createClass({
|
|||||||
} = this.props;
|
} = this.props;
|
||||||
|
|
||||||
let {
|
let {
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
} = this;
|
} = this;
|
||||||
@ -80,7 +80,7 @@ module.exports = createClass({
|
|||||||
},
|
},
|
||||||
ViewportDimension({
|
ViewportDimension({
|
||||||
viewport,
|
viewport,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
}),
|
}),
|
||||||
ResizableViewport({
|
ResizableViewport({
|
||||||
@ -90,7 +90,7 @@ module.exports = createClass({
|
|||||||
swapAfterMount,
|
swapAfterMount,
|
||||||
viewport,
|
viewport,
|
||||||
onBrowserMounted,
|
onBrowserMounted,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onContentResize,
|
onContentResize,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
|
@ -20,7 +20,7 @@ module.exports = createClass({
|
|||||||
screenshot: PropTypes.shape(Types.screenshot).isRequired,
|
screenshot: PropTypes.shape(Types.screenshot).isRequired,
|
||||||
viewports: PropTypes.arrayOf(PropTypes.shape(Types.viewport)).isRequired,
|
viewports: PropTypes.arrayOf(PropTypes.shape(Types.viewport)).isRequired,
|
||||||
onBrowserMounted: PropTypes.func.isRequired,
|
onBrowserMounted: PropTypes.func.isRequired,
|
||||||
onChangeViewportDevice: PropTypes.func.isRequired,
|
onChangeDevice: PropTypes.func.isRequired,
|
||||||
onContentResize: PropTypes.func.isRequired,
|
onContentResize: PropTypes.func.isRequired,
|
||||||
onResizeViewport: PropTypes.func.isRequired,
|
onResizeViewport: PropTypes.func.isRequired,
|
||||||
onRotateViewport: PropTypes.func.isRequired,
|
onRotateViewport: PropTypes.func.isRequired,
|
||||||
@ -34,7 +34,7 @@ module.exports = createClass({
|
|||||||
screenshot,
|
screenshot,
|
||||||
viewports,
|
viewports,
|
||||||
onBrowserMounted,
|
onBrowserMounted,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onContentResize,
|
onContentResize,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
@ -54,7 +54,7 @@ module.exports = createClass({
|
|||||||
swapAfterMount: i == 0,
|
swapAfterMount: i == 0,
|
||||||
viewport,
|
viewport,
|
||||||
onBrowserMounted,
|
onBrowserMounted,
|
||||||
onChangeViewportDevice,
|
onChangeDevice,
|
||||||
onContentResize,
|
onContentResize,
|
||||||
onResizeViewport,
|
onResizeViewport,
|
||||||
onRotateViewport,
|
onRotateViewport,
|
||||||
|
@ -449,14 +449,17 @@ ResponsiveUI.prototype = {
|
|||||||
}
|
}
|
||||||
|
|
||||||
switch (event.data.type) {
|
switch (event.data.type) {
|
||||||
|
case "change-device":
|
||||||
|
this.onChangeDevice(event);
|
||||||
|
break;
|
||||||
case "change-network-throtting":
|
case "change-network-throtting":
|
||||||
this.onChangeNetworkThrottling(event);
|
this.onChangeNetworkThrottling(event);
|
||||||
break;
|
break;
|
||||||
case "change-viewport-device":
|
case "change-pixel-ratio":
|
||||||
this.onChangeViewportDevice(event);
|
this.onChangePixelRatio(event);
|
||||||
break;
|
break;
|
||||||
case "change-viewport-pixel-ratio":
|
case "change-touch-simulation":
|
||||||
this.updateDPPX(event.data.pixelRatio);
|
this.onChangeTouchSimulation(event);
|
||||||
break;
|
break;
|
||||||
case "content-resize":
|
case "content-resize":
|
||||||
this.onContentResize(event);
|
this.onContentResize(event);
|
||||||
@ -464,12 +467,18 @@ ResponsiveUI.prototype = {
|
|||||||
case "exit":
|
case "exit":
|
||||||
this.onExit();
|
this.onExit();
|
||||||
break;
|
break;
|
||||||
case "update-touch-simulation":
|
|
||||||
this.onUpdateTouchSimulation(event);
|
|
||||||
break;
|
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
|
onChangeDevice: Task.async(function* (event) {
|
||||||
|
let { userAgent, pixelRatio, touch } = event.data.device;
|
||||||
|
yield this.updateUserAgent(userAgent);
|
||||||
|
yield this.updateDPPX(pixelRatio);
|
||||||
|
yield this.updateTouchSimulation(touch);
|
||||||
|
// Used by tests
|
||||||
|
this.emit("device-changed");
|
||||||
|
}),
|
||||||
|
|
||||||
onChangeNetworkThrottling: Task.async(function* (event) {
|
onChangeNetworkThrottling: Task.async(function* (event) {
|
||||||
let { enabled, profile } = event.data;
|
let { enabled, profile } = event.data;
|
||||||
yield this.updateNetworkThrottling(enabled, profile);
|
yield this.updateNetworkThrottling(enabled, profile);
|
||||||
@ -477,14 +486,15 @@ ResponsiveUI.prototype = {
|
|||||||
this.emit("network-throttling-changed");
|
this.emit("network-throttling-changed");
|
||||||
}),
|
}),
|
||||||
|
|
||||||
onChangeViewportDevice: Task.async(function* (event) {
|
onChangePixelRatio(event) {
|
||||||
let { userAgent, pixelRatio, touch } = event.data.device;
|
let { pixelRatio } = event.data;
|
||||||
yield this.updateUserAgent(userAgent);
|
this.updateDPPX(pixelRatio);
|
||||||
yield this.updateDPPX(pixelRatio);
|
},
|
||||||
yield this.updateTouchSimulation(touch);
|
|
||||||
// Used by tests
|
onChangeTouchSimulation(event) {
|
||||||
this.emit("viewport-device-changed");
|
let { enabled } = event.data;
|
||||||
}),
|
this.updateTouchSimulation(enabled);
|
||||||
|
},
|
||||||
|
|
||||||
onContentResize(event) {
|
onContentResize(event) {
|
||||||
let { width, height } = event.data;
|
let { width, height } = event.data;
|
||||||
@ -499,11 +509,6 @@ ResponsiveUI.prototype = {
|
|||||||
ResponsiveUIManager.closeIfNeeded(browserWindow, tab);
|
ResponsiveUIManager.closeIfNeeded(browserWindow, tab);
|
||||||
},
|
},
|
||||||
|
|
||||||
onUpdateTouchSimulation(event) {
|
|
||||||
let { enabled } = event.data;
|
|
||||||
this.updateTouchSimulation(enabled);
|
|
||||||
},
|
|
||||||
|
|
||||||
updateDPPX: Task.async(function* (dppx) {
|
updateDPPX: Task.async(function* (dppx) {
|
||||||
if (!dppx) {
|
if (!dppx) {
|
||||||
yield this.emulationFront.clearDPPXOverride();
|
yield this.emulationFront.clearDPPXOverride();
|
||||||
|
@ -5,14 +5,16 @@
|
|||||||
"use strict";
|
"use strict";
|
||||||
|
|
||||||
const {
|
const {
|
||||||
UPDATE_TOUCH_SIMULATION_ENABLED,
|
CHANGE_TOUCH_SIMULATION,
|
||||||
} = require("../actions/index");
|
} = require("../actions/index");
|
||||||
|
|
||||||
const INITIAL_TOUCH_SIMULATION = { enabled: false };
|
const INITIAL_TOUCH_SIMULATION = {
|
||||||
|
enabled: false,
|
||||||
|
};
|
||||||
|
|
||||||
let reducers = {
|
let reducers = {
|
||||||
|
|
||||||
[UPDATE_TOUCH_SIMULATION_ENABLED](touchSimulation, { enabled }) {
|
[CHANGE_TOUCH_SIMULATION](touchSimulation, { enabled }) {
|
||||||
return Object.assign({}, touchSimulation, {
|
return Object.assign({}, touchSimulation, {
|
||||||
enabled,
|
enabled,
|
||||||
});
|
});
|
||||||
|
@ -7,7 +7,7 @@
|
|||||||
const {
|
const {
|
||||||
ADD_VIEWPORT,
|
ADD_VIEWPORT,
|
||||||
CHANGE_DEVICE,
|
CHANGE_DEVICE,
|
||||||
CHANGE_VIEWPORT_PIXEL_RATIO,
|
CHANGE_PIXEL_RATIO,
|
||||||
RESIZE_VIEWPORT,
|
RESIZE_VIEWPORT,
|
||||||
ROTATE_VIEWPORT,
|
ROTATE_VIEWPORT,
|
||||||
} = require("../actions/index");
|
} = require("../actions/index");
|
||||||
@ -47,7 +47,7 @@ let reducers = {
|
|||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
|
||||||
[CHANGE_VIEWPORT_PIXEL_RATIO](viewports, { id, pixelRatio }) {
|
[CHANGE_PIXEL_RATIO](viewports, { id, pixelRatio }) {
|
||||||
return viewports.map(viewport => {
|
return viewports.map(viewport => {
|
||||||
if (viewport.id !== id) {
|
if (viewport.id !== id) {
|
||||||
return viewport;
|
return viewport;
|
||||||
|
@ -50,7 +50,7 @@ addRDMTask(TEST_URL, function* ({ ui, manager }) {
|
|||||||
yield testTouchEventsOverride(ui, true);
|
yield testTouchEventsOverride(ui, true);
|
||||||
|
|
||||||
// Test resetting device when resizing viewport
|
// Test resetting device when resizing viewport
|
||||||
let deviceChanged = once(ui, "viewport-device-changed");
|
let deviceChanged = once(ui, "device-changed");
|
||||||
yield testViewportResize(ui, ".viewport-vertical-resize-handle",
|
yield testViewportResize(ui, ".viewport-vertical-resize-handle",
|
||||||
[-10, -10], [testDevice.width, testDevice.height - 10], [0, -10], ui);
|
[-10, -10], [testDevice.width, testDevice.height - 10], [0, -10], ui);
|
||||||
yield deviceChanged;
|
yield deviceChanged;
|
||||||
|
@ -213,7 +213,7 @@ function* testViewportResize(ui, selector, moveBy,
|
|||||||
expectedViewportSize, expectedHandleMove) {
|
expectedViewportSize, expectedHandleMove) {
|
||||||
let win = ui.toolWindow;
|
let win = ui.toolWindow;
|
||||||
|
|
||||||
let changed = once(ui, "viewport-device-changed");
|
let changed = once(ui, "device-changed");
|
||||||
let resized = waitForViewportResizeTo(ui, ...expectedViewportSize);
|
let resized = waitForViewportResizeTo(ui, ...expectedViewportSize);
|
||||||
let startRect = dragElementBy(selector, ...moveBy, win);
|
let startRect = dragElementBy(selector, ...moveBy, win);
|
||||||
yield resized;
|
yield resized;
|
||||||
@ -272,7 +272,7 @@ function changeSelectValue({ toolWindow }, selector, value) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
const selectDevice = (ui, value) => Promise.all([
|
const selectDevice = (ui, value) => Promise.all([
|
||||||
once(ui, "viewport-device-changed"),
|
once(ui, "device-changed"),
|
||||||
changeSelectValue(ui, ".viewport-device-selector", value)
|
changeSelectValue(ui, ".viewport-device-selector", value)
|
||||||
]);
|
]);
|
||||||
|
|
||||||
|
@ -5,7 +5,7 @@
|
|||||||
|
|
||||||
// Test changing the viewport pixel ratio.
|
// Test changing the viewport pixel ratio.
|
||||||
|
|
||||||
const { addViewport, changeViewportPixelRatio } =
|
const { addViewport, changePixelRatio } =
|
||||||
require("devtools/client/responsive.html/actions/viewports");
|
require("devtools/client/responsive.html/actions/viewports");
|
||||||
const NEW_PIXEL_RATIO = 5.5;
|
const NEW_PIXEL_RATIO = 5.5;
|
||||||
|
|
||||||
@ -14,7 +14,7 @@ add_task(function* () {
|
|||||||
const { getState, dispatch } = store;
|
const { getState, dispatch } = store;
|
||||||
|
|
||||||
dispatch(addViewport());
|
dispatch(addViewport());
|
||||||
dispatch(changeViewportPixelRatio(0, NEW_PIXEL_RATIO));
|
dispatch(changePixelRatio(0, NEW_PIXEL_RATIO));
|
||||||
|
|
||||||
let viewport = getState().viewports[0];
|
let viewport = getState().viewports[0];
|
||||||
equal(viewport.pixelRatio.value, NEW_PIXEL_RATIO,
|
equal(viewport.pixelRatio.value, NEW_PIXEL_RATIO,
|
@ -6,7 +6,7 @@
|
|||||||
// Test updating the touch simulation `enabled` property
|
// Test updating the touch simulation `enabled` property
|
||||||
|
|
||||||
const {
|
const {
|
||||||
updateTouchSimulationEnabled,
|
changeTouchSimulation,
|
||||||
} = require("devtools/client/responsive.html/actions/touch-simulation");
|
} = require("devtools/client/responsive.html/actions/touch-simulation");
|
||||||
|
|
||||||
add_task(function* () {
|
add_task(function* () {
|
||||||
@ -16,7 +16,7 @@ add_task(function* () {
|
|||||||
ok(!getState().touchSimulation.enabled,
|
ok(!getState().touchSimulation.enabled,
|
||||||
"Touch simulation is disabled by default.");
|
"Touch simulation is disabled by default.");
|
||||||
|
|
||||||
dispatch(updateTouchSimulationEnabled(true));
|
dispatch(changeTouchSimulation(true));
|
||||||
|
|
||||||
ok(getState().touchSimulation.enabled,
|
ok(getState().touchSimulation.enabled,
|
||||||
"Touch simulation is enabled.");
|
"Touch simulation is enabled.");
|
||||||
|
@ -6,11 +6,11 @@ firefox-appdir = browser
|
|||||||
[test_add_device.js]
|
[test_add_device.js]
|
||||||
[test_add_device_type.js]
|
[test_add_device_type.js]
|
||||||
[test_add_viewport.js]
|
[test_add_viewport.js]
|
||||||
|
[test_change_device.js]
|
||||||
[test_change_display_pixel_ratio.js]
|
[test_change_display_pixel_ratio.js]
|
||||||
[test_change_location.js]
|
[test_change_location.js]
|
||||||
[test_change_network_throttling.js]
|
[test_change_network_throttling.js]
|
||||||
[test_change_viewport_device.js]
|
[test_change_pixel_ratio.js]
|
||||||
[test_change_viewport_pixel_ratio.js]
|
|
||||||
[test_resize_viewport.js]
|
[test_resize_viewport.js]
|
||||||
[test_rotate_viewport.js]
|
[test_rotate_viewport.js]
|
||||||
[test_update_device_displayed.js]
|
[test_update_device_displayed.js]
|
||||||
|
Loading…
Reference in New Issue
Block a user