Merge branch 'makandra-fix-resized-callback'

davidjbradshaw · Mar 29, 2017 · 7c6e759 · 7c6e759
2 parents 245cc3b + 2aa506f
commit 7c6e759
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -23,7 +23,7 @@ This library enables the automatic resizing of the height and width of both same
 
 ### Install
 
-This package can be installed via NPM (`npm install iframe-resizer -save`) or Bower (`bower install iframe-resizer`).
+This package can be installed via NPM (`npm install iframe-resizer -save`), Yarn (`yarn add iframe-resizer`) or Bower (`bower install iframe-resizer`).
 
 ### Getting started
 The package contains two minified JavaScript files in the [js](js) folder. The first ([iframeResizer.min.js](https://raw.githubusercontent.com/davidjbradshaw/iframe-resizer/master/js/iframeResizer.min.js)) is for the page hosting the iFrames. It can be called with **native** JavaScript;

diff --git a/src/iframeResizer.js b/src/iframeResizer.js
@@ -138,6 +138,7 @@
 			function resize(){
 				setSize(messageData);
 				setPagePosition(iframeId);
+				callback('resizedCallback',messageData);
 			}
 
 			ensureInRange('Height');
@@ -460,11 +461,9 @@
 			case 'init':
 				resizeIFrame();
 				callback('initCallback',messageData.iframe);
-				callback('resizedCallback',messageData);
 				break;
 			default:
 				resizeIFrame();
-				callback('resizedCallback',messageData);
 			}
 		}