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
8 changes: 4 additions & 4 deletions package-lock.json

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

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,6 @@
"typescript": "5.6.3"
},
"dependencies": {
"@playcanvas/attribute-parser": "^1.10.0"
"@playcanvas/attribute-parser": "^1.10.1"
}
}
96 changes: 96 additions & 0 deletions sass/editor/_editor-asset-script-inspector.scss
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
@use 'sass:color';

$bright-red: #e74c3c;
$bright-yellow: #f1c40f;
$status-info: #b1b8ba;
$status-error: $bright-red;
$status-warn: $bright-yellow;

.script-asset-inspector-container,
.script-asset-inspector-error-container {
display: flex;
Expand All @@ -6,6 +14,49 @@
margin: 6px;
}

.script-asset-inspector-attribute-error-container {
display: flex;
flex-direction: column;
border: none;
margin: 0;
background-color: #2c393c;

}

.pcui-label {
&.clickable-error {
cursor: pointer;
font-size: 11px;

&:hover {
text-decoration: underline;
}
}

&.pcui-error { // For simple errors
font-size: 11px;
}
}

.script-asset-inspector-script.pcui-error.clickable-error {
cursor: pointer;

&:hover {
text-decoration: underline;
}
}

.script-asset-inspector-attribute-error-title, .script-asset-inspector-attribute-warning-title {
font-family: inconsolatamedium, Monaco, Menlo, "Ubuntu Mono", Consolas, source-code-pro, monospace;
font-weight: normal;
font-size: 12px;
cursor: pointer;
}

.script-asset-inspector-attribute-error-title:hover, .script-asset-inspector-attribute-warning-title:hover {
text-decoration: underline;
}

.script-asset-inspector-error-container > .pcui-label {
white-space: normal;
}
Expand All @@ -28,6 +79,7 @@
white-space: normal;
}


.script-asset-inspector-attribute {
flex-grow: 1;
color: #b1b8ba;
Expand All @@ -43,3 +95,47 @@
.script-asset-inspector-attribute:hover {
background-color: #313e41;
}

.script-asset-inspector-warning {
color: $status-warn;
}

.script-asset-inspector-attribute-warning {
color: $status-warn;

.pcui-label {
color: $status-warn;
}
}

.script-asset-inspector-attribute-warning.clickable-warning {
cursor: pointer;

&:hover {
text-decoration: underline;
}
}

.script-asset-inspector-attribute-error {
&::before {
@extend .font-icon;

content: '\E368';
margin-right: 6px;
}
}

// Tooltip warnings styling
.warnings-title.script-asset-inspector-warning {
// Normal text color for the header
}

.warning-item.script-asset-inspector-warning {
color: var(--pcui-warning-color);
font-size: 11px;
}

.open-console {
text-decoration: underline;
cursor: pointer;
}
6 changes: 3 additions & 3 deletions src/code-editor/editor.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ class CodeEditor extends Editor {
this.once('loaded', () => {
this.emit('start');

// Send an event to the opener
const openerOrigin = new URL(document.referrer).origin;
window.opener.postMessage('start', openerOrigin);
if (window.opener) {
window.opener.postMessage('start', window.opener.origin);
}

// if there is a merge in progress for our branch
if (config.self.branch.merge && !config.self.branch.merge.conflict) {
Expand Down
Loading