Merge pull request #10855 from jherico/snapshot

Fix snapshot connection errors
This commit is contained in:
Brad Davis 2017-06-30 12:58:48 -07:00 committed by GitHub
commit 3f48c7aef5

View file

@ -384,7 +384,6 @@ function onButtonClicked() {
} else {
fillImageDataFromPrevious();
tablet.gotoWebScreen(SNAPSHOT_REVIEW_URL);
tablet.webEventReceived.connect(onMessage);
HMD.openTablet();
}
}
@ -660,10 +659,15 @@ function maybeDeleteSnapshotStories() {
storyIDsToMaybeDelete = [];
}
function onTabletScreenChanged(type, url) {
var wasInSnapshotReview = isInSnapshotReview;
isInSnapshotReview = (type === "Web" && url === SNAPSHOT_REVIEW_URL);
button.editProperties({ isActive: isInSnapshotReview });
if (!isInSnapshotReview) {
tablet.webEventReceived.disconnect(onMessage);
if (isInSnapshotReview !== wasInSnapshotReview) {
if (isInSnapshotReview) {
tablet.webEventReceived.connect(onMessage);
} else {
tablet.webEventReceived.disconnect(onMessage);
}
}
}
function onUsernameChanged() {