Release v3.5.8

README.md

@@ -173,7 +173,7 @@ Listen for resize events from the parent page, or the iFrame. Select the 'child'
 ### scrolling
 
     default: false
-    type:    boolean
+    type:    boolean | 'auto'
 
 Enable scroll bars in iFrame.
 
@@ -526,6 +526,7 @@ The parentIFrame methods object in the iFrame is now always available and the `e
 
 ## Version History
 
+* v3.5.8 [#315](https://github.com/davidjbradshaw/iframe-resizer/issues/315) Allow Scrolling to be set to 'auto'.
 * v3.5.7 [#438](https://github.com/davidjbradshaw/iframe-resizer/issues/438) Check jQuery pluging wrapper not already loaded. [#423](https://github.com/davidjbradshaw/iframe-resizer/issues/423) Properly remove event listeners [[Aaron Hardy](Aaronius)]. [#401](https://github.com/davidjbradshaw/iframe-resizer/issues/401) Make tagged element fall back to all elements if tag not found. [#381](https://github.com/davidjbradshaw/iframe-resizer/issues/381) Fixing disconnect when iframe is missing temporarly [[Jeff Hicken](jhicken)]. Added warnings for missing iFrame and deprecated options.
 * v3.5.5 [#373](https://github.com/davidjbradshaw/iframe-resizer/issues/373) Add option for custom size calculation methods in iFrame. [#374](https://github.com/davidjbradshaw/iframe-resizer/issues/374) Fix bug with in page links called from parent page.
 * v3.5.4 [#362](https://github.com/davidjbradshaw/iframe-resizer/issues/362) Handle jQuery being loaded in odd ways. [#297](https://github.com/davidjbradshaw/iframe-resizer/issues/297) Ensure document ready before resizing

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "iframe-resizer",
-  "version": "3.5.7",
+  "version": "3.5.8",
   "homepage": "https://github.com/davidjbradshaw/iframe-resizer",
   "authors": [
     "David J. Bradshaw <[email protected]>"

iframeResizer.jquery.json

@@ -17,7 +17,7 @@
 		"RWD",
 		"responsive"
 	],
-	"version": "3.5.7",
+	"version": "3.5.8",
 	"author": {
 		"name": "David J. Bradshaw",
 		"email": "[email protected]"

js/iframeResizer.js

@@ -712,7 +712,16 @@
 		function setScrolling(){
 			log(iframeId,'IFrame scrolling ' + (settings[iframeId].scrolling ? 'enabled' : 'disabled') + ' for ' + iframeId);
 			iframe.style.overflow = false === settings[iframeId].scrolling ? 'hidden' : 'auto';
-			iframe.scrolling      = false === settings[iframeId].scrolling ? 'no' : 'yes';
+			switch(settings[iframeId].scrolling) {
+				case true:
+					iframe.scrolling = 'yes';
+					break;
+				case false:
+					iframe.scrolling = 'no';
+					break;
+				default:
+					iframe.scrolling = settings[iframeId].scrolling;
+			}
 		}
 
 		//The V1 iFrame script expects an int, where as in V2 expects a CSS

package.json

@@ -1,6 +1,6 @@
 {
   "name": "iframe-resizer",
-  "version": "3.5.7",
+  "version": "3.5.8",
   "homepage": "https://github.com/davidjbradshaw/iframe-resizer",
   "authors": [
     "David J. Bradshaw <[email protected]>"