Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: davidjbradshaw/iframe-resizer
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v5.3.2
Choose a base ref
...
head repository: davidjbradshaw/iframe-resizer
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v5.3.3
Choose a head ref
Loading
2 changes: 2 additions & 0 deletions .eslintignore
Original file line number Diff line number Diff line change
@@ -3,4 +3,6 @@ js
**/*.d.js
coverage
example/react/src/message-data.jsx
example-test/react/src/message-data.jsx
example-test/
packages/common/mode.js
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -10,3 +10,4 @@ coverage*
js/*
dist
test-js
example-test
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -36,13 +36,13 @@ JS file that is designed to be a zero impact guest on the sites hosting it.

Additionally _iframe-resizer_ provides a range of missing browser API features, that allows you to securely integrate your iframe content with the parent page.

* Scroll the page, relative to the iframe or parent pages position
* Get details of the position of the iframe, the scroll position and viewport of the parent page
* Fixes in page linking in the iframe and allows links to propagate to the parent page
* Adds `onMouseEnter` and `onMouseLeave` events to the iframe element
* Simplified message passing between the iframe and the parent page
* Automatic domain authentication
* Enhanced Accessibility
- Scroll the parent page, [relative to the iframe](https://iframe-resizer.com/api/child#scrolltooffsetx-y) or [parent page's position](https://iframe-resizer.com/api/child#scrollbyx-y)
- Provides details of the [position of the iframe](https://iframe-resizer.com/api/child#getparentpropscallback), the [scroll position](https://iframe-resizer.com/api/child#getparentpropscallback) and [viewport](https://iframe-resizer.com/api/child#getparentpropscallback) of the parent page
- Fixes [in page linking](https://iframe-resizer.com/api/parent#inpagelinks) in the iframe and allows links to propagate to the parent page
- Adds [`onMouseEnter`](https://iframe-resizer.com/api/parent#onmouseenter) and [`onMouseLeave`](https://iframe-resizer.com/api/parent#onmouseleave) events to the iframe element
- Simplified message passing between the [iframe](https://iframe-resizer.com/api/child#onmessage) and the [parent](https://iframe-resizer.com/api/parent#onmessage) page
- Automatic domain authentication
- Enhanced [Accessibility](https://iframe-resizer.com/accessibility)

When combined with [viewer.js](https://viewerjs.org/) it can even resize iframes containing PDF and ODF documents.

2 changes: 2 additions & 0 deletions bin/publish.sh
Original file line number Diff line number Diff line change
@@ -26,6 +26,7 @@ echo
echo "Publishing version $VERSION as $1"
echo

npm install
npm run build:$1

cd dist/parent
@@ -65,3 +66,4 @@ git push --tags

echo "Updating iframe-resizer.com"
cp -v js/* ../docs/public/js
echo "export default '$VERSION'" > ../docs/src/components/version.js
2 changes: 0 additions & 2 deletions build/pkgJson.js
Original file line number Diff line number Diff line change
@@ -23,8 +23,6 @@ const customConfig = (file) => {
case 'legacy':
return {
name: 'iframe-resizer',
description:
"This project has now been split into two separate packages. Please use '@iframe-resizer/parent' and '@iframe-resizer/child'. See https://iframe-resizer.com/upgrade for more details.",
main,
module,
}
2 changes: 1 addition & 1 deletion example/html/child/frame.absolute.html
Original file line number Diff line number Diff line change
@@ -125,7 +125,7 @@

<script
type="text/javascript"
src="../../../js/iframe-resizer.child.js"
src="../../../js-dist/iframe-resizer.child.js"
></script>

<script>
2 changes: 1 addition & 1 deletion example/html/child/frame.animate-width.html
Original file line number Diff line number Diff line change
@@ -111,7 +111,7 @@

<script
type="text/javascript"
src="../../../js/iframe-resizer.child.js"
src="../../../js-dist/iframe-resizer.child.js"
></script>
</body>
</html>
2 changes: 1 addition & 1 deletion example/html/child/frame.animate.html
Original file line number Diff line number Diff line change
@@ -142,7 +142,7 @@ <h4>Data returned by parentIFrame.getParentProps()</h4>

<script
type="text/javascript"
src="../../../js/iframe-resizer.child.js"
src="../../../js-dist/iframe-resizer.child.js"
></script>

</body>
2 changes: 1 addition & 1 deletion example/html/child/frame.content.html
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<script
type="text/javascript"
src="../../../js/iframe-resizer.child.js"
src="../../../js-dist/iframe-resizer.child.js"
></script>
<!-- <script
type="text/javascript"
2 changes: 1 addition & 1 deletion example/html/child/frame.hover.html
Original file line number Diff line number Diff line change
@@ -27,7 +27,7 @@

<script
type="text/javascript"
src="../../../js/iframe-resizer.child.js"
src="../../../js-dist/iframe-resizer.child.js"
></script>

<div id="code">
4 changes: 2 additions & 2 deletions example/html/child/frame.nested.html
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@
<meta name="description" content="iFrame message passing test" />
<meta name="viewport" content="width=device-width" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<script type="text/javascript" src="../../../js/iframe-resizer.parent.js"></script>
<script type="text/javascript" src="../../../js/iframe-resizer.child.js"></script>
<script type="text/javascript" src="../../../js-dist/iframe-resizer.parent.js"></script>
<script type="text/javascript" src="../../../js-dist/iframe-resizer.child.js"></script>
<style>
*,
*:before,
2 changes: 1 addition & 1 deletion example/html/child/frame.overflow.html
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@

<script
type="text/javascript"
src="../../../js/iframe-resizer.child.js"
src="../../../js-dist/iframe-resizer.child.js"
></script>
</body>
</html>
2 changes: 1 addition & 1 deletion example/html/child/frame.textarea.html
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@

<textarea id="textArea">Resize me</textarea>

<script src="../../../js/iframe-resizer.child.js"></script>
<script src="../../../js-dist/iframe-resizer.child.js"></script>

</body>
</html>
6 changes: 1 addition & 5 deletions example/html/index.html
Original file line number Diff line number Diff line change
@@ -23,12 +23,8 @@
</style>
<script
type="text/javascript"
src="../../js/iframe-resizer.parent.js"
src="../../js-dist/iframe-resizer.parent.js"
></script>
<!-- <script
type="text/javascript"
src="../../dist/legacy/js/iframeResizer.js"
></script> -->
</head>

<body>
2 changes: 1 addition & 1 deletion example/html/two.html
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ <h2>Automagically resizing iFrame</h2>

<script
type="text/javascript"
src="../../js/iframe-resizer.parent.js"
src="../../js-dist/iframe-resizer.parent.js"
></script>
<script type="text/javascript">
/*
2 changes: 1 addition & 1 deletion example/html/width.html
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ <h2>Automagically resizing iFrame</h2>

<script
type="text/javascript"
src="../../js/iframe-resizer.parent.js"
src="../../js-dist/iframe-resizer.parent.js"
></script>
<script type="text/javascript">
/*
4 changes: 2 additions & 2 deletions example/react/child/frame.nested.html
Original file line number Diff line number Diff line change
@@ -6,8 +6,8 @@
<meta name="description" content="iFrame message passing test" />
<meta name="viewport" content="width=device-width" />
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<script type="text/javascript" src="../../../js/iframe-resizer.parent.js"></script>
<script type="text/javascript" src="../../../js/iframe-resizer.child.js"></script>
<script type="text/javascript" src="../../../js-dist/iframe-resizer.parent.js"></script>
<script type="text/javascript" src="../../../js-dist/iframe-resizer.child.js"></script>
<style>
*,
*:before,
Loading