Add window.innerHeight and window.innerWidth to getPageInfo()

docs/iframed_page/methods.md

@@ -26,12 +26,17 @@ Ask the containing page for its positioning coordinates. You need to provide a c
 
 * **iframeHeight** The height of the iframe in pixels
 * **iframeWidth** The width of the iframe in pixels
-* **clientHeight** The height of the viewport in pixels
-* **clientWidth** The width of the viewport in pixels
 * **offsetLeft** The number of pixels between the left edge of the containing page and the left edge of the iframe
 * **offsetTop** The number of pixels between the top edge of the containing page and the top edge of the iframe
 * **scrollLeft** The number of pixels between the left edge of the iframe and the left edge of the iframe viewport
 * **scrollTop** The number of pixels between the top edge of the iframe and the top edge of the iframe viewport
+* **documentHeight** The containing document's height in pixels (the equivalent of  `document.documentElement.clientHeight` in the container)
+* **documentWidth** The containing document's width in pixels (the equivalent of `document.documentElement.clientWidth` in the container)
+* **windowHeight** The containing window's height in pixels (the equivalent of `window.innerHeight` in the container)
+* **windowWidth** The containing window's width in pixels (the equivalent of `window.innerWidth` in the container)
+* **clientHeight** (deprecated) The height of the containing document, considering the viewport, in pixels (`max(documentHeight, windowHeight)`).
+* **clientWidth** (deprecated) The width of the containing document, considering the viewport, in pixels (`max(documentWidth, windowWidth)`).
+
 
 Your callback function will be recalled when the parent page is scrolled or resized.
 

js/iframeResizer.js

@@ -287,7 +287,11 @@
         offsetTop: parseInt(iFramePosition.top - bodyPosition.top, 10),
         offsetLeft: parseInt(iFramePosition.left - bodyPosition.left, 10),
         scrollTop: window.pageYOffset,
-        scrollLeft: window.pageXOffset
+        scrollLeft: window.pageXOffset,
+        documentHeight: document.documentElement.clientHeight,
+        documentWidth: document.documentElement.clientWidth,
+        windowHeight: window.innerHeight,
+        windowWidth: window.innerWidth
       })
     }
 

spec/childSpec.js

@@ -147,12 +147,16 @@ define(['iframeResizerContent', 'jquery'], function(mockMsgListener, $) {
       win.parentIFrame.getPageInfo(function(pageInfo) {
         expect(pageInfo.iframeHeight).toBe(500)
         expect(pageInfo.iframeWidth).toBe(300)
-        expect(pageInfo.clientHeight).toBe(645)
-        expect(pageInfo.clientWidth).toBe(1295)
         expect(pageInfo.offsetLeft).toBe(20)
         expect(pageInfo.offsetTop).toBe(85)
         expect(pageInfo.scrollTop).toBe(0)
         expect(pageInfo.scrollLeft).toBe(0)
+        expect(pageInfo.documentHeight).toBe(645)
+        expect(pageInfo.documentWidth).toBe(1295)
+        expect(pageInfo.windowHeight).toBe(645)
+        expect(pageInfo.windowWidth).toBe(1295)
+        expect(pageInfo.clientHeight).toBe(645)
+        expect(pageInfo.clientWidth).toBe(1295)
         done()
       })
       expect(msgObject.source.postMessage).toHaveBeenCalledWith(
@@ -161,7 +165,10 @@ define(['iframeResizerContent', 'jquery'], function(mockMsgListener, $) {
       )
       mockMsgListener(
         createMsg(
-          'pageInfo:{"iframeHeight":500,"iframeWidth":300,"clientHeight":645,"clientWidth":1295,"offsetLeft":20,"offsetTop":85,"scrollLeft":0,"scrollTop":0}'
+          'pageInfo:{"iframeHeight":500,"iframeWidth":300,"clientHeight":645,' +
+          '"clientWidth":1295,"offsetLeft":20,"offsetTop":85,"scrollLeft":0,' +
+          '"scrollTop":0,"documentHeight":645,"documentWidth":1295,' +
+          '"windowHeight":645,"windowWidth":1295}'
         )
       )
     })

src/iframeResizer.js

@@ -287,7 +287,11 @@
         offsetTop: parseInt(iFramePosition.top - bodyPosition.top, 10),
         offsetLeft: parseInt(iFramePosition.left - bodyPosition.left, 10),
         scrollTop: window.pageYOffset,
-        scrollLeft: window.pageXOffset
+        scrollLeft: window.pageXOffset,
+        documentHeight: document.documentElement.clientHeight,
+        documentWidth: document.documentElement.clientWidth,
+        windowHeight: window.innerHeight,
+        windowWidth: window.innerWidth
       })
     }