#265 Fix issue in EnsureId function if no options passed

davidjbradshaw · Oct 1, 2015 · d89d5bf · d89d5bf
1 parent 487d185
commit d89d5bf
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 9 deletions.
diff --git a/js/iframeResizer.contentWindow.min.js b/js/iframeResizer.contentWindow.min.js
diff --git a/js/iframeResizer.js b/js/iframeResizer.js
@@ -600,7 +600,7 @@
 		}
 
 		function newId(){
-			var id = (options.id || defaults.id + count++);
+			var id = ((options && options.id) || defaults.id + count++);
 			if  (null!==document.getElementById(id)){
 				id = id + count++;
 			}

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/spec/initJQuerySpec.js b/spec/initJQuerySpec.js
@@ -10,9 +10,7 @@ define(['iframeResizer','jquery'], function(iFrameResize,$) {
 		beforeAll(function(){
 			loadIFrame('iframe600.html');
 
-			var $iframes = $('iframe').iFrameResize({
-					log:LOG
-				},'iframe');
+			var $iframes = $('iframe').iFrameResize();
 
 			iframe = $iframes.get(0);
 		});

diff --git a/spec/initUndifinedDomSpec.js b/spec/initUndifinedDomSpec.js
@@ -0,0 +1,25 @@
+/* jshint undef: false, unused: true */
+
+'use strict';
+
+define(['iframeResizer'], function(iFrameResize) {
+	describe('iFrame init(DOM Object)', function() {
+		var iframe;
+
+		beforeAll(function(){
+			loadIFrame('iframe600.html');
+
+			iframe = iFrameResize(undefined,document.getElementsByTagName('iframe')[0])[0];
+		});
+
+		afterAll(function(){
+			tearDown(iframe);
+		})
+
+		it('should create iFrameResizer object', function() {
+			expect(iframe.iFrameResizer).toBeDefined();
+		});
+	});
+});
+
+
diff --git a/src/iframeResizer.js b/src/iframeResizer.js
@@ -600,7 +600,7 @@
 		}
 
 		function newId(){
-			var id = (options.id || defaults.id + count++);
+			var id = ((options && options.id) || defaults.id + count++);
 			if  (null!==document.getElementById(id)){
 				id = id + count++;
 			}