#362 better handle jQuery loading in odd ways

davidjbradshaw · Jun 13, 2016 · e76a303 · e76a303
1 parent 1d61152
commit e76a303
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -512,7 +512,8 @@ The parentIFrame methods object in the iFrame is now always available and the `e
 
 ## Version History
 
-* v3.5.3 [#283](https://github.com/davidjbradshaw/iframe-resizer/issues/286) Added *readystatechange* event listener.
+* v3,5.4 [#362](https://github.com/davidjbradshaw/iframe-resizer/issues/362) Handle jQuery being loaded in odd ways.
+* v3.5.3 [#283](https://github.com/davidjbradshaw/iframe-resizer/issues/283) Added *readystatechange* event listener.
 * v3.5.2 [#314](https://github.com/davidjbradshaw/iframe-resizer/pull/314) Add iframeHeight and iframeWidth properties to pageInfo [[Pierre Olivier](https://github.com/pomartel)]. [#303](https://github.com/davidjbradshaw/iframe-resizer/issues/303) Fix issue with IE8 polyFils. 
 * v3.5.1 [#286](https://github.com/davidjbradshaw/iframe-resizer/issues/286) Fixed *taggedElement / lowestElement / rightMostElement* to calculate correct margin [[Dan Ballance](danballance)].
 * v3.5.0 Recall getPageInfo callback when parent page position changes. Added *Array.prototype.forEach* to IE8 polyfils.

diff --git a/js/iframeResizer.contentWindow.min.js b/js/iframeResizer.contentWindow.min.js
diff --git a/js/iframeResizer.js b/js/iframeResizer.js
@@ -976,11 +976,17 @@
 	}
 
 	function createJQueryPublicMethod($){
-		$.fn.iFrameResize = function $iFrameResizeF(options) {
-			return this.filter('iframe').each(function (index, element) {
-				setupIFrame(element, options);
-			}).end();
-		};
+		if (!$.fn) {
+			info('','Unable to bind to jQuery, it is not fully loaded.');
+		} else {
+			$.fn.iFrameResize = function $iFrameResizeF(options) {
+				function init(index, element) {
+					setupIFrame(element, options);
+				}
+
+				return this.filter('iframe').each(init).end();
+			};
+		}
 	}
 
 	if (window.jQuery) { createJQueryPublicMethod(jQuery); }

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/src/iframeResizer.js b/src/iframeResizer.js
@@ -976,11 +976,17 @@
 	}
 
 	function createJQueryPublicMethod($){
-		$.fn.iFrameResize = function $iFrameResizeF(options) {
-			return this.filter('iframe').each(function (index, element) {
-				setupIFrame(element, options);
-			}).end();
-		};
+		if (!$.fn) {
+			info('','Unable to bind to jQuery, it is not fully loaded.');
+		} else {
+			$.fn.iFrameResize = function $iFrameResizeF(options) {
+				function init(index, element) {
+					setupIFrame(element, options);
+				}
+
+				return this.filter('iframe').each(init).end();
+			};
+		}
 	}
 
 	if (window.jQuery) { createJQueryPublicMethod(jQuery); }