Skip to content

Commit 9027372

Browse files
phoenixidephoenixide
committed
deploy: 606b7d0 
1 parent 2e0f570 commit 9027372

File tree

53 files changed

+592
-100
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+592
-100
lines changed

‎LiveDevelopment/BrowserScripts/LivePreviewTransportRemote.js‎

Lines changed: 117 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -329,16 +329,129 @@
329329
}
330330
});
331331

332+
function alertPatch(message, titleText) {
333+
// Create the modal container
334+
const modal = document.createElement('div');
335+
modal.style.position = 'fixed';
336+
modal.style.top = '0';
337+
modal.style.left = '0';
338+
modal.style.width = '100%';
339+
modal.style.height = '100vh';
340+
modal.style.backgroundColor = 'rgba(0,0,0,0.5)';
341+
modal.style.display = 'flex';
342+
modal.style.justifyContent = 'center';
343+
modal.style.alignItems = 'center';
344+
modal.style.zIndex = '1000000000';
345+
346+
// Create the modal content box
347+
const modalContent = document.createElement('div');
348+
modalContent.style.backgroundColor = 'white';
349+
modalContent.style.padding = '20px';
350+
modalContent.style.borderRadius = '5px';
351+
modalContent.style.minWidth = '300px';
352+
modalContent.style.margin = 'auto';
353+
modalContent.style.textAlign = 'center';
354+
355+
// Add title to the modal with the current page URL
356+
const title = document.createElement('h3');
357+
title.textContent = titleText || "alert"; // not translated as window.alert is same in all languages.
358+
title.style.marginBottom = '10px';
359+
360+
// Add text to the modal
361+
const text = document.createElement('p');
362+
text.textContent = message;
363+
text.style.marginBottom = '20px';
364+
365+
// Create OK button to close the modal
366+
const button = document.createElement('button');
367+
button.textContent = 'OK';
368+
button.style.padding = '10px 20px';
369+
button.style.border = 'none';
370+
button.style.backgroundColor = '#007BFF';
371+
button.style.color = 'white';
372+
button.style.borderRadius = '5px';
373+
button.style.cursor = 'pointer';
374+
375+
button.onclick = function() {
376+
document.body.removeChild(modal);
377+
};
378+
379+
// Append elements
380+
modalContent.appendChild(title);
381+
modalContent.appendChild(text);
382+
modalContent.appendChild(button);
383+
modal.appendChild(modalContent);
384+
document.body.appendChild(modal);
385+
}
386+
387+
function unsupportedConfirm() {
388+
alertPatch(TRANSPORT_CONFIG.STRINGS.UNSUPPORTED_DOM_APIS_CONFIRM, "window.confirm");
389+
}
390+
function unsupportedPrompt() {
391+
alertPatch(TRANSPORT_CONFIG.STRINGS.UNSUPPORTED_DOM_APIS_CONFIRM, "window.prompt");
392+
}
393+
394+
// all externally opened live previews have the phcodeLivePreview="true" query string parameter set.
395+
const currentUrl = new URL(window.location.href);
396+
const queryParams = new URLSearchParams(currentUrl.search);
397+
const isExternalBrowser = queryParams.get("phcodeLivePreview") === "true";
398+
const isTauri = TRANSPORT_CONFIG.IS_NATIVE_APP;
399+
const platform = TRANSPORT_CONFIG.PLATFORM;
400+
401+
let alertQueue = [], confirmCalled = false, promptCalled = false;
402+
let addToQueue = true;
403+
if(!isExternalBrowser){
404+
// this is an embedded iframe we always take hold of the alert api for better ux within the live preivew frame.
405+
window.__PHOENIX_EMBED_INFO = {isTauri, platform};
406+
const shouldPatchAlert = (isTauri && platform === "mac");
407+
if(shouldPatchAlert){
408+
// In Mac embedded live preview iframe in tauri, alert, prompt, and confirm apis
409+
// are not available, so we need to patch the other apis in mac
410+
window.alert = function (...args) {
411+
// at this time, we cant add our html alert as body is not loaded yet. So we queue alerts.
412+
addToQueue && alertQueue.push(...args);
413+
};
414+
window.confirm = function () {
415+
// confirm and prompt is no-op in mac, we just need to show that the api is not supported, so we just
416+
// keep a flag.
417+
confirmCalled = true;
418+
};
419+
window.prompt = function () {
420+
promptCalled = true;
421+
};
422+
function drainAlertQueues() {
423+
addToQueue = false;
424+
if(confirmCalled) {
425+
unsupportedConfirm();
426+
}
427+
if(promptCalled) {
428+
unsupportedPrompt();
429+
}
430+
for(let i=0; i<alertQueue.length; i++) {
431+
alertPatch(alertQueue[i]);
432+
}
433+
alertQueue = [];
434+
window.alert = alertPatch;
435+
window.confirm = unsupportedConfirm;
436+
window.prompt = unsupportedPrompt;
437+
}
438+
439+
document.addEventListener('DOMContentLoaded', function() {
440+
drainAlertQueues();
441+
});
442+
}
443+
}
444+
332445
// this is for managing who am i context in iframes embedded in phoenix to have special handling.
333446
window.addEventListener('message', function(event) {
334447
if (!TRANSPORT_CONFIG.TRUSTED_ORIGINS_EMBED[event.origin]) {
335448
return; // Ignore messages from unexpected origins
336449
}
337450
if(event.data.type === "WHO_AM_I_RESPONSE") {
338-
window.__PHOENIX_EMBED_INFO = {
339-
isTauri: event.data.isTauri,
340-
platform: event.data.platform
341-
};
451+
if(!window.__PHOENIX_EMBED_INFO){
452+
// this is set from transport config. We should be here
453+
console.error("Expected window.__PHOENIX_EMBED_INFO to be set, but not???");
454+
}
342455
}
343456
});
344457
if(window.self !== window.parent){

‎LiveDevelopment/MultiBrowserImpl/transports/LivePreviewTransport.js‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ define(function (require, exports, module) {
2727

2828
const LiveDevProtocol = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol"),
2929
EventDispatcher = require("utils/EventDispatcher"),
30+
Strings = require("strings"),
3031
Metrics = require("utils/Metrics");
3132

3233
const METRIC_SEND_INTERVAL_MS = 1000;
@@ -75,9 +76,14 @@ define(function (require, exports, module) {
7576
_transportBridge.getRemoteTransportScript()) || "";
7677
transportScript = "const TRANSPORT_CONFIG={};" +
7778
`TRANSPORT_CONFIG.PHOENIX_INSTANCE_ID = "${Phoenix.PHOENIX_INSTANCE_ID}";\n` +
79+
`TRANSPORT_CONFIG.IS_NATIVE_APP = ${Phoenix.isNativeApp};\n` +
80+
`TRANSPORT_CONFIG.PLATFORM = "${Phoenix.platform}";\n` +
7881
`TRANSPORT_CONFIG.LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME = "${LiveDevProtocol.LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME}";\n` +
7982
`TRANSPORT_CONFIG.LIVE_PREVIEW_DEBUG_ENABLED = ${logger.loggingOptions.logLivePreview};\n`+
8083
`TRANSPORT_CONFIG.TRUSTED_ORIGINS_EMBED = ${JSON.stringify(Phoenix.TRUSTED_ORIGINS)};\n`+
84+
`TRANSPORT_CONFIG.STRINGS = {
85+
UNSUPPORTED_DOM_APIS_CONFIRM: "${Strings.UNSUPPORTED_DOM_APIS_CONFIRM}"
86+
};\n`+
8187
transportScript;
8288
return LivePreviewTransportRemote.replace(replaceString, transportScript)
8389
+ "\n";

‎appConfig.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ window.AppConfig = {
2626
"app_notification_url": "assets/notifications/dev/",
2727
"app_update_url": "https://updates.phcode.io/tauri/update-latest-experimental-build.json",
2828
"linting.enabled_by_default": true,
29-
"build_timestamp": "2024-08-27T07:40:09.535Z",
29+
"build_timestamp": "2024-08-28T11:01:30.073Z",
3030
"googleAnalyticsID": "G-P4HJFPDB76",
3131
"googleAnalyticsIDDesktop": "G-VE5BXWJ0HF",
3232
"mixPanelID": "49c4d164b592be2350fc7af06a259bf3",
@@ -38,7 +38,7 @@ window.AppConfig = {
3838
"bugsnagEnv": "development"
3939
},
4040
"name": "Phoenix Code",
41-
"version": "3.9.1-20540",
41+
"version": "3.9.1-20542",
4242
"apiVersion": "3.9.1",
4343
"homepage": "https://core.ai",
4444
"issues": {

‎assets/default-project/en.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/HTML5.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/bootstrap-blog.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/dashboard.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/explore.zip‎

0 Bytes
Binary file not shown.

‎assets/sample-projects/home-pages.zip‎

0 Bytes
Binary file not shown.

‎brackets-min.js‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7113,6 +7113,7 @@ define("LiveDevelopment/MultiBrowserImpl/transports/LivePreviewTransport", funct
71137113

71147114
const LiveDevProtocol = require("LiveDevelopment/MultiBrowserImpl/protocol/LiveDevProtocol"),
71157115
EventDispatcher = require("utils/EventDispatcher"),
7116+
Strings = require("strings"),
71167117
Metrics = require("utils/Metrics");
71177118

71187119
const METRIC_SEND_INTERVAL_MS = 1000;
@@ -7161,9 +7162,14 @@ define("LiveDevelopment/MultiBrowserImpl/transports/LivePreviewTransport", funct
71617162
_transportBridge.getRemoteTransportScript()) || "";
71627163
transportScript = "const TRANSPORT_CONFIG={};" +
71637164
`TRANSPORT_CONFIG.PHOENIX_INSTANCE_ID = "${Phoenix.PHOENIX_INSTANCE_ID}";\n` +
7165+
`TRANSPORT_CONFIG.IS_NATIVE_APP = ${Phoenix.isNativeApp};\n` +
7166+
`TRANSPORT_CONFIG.PLATFORM = "${Phoenix.platform}";\n` +
71647167
`TRANSPORT_CONFIG.LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME = "${LiveDevProtocol.LIVE_DEV_REMOTE_WORKER_SCRIPTS_FILE_NAME}";\n` +
71657168
`TRANSPORT_CONFIG.LIVE_PREVIEW_DEBUG_ENABLED = ${logger.loggingOptions.logLivePreview};\n`+
71667169
`TRANSPORT_CONFIG.TRUSTED_ORIGINS_EMBED = ${JSON.stringify(Phoenix.TRUSTED_ORIGINS)};\n`+
7170+
`TRANSPORT_CONFIG.STRINGS = {
7171+
UNSUPPORTED_DOM_APIS_CONFIRM: "${Strings.UNSUPPORTED_DOM_APIS_CONFIRM}"
7172+
};\n`+
71677173
transportScript;
71687174
return LivePreviewTransportRemote.replace(replaceString, transportScript)
71697175
+ "\n";
@@ -89563,8 +89569,7 @@ define("nls/root/strings", {
8956389569
"ERROR_MAX_FILES": "This project contains more than 30,000 files. Features that operate across multiple files may be disabled or behave as if the project is empty. <a href='https://github.com/adobe/brackets/wiki/Large-Projects'>Read more about working with large projects</a>.",
8956489570

8956589571
// Live Preview error strings
89566-
"ALERT": "Alert",
89567-
"CONFIRM": "Confirm",
89572+
"UNSUPPORTED_DOM_APIS_CONFIRM": "The `window.confirm` and `window.prompt` APIs are unavailable in the embedded Live Preview of {APP_NAME}. Please popout Live Preview to use these APIs in the browser.",
8956889573
"ERROR_LAUNCHING_BROWSER_TITLE": "Error Launching Browser",
8956989574
"ERROR_CANT_FIND_CHROME": "The Google Chrome browser could not be found. Please make sure it is installed.",
8957089575
"ERROR_LAUNCHING_BROWSER": "An error occurred when launching the browser. (error {0})",

0 commit comments

Comments
 (0)