Skip to content

[stable12.2] offline app cherry picks #11182

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
jwunderl merged 4 commits into from
Mar 9, 2026
Merged

[stable12.2] offline app cherry picks #11182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1eb8565
Fix report abuse in electron app (#11178)
jwunderl Mar 9, 2026
cf8acb3
fix share homescreen content in electron
jwunderl Mar 9, 2026
5b311a4
remove recommended for mac offline since it's not accurately detecting
jwunderl Mar 9, 2026
8afcb75
do not recommend at all for now
jwunderl Mar 9, 2026
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
18 changes: 8 additions & 10 deletions docfiles/offline-app-head.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -530,17 +530,15 @@
let recommendedButton = null;

if (isMac) {
if (isAppleSilicon) {
recommendedButton = $("#download-macarm64");
} else {
recommendedButton = $("#download-mac64");
}
// Do not recommend a Mac binary because architecture detection is unreliable across browsers
recommendedButton = null;
} else if (isWindows) {
if (false && isWindowsARM) {
recommendedButton = $("#download-winarm64");
} else {
recommendedButton = $("#download-win64");
}
// if (false && isWindowsARM) {
// recommendedButton = $("#download-winarm64");
// } else {
// recommendedButton = $("#download-win64");
// }
recommendedButton = null;
}

// Mark the recommended download
Expand Down
4 changes: 2 additions & 2 deletions webapp/src/dialogs.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -701,7 +701,7 @@ export function showReportAbuseAsync(pubId?: string) {
core.infoNotification(lf("Sending abuse report..."));
Cloud.privatePostAsync(`${id}/abusereports`, {
text: reasonInput.value
})
}, true)
.then(res => {
core.infoNotification(lf("Report sent. Thank you!"))
})
Expand Down Expand Up @@ -949,4 +949,4 @@ export async function showTurnBackTimeDialogAsync(header: pxt.workspace.Header,
/>
)
})
}
}
8 changes: 6 additions & 2 deletions webapp/src/projects.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1076,8 +1076,12 @@ export class ProjectsDetail extends data.Component<ProjectsDetailProps, Projects
const { cardType, url, scr } = this.props;
if (!cardType) return undefined;

const relPrefix = pxt.webConfig?.relprefix?.replace(/-+$/, "");
const baseUrl = `${window.location.origin}${relPrefix}`;
const relPrefix = (pxt.webConfig?.relprefix || "").replace(/-+$/, "");
const liveBaseUrl = (pxt.appTarget?.appTheme?.embedUrl || pxt.appTarget?.appTheme?.homeUrl || "").replace(/\/+$/, "");
const defaultBaseUrl = `${window.location.origin}${relPrefix}`;
const baseUrl = pxt.BrowserUtils.isPxtElectron() && liveBaseUrl
? `${liveBaseUrl}${relPrefix}`
: defaultBaseUrl;

const cardUrl = (scr?.url || url) as string;
const defaultEditor = this.getActionEditor(cardType, undefined);
Expand Down