Merge branch 'Inventorum-master'

Author: sroze

build/ng-infinite-scroll.js

@@ -30,7 +30,7 @@ mod.directive('infiniteScroll', [
  containerBottom = $(container).height() + $(container).scrollTop();
  elementBottom = $(elem).offset().top + $(elem).height();
  } else {
- containerBottom = container.height();
+ containerBottom = container.outerHeight();
  containerTopOffset = 0;
  if (container.offset() !== void 0) {
  containerTopOffset = container.offset().top;

build/ng-infinite-scroll.min.js

@@ -32,7 +32,7 @@ mod.directive 'infiniteScroll', ['$rootScope', '$window', '$timeout', 'THROTTLE_
  containerBottom = $(container).height() + $(container).scrollTop()
  elementBottom = $(elem).offset().top + $(elem).height()
  else
- containerBottom = container.height()
+ containerBottom = container.outerHeight()
  containerTopOffset = 0
  if container.offset() != undefined
  containerTopOffset = container.offset().top