Skip to content

Don't run sim in background when no project is loaded in the skillmap iframe #8405

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.

Sign up for GitHub

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

Merged
abchatra merged 3 commits into from
Aug 12, 2021
Merged

Don't run sim in background when no project is loaded in the skillmap iframe #8405

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8b035bb
Don't run sim in background when no project is loaded in the skillmap…
riknoll Aug 12, 2021
7f77333
Don't reload header when exiting skillmp tutorial
riknoll Aug 12, 2021
2106f0f
Remove post progress
riknoll Aug 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 28 additions & 16 deletions webapp/src/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -827,6 +827,10 @@ export class ProjectView
pxt.debug(`sim: don't restart when simulator collapsed`);
return;
}
if (pxt.BrowserUtils.isSkillmapEditor() && !this.state.header) {
pxt.debug(`sim: don't restart when no project is open`);
return;
}
this.runSimulator({ debug: !!this.state.debugging, background: true });
},
1000, true);
Expand Down Expand Up @@ -3971,22 +3975,30 @@ export class ProjectView
return Promise.resolve(); // TODO cleanup
}
else {
return this.exitTutorialAsync()
.then(() => {
let curr = pkg.mainEditorPkg().header;
return this.loadHeaderAsync(curr);
}).finally(() => {
core.hideLoading("leavingtutorial")
this.postTutorialProgress();
})
.then(() => {
if (pxt.appTarget.cloud &&
pxt.appTarget.cloud.sharing &&
pxt.appTarget.appTheme.shareFinishedTutorials) {
pxt.tickEvent("tutorial.share", undefined, { interactiveConsent: false });
this.showShareDialog(lf("Well done! Would you like to share your project?"));
}
})
if (pxt.BrowserUtils.isSkillmapEditor()) {
return this.exitTutorialAsync()
.finally(() => {
core.hideLoading("leavingtutorial")
})
}
else {
return this.exitTutorialAsync()
.then(() => {
let curr = pkg.mainEditorPkg().header;
return this.loadHeaderAsync(curr);
}).finally(() => {
core.hideLoading("leavingtutorial")
this.postTutorialProgress();
})
.then(() => {
if (pxt.appTarget.cloud &&
pxt.appTarget.cloud.sharing &&
pxt.appTarget.appTheme.shareFinishedTutorials) {
pxt.tickEvent("tutorial.share", undefined, { interactiveConsent: false });
this.showShareDialog(lf("Well done! Would you like to share your project?"));
}
})
}
}
}

Expand Down