Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
15 changes: 15 additions & 0 deletions docs/API-Reference/editor/Editor.md
Original file line number Diff line number Diff line change
Expand Up @@ -1703,3 +1703,18 @@ Constant: Bulls-eye mode, strictly center the text always.

## CENTERING\_MARGIN
**Kind**: global constant
<a name="getMarkOptionTabstopOutline"></a>

## getMarkOptionTabstopOutline()
Mark option for a subdued outline box, used to show every remaining stop of an active
snippet/tab-stop session (see editor/TabstopManager.js) so the user can see at a glance how
many fields are left and where, even for the ones they haven't tabbed to yet.

**Kind**: global function
<a name="getMarkOptionTabstopOutlineActive"></a>

## getMarkOptionTabstopOutlineActive()
Mark option for the bold/active variant of the above, layered on top of it for whichever stop
is currently selected in an active snippet/tab-stop session.

**Kind**: global function
4 changes: 2 additions & 2 deletions src-node/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions src/brackets.config.dist.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"googleAnalyticsID" : "G-FBK9RP5YK2",
"googleAnalyticsID" : "G-G3DTS3ZR09",
"googleAnalyticsIDDesktop": "G-M7MX9BYZZ3",
"mixPanelID" : "8cb6814f733e37c05cc59b4adad26407",
"coreAnalyticsID" : "phoenix",
"coreAnalyticsAppName" : "phoenix-prod",
"coreAnalyticsAppName" : "phoenix-web",
"coreAnalyticsAppNameDesktop" : "desktop-prod",
"environment" : "production",
"buildtype" : "production",
Expand Down
11 changes: 6 additions & 5 deletions src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -47,14 +47,14 @@

<!-- Open Graph / Facebook -->
<meta property="og:type" content="website" />
<meta property="og:url" content="https://phcode.dev/" />
<meta property="og:url" content="https://web.phcode.dev/" />
<meta property="og:title" content="Phoenix Code | Code Creatively" />
<meta property="og:description" content="A text editor designed to make coding as intuitive and fun as playing a video game - specially crafted for web developers, designers, and students." />
<meta property="og:image" content="assets/images/socialcard.png" />

<!-- Twitter -->
<meta property="twitter:card" content="summary_large_image" />
<meta property="twitter:url" content="https://phcode.dev/" />
<meta property="twitter:url" content="https://web.phcode.dev/" />
<meta property="twitter:title" content="Phoenix Code | Code Creatively" />
<meta property="twitter:description" content="A text editor designed to make coding as intuitive and fun as playing a video game - specially crafted for web developers, designers, and students." />
<meta property="twitter:image" content="assets/images/socialcard.png" />
Expand All @@ -73,10 +73,10 @@
<script>
if(["dev.phcode.dev", "staging.phcode.dev"].includes(location.hostname)
&& localStorage.getItem("devDomainsEnabled") !== "true"){
alert("Hello explorer, you have reached a development version of phcode.dev that is not for general use and could be very unstable." +
alert("Hello explorer, you have reached a development version of Phoenix Code that is not for general use and could be very unstable." +
`\n\nIf you know what you are doing and what to visit the dev site, please go to https://${location.hostname}/devEnable.html to enable dev site and visit again.` +
"\n\nYou will now be redirected to phcode.dev.");
window.location = "https://phcode.dev";
"\n\nYou will now be redirected to web.phcode.dev.");
window.location = "https://web.phcode.dev";
}
if(window.electronAppAPI) {
window.__ELECTRON__ = true;
Expand Down Expand Up @@ -446,6 +446,7 @@
'https://phcode.live': true, // phcode prod live preview server
'https://ai-panel-onboarding.phcode.dev': true, // Ai panel onboarding iframes
'https://phcode.dev': true,
'https://web.phcode.dev': true, // prod web
'https://dev.phcode.dev': true,
'https://staging.phcode.dev': true,
'https://create.phcode.dev': true
Expand Down
4 changes: 4 additions & 0 deletions src/live-preview-loader.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,14 @@
'http://127.0.0.1:5000': true, // playwright tests
'https://phcode.live': true, // phcode prod live preview server
'https://phcode.dev': true,
'https://web.phcode.dev': true, // prod web
'https://dev.phcode.dev': true,
'https://staging.phcode.dev': true,
'https://create.phcode.dev': true
};
// this page is always served from the phoenix origin, so trust it whichever domain that is.
// keeps the loader working on any new phoenix host without another edit here.
TRUSTED_ORIGINS[location.origin] = true;
let okMessageTemplate;

function isTrustedURL(url) {
Expand Down
5 changes: 3 additions & 2 deletions src/loggerSetup.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
"phtauri://localhost", // mac or linux desktop
"https://phtauri.localhost", //windows desktop
"https://phcode.dev", // prod
"https://web.phcode.dev", // prod web
"https://create.phcode.dev", // extension authoring prod
"https://dev.phcode.dev", // dev url
"https://staging.phcode.dev" // staging url
Expand Down Expand Up @@ -236,8 +237,8 @@
function _isSafePathForLogging(pathText) {
const lower = pathText.toLowerCase();
const safeStarts = ["phtauri://", "https://phtauri.localhost", "http://localhost",
"https://localhost", "https://phcode.dev", "https://create.phcode.dev",
"https://dev.phcode.dev", "https://staging.phcode.dev",
"https://localhost", "https://phcode.dev", "https://web.phcode.dev",
"https://create.phcode.dev", "https://dev.phcode.dev", "https://staging.phcode.dev",
"/usr/", "/lib/", "/lib64/", "/opt/", "/snap/", "/bin/", "/sbin/", "/etc/",
"/system/", "/applications/", "c:\\program files", "c:\\windows"];
for(let prefix of safeStarts){
Expand Down
2 changes: 1 addition & 1 deletion src/robots.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ Disallow: /assets/
Disallow: /test/

# XML sitemaps
Sitemap: https://phcode.dev/sitemap-phcode.xml
Sitemap: https://web.phcode.dev/sitemap-phcode.xml
Sitemap: https://sitemaps.phcode.io/sitemap-phcode.xml

# more sitemap urls can be given here, but just 1 for now.
4 changes: 2 additions & 2 deletions src/sitemap-phcode.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
<urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9" xmlns:xhtml="http://www.w3.org/1999/xhtml">
<!-- Please also modify the file at sitemaps.phcode.io/sitemap-phcode.xml if modifying this file-->
<url>
<loc>https://phcode.dev/download/</loc>
<loc>https://web.phcode.dev/download/</loc>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://phcode.io/</loc>
<changefreq>daily</changefreq>
</url>
<url>
<loc>https://phcode.dev/</loc>
<loc>https://web.phcode.dev/</loc>
<changefreq>daily</changefreq>
</url>
<url>
Expand Down
1 change: 1 addition & 0 deletions test/SpecRunner.html
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@
'https://phcode.live': true, // phcode prod live preview server
'https://ai-panel-onboarding.phcode.dev': true, // Ai panel onboarding iframes
'https://phcode.dev': true,
'https://web.phcode.dev': true, // prod web
'https://dev.phcode.dev': true,
'https://staging.phcode.dev': true,
'https://create.phcode.dev': true
Expand Down
Loading