diff options
| author | Ryan Van Etten <ryanve@gmail.com> | 2014-02-13 02:59:58 -0500 |
|---|---|---|
| committer | Ryan Van Etten <ryanve@gmail.com> | 2014-02-13 02:59:58 -0500 |
| commit | b9ea4019b362ae6a87b77e3e46d32c32f99dd777 (patch) | |
| tree | 76695898d7a97378eaacf021e6634ee065ee7f97 | |
| parent | a35f26558b3163bc2dde112c51502ed7268424d9 (diff) | |
| download | verge-b9ea4019b362ae6a87b77e3e46d32c32f99dd777.zip verge-b9ea4019b362ae6a87b77e3e46d32c32f99dd777.tar.gz verge-b9ea4019b362ae6a87b77e3e46d32c32f99dd777.tar.bz2 | |
Re: #13 Detect viewport technique each time.
| -rw-r--r-- | src/verge.js | 33 | ||||
| -rw-r--r-- | test/index.html | 5 |
2 files changed, 9 insertions, 29 deletions
diff --git a/src/verge.js b/src/verge.js index 1e2711f..509f562 100644 --- a/src/verge.js +++ b/src/verge.js @@ -13,17 +13,13 @@ } : function() { return false; } - // http://ryanve.com/lab/dimensions - // http://github.com/ryanve/verge/issues/7 - , viewportW = docElem['clientWidth'] < win['innerWidth'] ? function() { - return win['innerWidth']; - } : function() { - return docElem['clientWidth']; + , viewportW = xports['viewportW'] = function() { + var a = docElem['clientWidth'], b = win['innerWidth']; + return a < b ? b : a; } - , viewportH = docElem['clientHeight'] < win['innerHeight'] ? function() { - return win['innerHeight']; - } : function() { - return docElem['clientHeight']; + , viewportH = xports['viewportH'] = function() { + var a = docElem['clientHeight'], b = win['innerHeight']; + return a < b ? b : a; }; /** @@ -46,24 +42,9 @@ return {}; }; - /** - * Get the layout viewport width. - * @since 1.0.0 - * @return {number} - */ - xports['viewportW'] = viewportW; - - /** - * Get the layout viewport height. - * @since 1.0.0 - * @return {number} - */ - xports['viewportH'] = viewportH; - /** - * alternate syntax for getting viewport dims * @since 1.8.0 - * @return {Object} + * @return {{width:number, height:number}} */ function viewport() { return {'width':viewportW(), 'height':viewportH()}; diff --git a/test/index.html b/test/index.html index 3166a72..6ea08fe 100644 --- a/test/index.html +++ b/test/index.html @@ -2,9 +2,8 @@ <html lang="en-US"> <head> <meta charset="utf-8"> - <title>verge // test suite</title> - <meta name=viewport content="width=device-width,initial-scale=1.0"> - <meta name=description content="JavaScript module test page"> + <title>verge: test suite</title> + <meta name=viewport content="width=device-width, initial-scale=1"> <style> html { font-family:sans-serif; background:#fdf6e3; color:#586e75; font-size:1em } body { margin:1em auto; max-width:100%; width:94%; } |