Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 11:25:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1254388 - Apply touch simulation from selected device. r=ntim

Browse Source 
MozReview-Commit-ID: De8lVrct0iZ

--HG--
extra : transplant_source : %81Xo%B0%A31%E3%EB%E5%15N%0A%8Ct%D6%95%F1%DB%C5%3C
This commit is contained in:
Matteo Ferretti 2016-09-13 16:28:15 +02:00
parent 592e7c05cd
commit b0da97f01c
4 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devtools/client/responsive.html/actions/touch-simulation.js
View File

@ -12,7 +12,7 @@ const {
module.exports = {
updateTouchSimulationEnabled(enabled) {
updateTouchSimulationEnabled(enabled = false) {
return {
type: UPDATE_TOUCH_SIMULATION_ENABLED,
enabled,

1
devtools/client/responsive.html/app.js
View File

@ -48,6 +48,7 @@ let App = createClass({
device,
}, "*");
this.props.dispatch(changeDevice(id, device.name));
this.props.dispatch(updateTouchSimulationEnabled(device.touch));
},
onContentResize({ width, height }) {

3
devtools/client/responsive.html/manager.js
View File

@ -424,9 +424,10 @@ ResponsiveUI.prototype = {
switch (event.data.type) {
case "change-viewport-device":
let { userAgent, pixelRatio } = event.data.device;
let { userAgent, pixelRatio, touch } = event.data.device;
this.updateUserAgent(userAgent);
this.updateDPPX(pixelRatio);
this.updateTouchSimulation(touch);
break;
case "content-resize":
let { width, height } = event.data;

58
devtools/client/responsive.html/test/browser/browser_device_change.js
View File

@ -40,31 +40,31 @@ addRDMTask(TEST_URL, function* ({ ui, manager }) {
// Test defaults
testViewportDimensions(ui, 320, 480);
yield testUserAgent(ui, DEFAULT_UA);
testDevicePixelRatio(yield getViewportDevicePixelRatio(ui), DEFAULT_DPPX);
yield testDevicePixelRatio(ui, DEFAULT_DPPX);
yield testTouchEventsOverride(ui, false);
testViewportSelectLabel(ui, "no device selected");
let waitingPixelRatio = onceDevicePixelRatioChange(ui);
// Test device with custom UA
// Test device with custom properties
yield switchDevice(ui, "Fake Phone RDM Test");
yield waitForViewportResizeTo(ui, testDevice.width, testDevice.height);
yield testUserAgent(ui, testDevice.userAgent);
// Test device with custom pixelRatio
testDevicePixelRatio(yield waitingPixelRatio, testDevice.pixelRatio);
waitingPixelRatio = onceDevicePixelRatioChange(ui);
yield testDevicePixelRatio(ui, testDevice.pixelRatio);
yield testTouchEventsOverride(ui, true);
// Test resetting device when resizing viewport
yield testViewportResize(ui, ".viewport-vertical-resize-handle",
[-10, -10], [testDevice.width, testDevice.height - 10], [0, -10], ui);
yield testUserAgent(ui, DEFAULT_UA);
yield testDevicePixelRatio(ui, DEFAULT_DPPX);
yield testTouchEventsOverride(ui, false);
testViewportSelectLabel(ui, "no device selected");
testDevicePixelRatio(yield waitingPixelRatio, DEFAULT_DPPX);
// Test device where UA field is blank
// Test device with generic properties
yield switchDevice(ui, "Laptop (1366 x 768)");
yield waitForViewportResizeTo(ui, 1366, 768);
yield testUserAgent(ui, DEFAULT_UA);
yield testDevicePixelRatio(ui, 1);
yield testTouchEventsOverride(ui, false);
ok(removeDevice(testDevice),
"Test Device properly removed.");
@ -79,39 +79,37 @@ function testViewportDimensions(ui, w, h) {
`${h}px`, `Viewport should have height of ${h}px`);
}
function testViewportSelectLabel(ui, label) {
function testViewportSelectLabel(ui, expected) {
let select = ui.toolWindow.document.querySelector(".viewport-device-selector");
is(select.selectedOptions[0].textContent, label,
`Select label should be changed to ${label}`);
is(select.selectedOptions[0].textContent, expected,
`Select label should be changed to ${expected}`);
}
function* testUserAgent(ui, value) {
function* testUserAgent(ui, expected) {
let ua = yield ContentTask.spawn(ui.getViewportBrowser(), {}, function* () {
return content.navigator.userAgent;
});
is(ua, value, `UA should be set to ${value}`);
is(ua, expected, `UA should be set to ${expected}`);
}
function testDevicePixelRatio(dppx, expected) {
function* testDevicePixelRatio(ui, expected) {
let dppx = yield getViewportDevicePixelRatio(ui);
is(dppx, expected, `devicePixelRatio should be set to ${expected}`);
}
function* testTouchEventsOverride(ui, expected) {
let { document } = ui.toolWindow;
let touchButton = document.querySelector("#global-touch-simulation-button");
let flag = yield ui.emulationFront.getTouchEventsOverride();
is(flag === Ci.nsIDocShell.TOUCHEVENTS_OVERRIDE_ENABLED, expected,
`Touch events override should be ${expected ? "enabled" : "disabled"}`);
is(touchButton.classList.contains("active"), expected,
`Touch simulation button should be ${expected ? "" : "not"} active.`);
}
function* getViewportDevicePixelRatio(ui) {
return yield ContentTask.spawn(ui.getViewportBrowser(), {}, function* () {
return content.devicePixelRatio;
});
}
function onceDevicePixelRatioChange(ui) {
return ContentTask.spawn(ui.getViewportBrowser(), {}, function* () {
let pixelRatio = content.devicePixelRatio;
let mql = content.matchMedia(`(resolution: ${pixelRatio}dppx)`);
return new Promise(resolve => {
mql.addListener(function listener() {
mql.removeListener(listener);
resolve(content.devicePixelRatio);
});
});
});
}