| Index: content/test/data/device_sensors/device_sensors_null_test_with_alert.html
|
| diff --git a/content/test/data/device_sensors/device_sensors_null_test_with_alert.html b/content/test/data/device_sensors/device_sensors_null_test_with_alert.html
|
| index dba75d96b5111f75e8e3185a3213ba6d721965c4..abf63fdf85dc7b8639592b084ab240f0eb4ce4a3 100644
|
| --- a/content/test/data/device_sensors/device_sensors_null_test_with_alert.html
|
| +++ b/content/test/data/device_sensors/device_sensors_null_test_with_alert.html
|
| @@ -1,13 +1,11 @@
|
| <html>
|
| <head>
|
| - <title>Device Motion/Orientation all-null event test with alert</title>
|
| + <title>Device Orientation all-null event test with alert</title>
|
| </head>
|
| <body>
|
| <div id="status">FAIL</div>
|
| </body>
|
| <script type="text/javascript">
|
| - passedOrientation = false;
|
| - passedMotion = false;
|
|
|
| function checkOrientationEvent(event) {
|
| return event.alpha == null &&
|
| @@ -15,36 +13,13 @@
|
| event.gamma == null;
|
| }
|
|
|
| - function checkMotionEvent(event) {
|
| - return event.acceleration.x == null &&
|
| - event.acceleration.y == null &&
|
| - event.acceleration.z == null &&
|
| - event.accelerationIncludingGravity.x == null &&
|
| - event.accelerationIncludingGravity.y == null &&
|
| - event.accelerationIncludingGravity.z == null &&
|
| - event.rotationRate.alpha == null &&
|
| - event.rotationRate.beta == null &&
|
| - event.rotationRate.gamma == null;
|
| - }
|
| -
|
| function onOrientation(event) {
|
| window.removeEventListener('deviceorientation', onOrientation);
|
| checkOrientationEvent(event) ? passOrientation() : fail();
|
| }
|
|
|
| - function onMotion(event) {
|
| - window.removeEventListener('devicemotion', onMotion);
|
| - checkMotionEvent(event) ? passMotion() : fail();
|
| - }
|
| -
|
| function passOrientation() {
|
| - passedOrientation = true;
|
| - if (passedMotion) pass();
|
| - }
|
| -
|
| - function passMotion() {
|
| - passedMotion = true;
|
| - if (passedOrientation) pass();
|
| + pass();
|
| }
|
|
|
| function pass() {
|
| @@ -57,7 +32,6 @@
|
| }
|
|
|
| window.addEventListener('deviceorientation', onOrientation);
|
| - window.addEventListener('devicemotion', onMotion);
|
|
|
| // Raise a modal alert dialog to test that the one-off null-events
|
| // still propagate to window after the alert is dismissed.
|
|
|