Fix #10821. Allow page reloads, navigating away and back etc. #10822

Merged
merged 5 commits into from May 31, 2015

Projects

None yet

3 participants

@busykai
Member
busykai commented Apr 3, 2015

Fixes multi-browser case only.

Fix #10821: wait for 5 seconds after the last browser has closed connection before shutting down entire LiveDevelopment session.

It's a very simple and robust fix to address page reloads inflicted by protocol.reload() or by user-driven page reloads (or navigating back and forth on the page links).

A more sophisticated fix would consist of the remote end (a browser) letting know that the page is being unloaded. However, the only case where it would actually help is when the page is reloaded by the protocol command. It still would be impossible to distinguish intentional navigating away from a reload or navigating away by clicking a link on the page being previewed.

CC: @redmunds, @sebaslv

busykai added some commits Apr 3, 2015
@busykai busykai Fix JSLint. 116eeb0
@busykai busykai Removed outdated comments.
Also, show the malformed message when such message comes in. Removed the TODO
comment wrt sending back the error message: it is unclear what should be done
if a malformed message comes in. It is unlikely it will ever happen and even
then the error message in the browser should be enough.
7981367
@busykai busykai Fix for #10821. Wait for 5s before closing.
It is a simple and robust fix for to address the page reloads, either inflicted
by protocol commands or by user-driven page reloads.
0fdfe30
@busykai
Member
busykai commented Apr 3, 2015

Plus this PR has a couple of clean-ups.

@le717 le717 commented on the diff Apr 3, 2015
...iBrowserImpl/protocol/remote/LiveDevProtocolRemote.js
@@ -272,7 +272,6 @@
},
onClose: function () {
- // TODO: This is absolutely temporary solution.
@le717
le717 Apr 3, 2015 Contributor

Just curious, I guess this not an "absolutely temporary solution" after all?

@busykai
busykai Apr 3, 2015 Member

@le717 :) it's been reworked from its original version, but the comment was left. what we have now seems to be satisfactory.

@le717
Contributor
le717 commented Apr 3, 2015

Thanks for putting this up. Hopefully it can be merged soon. I've been hitting this case a lot recently.

@MarcelGerber MarcelGerber and 1 other commented on an outdated diff Apr 7, 2015
src/LiveDevelopment/LiveDevMultiBrowser.js
@@ -557,9 +557,13 @@ define(function (require, exports, module) {
.on("ConnectionClose.livedev", function (event, msg) {
// close session when the last connection was closed
if (_protocol.getConnectionIds().length === 0) {
- if (exports.status <= STATUS_ACTIVE) {
- _close(false, "detached_target_closed");
- }
+ setTimeout(function () {
+ if (_protocol.getConnectionIds().length === 0) {
@MarcelGerber
MarcelGerber Apr 7, 2015 Member

Can't we combine the two conditions to if (_protocol.getConnectionIds().length === 0 && exports.status <= STATUS_ACTIVE)?

@busykai
busykai May 30, 2015 Member

I did it intentionally (for some reason), but you're right, no need.

@busykai
Member
busykai commented May 31, 2015

@MarcelGerber, did you try it? it's ready to merged otherwise, it seems.

@MarcelGerber MarcelGerber merged commit 3a0780e into master May 31, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
@MarcelGerber MarcelGerber deleted the kai/fix-10821-ld-allow-reload-in-browser branch May 31, 2015
@MarcelGerber
Member

Merged this. Thank you.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment