Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-04-01 02:41:39 -05:00
Code Issues Activity

Convert getIframeUrl to a getter and inject as source into iframe component

Browse source
This commit is contained in:
Aileen Nowak 2023-03-22 14:00:00 +00:00 • committed by Aileen Booker
parent 00db25e314
commit c23480030f
4 changed files with 21 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ghost/admin/app/components/gh-explore-iframe.hbs
View file

@ -3,7 +3,7 @@
class="explore-frame"
frameborder="0"
title="Explore"
{{did-update this.handleDarkModeChange this.feature.nightShift}}
{{did-insert this.setup}}
{{did-update this.handleDarkModeChange this.feature.nightShift}}
...attributes
></iframe>

5
ghost/admin/app/components/gh-explore-iframe.js
View file

@ -22,8 +22,7 @@ export default class GhExploreIframe extends Component {
// Only begin setup when Explore window is toggled open
// to avoid unnecessary loading of assets
if (this.explore.exploreWindowOpen) {
console.log('Rebuild');
this.explore.getExploreIframe().src = this.explore.getIframeURL();
this.explore.getExploreIframe().src = this.explore.iframeURL;
}
}
@ -34,7 +33,7 @@ export default class GhExploreIframe extends Component {
}
// only process messages coming from the explore iframe
if (event?.data && this.explore.getIframeURL().includes(event?.origin)) {
if (event?.data && this.explore.iframeURL.includes(event?.origin)) {
if (event.data?.request === 'apiUrl') {
this._handleUrlRequest();
}

2
ghost/admin/app/components/gh-explore-modal.hbs
View file

@ -1,5 +1,5 @@
<div class="{{this.visibilityClass}}">
<div class="gh-explore-container">
<GhExploreIframe></GhExploreIframe>
<GhExploreIframe src={{this.explore.iframeUrl}}></GhExploreIframe>
</div>
</div>

34
ghost/admin/app/services/explore.js
View file

@ -23,6 +23,21 @@ export default class ExploreService extends Service {
return url.replace(/\/$/, '');
}
get iframeURL() {
let url = this.exploreUrl;
if (window.location.hash && window.location.hash.includes(this.exploreRouteRoot)) {
let destinationRoute = window.location.hash.replace(this.exploreRouteRoot, '');
// Connect is an Ember route, do not use it as iframe src
if (destinationRoute && !destinationRoute.includes('connect')) {
url += destinationRoute.replace(/^\//, '');
}
}
return url;
}
constructor() {
super(...arguments);
@ -53,21 +68,6 @@ export default class ExploreService extends Service {
}
}
getIframeURL() {
let url = this.exploreUrl;
if (window.location.hash && window.location.hash.includes(this.exploreRouteRoot)) {
let destinationRoute = window.location.hash.replace(this.exploreRouteRoot, '');
// Connect is an Ember route, do not use it as iframe src
if (destinationRoute && !destinationRoute.includes('connect')) {
url += destinationRoute.replace(/^\//, '');
}
}
return url;
}
// Sends a route update to a child route in the BMA, because we can't control
// navigating to it otherwise
sendRouteUpdate(route) {
@ -104,7 +104,7 @@ export default class ExploreService extends Service {
// Begin loading the iframe and setting the src if it's not already set
this.ensureIframeIsLoaded();
// Ensures correct "getIframeURL" calculation when syncing iframe location
// Ensures correct iframe URL calculation when syncing iframe location
// in toggleExploreWindow
window.location.hash = '/explore';
@ -114,7 +114,7 @@ export default class ExploreService extends Service {
ensureIframeIsLoaded() {
if (this.getExploreIframe() && !this.getExploreIframe()?.src) {
this.getExploreIframe().src = this.getIframeURL();
this.getExploreIframe().src = this.iframeURL;
}
}