Merge remote-tracking branch 'origin/master'

Author: bbrala

README.md

@@ -102,6 +102,7 @@ $.contextMenu is published under the [MIT license](http://www.opensource.org/lic
 * Added dist folder with compiled JS and CSS, added these files to package and bower configuration.
 * Fixed doc link for jQuery UI position ([Issue #274](https://github.com/swisnl/jQuery-contextMenu/issues/274)
 * Item icon can now be a callback to dynamically decide on icon class. - ([Issue #158](https://github.com/swisnl/jQuery-contextMenu/issues/158), [Issue #129](https://github.com/swisnl/jQuery-contextMenu/issues/129), [Issue #151](https://github.com/swisnl/jQuery-contextMenu/issues/151), [Issue #249](https://github.com/swisnl/jQuery-contextMenu/issues/249))
+* Small fix to calculating width and height on screen edges when padding is present.
 
 ### 1.7.0 (August 29th 2015) ###
 

dist/jquery.contextMenu.js

@@ -12,7 +12,7 @@
  *   MIT License http://www.opensource.org/licenses/mit-license
  *   GPL v3 http://opensource.org/licenses/GPL-3.0
  *
- * Date: 2015-09-11T19:12:25.157Z
+ * Date: 2015-09-11T19:40:21.884Z
  */
 
 
@@ -145,8 +145,8 @@
                 // correct offset if viewport demands it
                 var bottom = $win.scrollTop() + $win.height(),
                     right = $win.scrollLeft() + $win.width(),
-                    height = opt.$menu.height(),
-                    width = opt.$menu.width();
+                    height = opt.$menu.outerHeight(),
+                    width = opt.$menu.outerWidth();
 
                 if (offset.top + height > bottom) {
                     offset.top -= height;