Skip to content

Commit

Permalink
Merge branch 'main' into i-28
Browse files Browse the repository at this point in the history
# Conflicts:
#	blocks/aem-asset-selector/aem-asset-selector-util.js
  • Loading branch information
mfrisbey committed Aug 17, 2023
2 parents 3b734d4 + ef8e50b commit 4e7045e
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/pull_request_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ Please always provide the [GitHub issue(s)](../issues) your PR is for, as well a
Fix #<gh-issue-id>

Test URLs:
- Before: https://main--{repo}--{owner}.hlx.page/
- After: https://<branch>--{repo}--{owner}.hlx.page/
- Before: https://main--aem-assets-boilerplate--hlxsites.hlx.page/aem-asset-selector
- After: https://<branch>--aem-assets-boilerplate--hlxsites.hlx.page/aem-asset-selector
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ Integration between AEM Asset Selector and AEM Franklin to make AEM assets avail
![High Level Flow](/resources/using-asset-selector-with-franklin.jpeg)

## Environments
- Preview: https://main--{repo}--{owner}.hlx.page/
- Live: https://main--{repo}--{owner}.hlx.live/
- Preview: [https://main--aem-assets-boilerplate--hlxsites.hlx.page/aem-asset-selector](https://main--aem-assets-boilerplate--hlxsites.hlx.page/aem-asset-selector)
- Live: [https://main--aem-assets-boilerplate--hlxsites.hlx.live/aem-asset-selector](https://main--aem-assets-boilerplate--hlxsites.hlx.live/aem-asset-selector)

## Installation

Expand Down
4 changes: 1 addition & 3 deletions blocks/aem-asset-selector/aem-asset-selector-util.js
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,7 @@ export function init(cfg, callback) {
}

function onClose() {
const selectorDialog = document.getElementById('asset-selector-dialog');
selectorDialog.close();
document.getElementById('asset-selector-dialog').close();
}

async function getAssetPublicUrl(url) {
Expand Down Expand Up @@ -83,7 +82,6 @@ async function handleSelection(selection) {
maxRendition = rendition;
}
});
console.log('Selected rendition:', maxRendition.href);

const assetPublicUrl = await getAssetPublicUrl(maxRendition.href.substring(0, maxRendition.href.indexOf('?')));
console.log('Asset public URL:', assetPublicUrl);
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

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

0 comments on commit 4e7045e

Please sign in to comment.