Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Make quit-on-escape optional #11200

Merged
merged 1 commit into from May 16, 2016
Merged

Conversation

@paulrouget
Copy link
Contributor

paulrouget commented May 16, 2016

For browserhtml, we don't want Servo to shut down when the user presses the escape key.

  • ./mach build -d does not report any errors
  • ./mach test-tidy does not report any errors
  • These changes fix #11194

Either:

  • There are tests for these changes OR
  • These changes do not require tests because I don't know how to test shutdown and how to dispatch a non-DOM key event

This change is Reviewable

@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2016

The latest upstream changes (presumably #11199) made this pull request unmergeable. Please resolve the merge conflicts.

@paulrouget paulrouget force-pushed the paulrouget:quit-on-escape-pref branch from 67fb840 to 911a67b May 16, 2016
@asajeffrey
Copy link
Member

asajeffrey commented May 16, 2016

There might be a way to test this with webdriver, but even if we decided to do that, it should probably be part of a larger webdriver effort.

@asajeffrey
Copy link
Member

asajeffrey commented May 16, 2016

:lgtm:

Previously, asajeffrey (Alan Jeffrey) wrote…

There might be a way to test this with webdriver, but even if we decided to do that, it should probably be part of a larger webdriver effort.


Reviewed 2 of 2 files at r1.
Review status: 1 of 2 files reviewed at latest revision, all discussions resolved.


Comments from Reviewable

@asajeffrey
Copy link
Member

asajeffrey commented May 16, 2016

@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2016

📌 Commit 911a67b has been approved by asajeffrey

@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2016

Testing commit 911a67b with merge c921fa6...

bors-servo added a commit that referenced this pull request May 16, 2016
Make quit-on-escape optional

For browserhtml, we don't want Servo to shut down when the user presses the escape key.

- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #11194

Either:
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because I don't know how to test shutdown and how to dispatch a non-DOM key event

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/11200)
<!-- Reviewable:end -->
@bors-servo
Copy link
Contributor

bors-servo commented May 16, 2016

@bors-servo bors-servo merged commit 911a67b into servo:master May 16, 2016
3 checks passed
3 checks passed
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
homu Test successful
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

4 participants
You can’t perform that action at this time.