Skip to content
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

4.50.5 #1524

Merged
merged 13 commits into from
Aug 19, 2023
Merged

4.50.5 #1524

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
21e3b42
Add singular plug-in label (#1458)
dnicolson May 13, 2023
0656d12
Document the default port/address that you can access the UI in your …
adamcoulombe May 14, 2023
80a811e
Improve translations (#1459)
dnicolson May 14, 2023
809508e
Fix capitalization (#1496)
dnicolson May 20, 2023
bce11c6
Update zh-CN.json (#1503)
mylylyl May 31, 2023
7f2fa91
Fixed nested arrays settings (#1504)
Jul 19, 2023
9dae60b
Fixed nested arrays settings #2 (#1510)
Jul 19, 2023
7994a83
Fixed nested arrays #3 (#1511)
Jul 20, 2023
e64aaad
Wait for custom UI (#1522)
dnicolson Aug 18, 2023
ab2313d
Wait for custom UI (#1523)
dnicolson Aug 19, 2023
46d1fd2
Merge branch 'master' into beta-4.50.5
donavanbecker Aug 19, 2023
41a2c19
4.50.5
donavanbecker Aug 19, 2023
268a6fc
Merge branch 'beta-4.50.5' of https://github.com/homebridge/homebridg…
donavanbecker Aug 19, 2023
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
Prev Previous commit
Next Next commit
Wait for custom UI (#1522)
  • Loading branch information
@dnicolson
dnicolson authored Aug 18, 2023
commit e64aaad0677ff15a91118e2c023519df3aff20e5
2 changes: 1 addition & 1 deletion ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h5 class="modal-title">{{ plugin.displayName || plugin.name }}</h5>
style="border: 0;">
</iframe>

<div *ngIf="pluginConfig.length && schema.singular && showSchemaForm" class="card card-body">
<div *ngIf="uiLoaded && pluginConfig.length && schema.singular && showSchemaForm" class="card card-body">
<app-schema-form [configSchema]="schema" [(data)]="pluginConfig[0]"
(dataChanged)="schemaFormUpdatedSubject.next($event)">
</app-schema-form>
Expand Down
4 changes: 4 additions & 0 deletions ui/src/app/core/manage-plugins/custom-plugins/custom-plugins.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ export class CustomPluginsComponent implements OnInit, OnDestroy {
public loading = true;
public saveInProgress = false;
public pluginSpinner = false;
public uiLoaded = false;

private basePath: string;
private iframe: HTMLIFrameElement;
Expand Down Expand Up @@ -122,6 +123,9 @@ export class CustomPluginsComponent implements OnInit, OnDestroy {
this.iframe = this.customPluginUiElementTarget.nativeElement as HTMLIFrameElement;
this.iframe.src = environment.api.base + this.basePath +
'/index.html?origin=' + encodeURIComponent(location.origin) + '&v=' + encodeURIComponent(this.plugin.installedVersion);
this.iframe.onload = () => {
this.uiLoaded = true;
};
}

handleMessage = (e: MessageEvent) => {
Expand Down