Release v3.5.12

davidjbradshaw · Mar 29, 2017 · 534ca5f · 534ca5f
1 parent 7c6e759
commit 534ca5f
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -527,6 +527,7 @@ The parentIFrame methods object in the iFrame is now always available and the `e
 
 ## Version History
 
+* v3.5.12 [#475](https://github.com/davidjbradshaw/iframe-resizer/issues/475) Delay resizeCallback until after the iFrame has resized [[Codener]](codener).
 * v3.5.11 [#470](https://github.com/davidjbradshaw/iframe-resizer/issues/470) Fix jQuery reference error [[Russell Schick]](rschick).
 * v3.5.10 [#461](https://github.com/davidjbradshaw/iframe-resizer/issues/461) Don't run for server-side render
 * v3.5.9 Show warning message if no response from iFrame. [#463](https://github.com/davidjbradshaw/iframe-resizer/issues/463) Suppress warning message when code loaded via module [[Sergey Pereskokov](SerjoPepper)]. [#461](https://github.com/davidjbradshaw/iframe-resizer/issues/461).

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "iframe-resizer",
-  "version": "3.5.11",
+  "version": "3.5.12",
   "homepage": "https://github.com/davidjbradshaw/iframe-resizer",
   "authors": [
     "David J. Bradshaw <[email protected]>"

diff --git a/js/iframeResizer.contentWindow.min.js b/js/iframeResizer.contentWindow.min.js
diff --git a/js/iframeResizer.js b/js/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);
 			}
 		}
 

diff --git a/js/iframeResizer.map b/js/iframeResizer.map
diff --git a/js/iframeResizer.min.js b/js/iframeResizer.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "iframe-resizer",
-  "version": "3.5.11",
+  "version": "3.5.12",
   "homepage": "https://github.com/davidjbradshaw/iframe-resizer",
   "authors": [
     "David J. Bradshaw <[email protected]>"