Merge branch 'dev'

appbaseio · Apr 25, 2017 · a5cad18 · a5cad18
2 parents 830f021 + 2783345
commit a5cad18
Show file tree

Hide file tree

Showing 14 changed files with 41 additions and 41 deletions.
diff --git a/app/actuators/ResultCard.js b/app/actuators/ResultCard.js
@@ -174,7 +174,7 @@ export default class ResultCard extends Component {
 		function checkHeight() {
 			const flag = resultElement.get(0).scrollHeight - padding > resultElement.height();
 			const scrollFlag = scrollElement.get(0).scrollHeight > scrollElement.height();
-			if (!flag && !scrollFlag && scrollElement.length) {
+			if (!flag && !scrollFlag && scrollElement.length && !this.props.pagination) {
 				const scrollHeight = resultElement.height() - 100;
 				if (scrollHeight > 0) {
 					scrollElement.css({
@@ -190,7 +190,7 @@ export default class ResultCard extends Component {
 				"height": "auto",
 				"padding-bottom": 0
 			});
-			setTimeout(checkHeight, 1000);
+			setTimeout(checkHeight.bind(this), 1000);
 		}
 	}
 

diff --git a/app/actuators/ResultList.js b/app/actuators/ResultList.js
@@ -174,7 +174,7 @@ export default class ResultList extends Component {
 		function checkHeight() {
 			const flag = resultElement.get(0).scrollHeight - padding > resultElement.height();
 			const scrollFlag = scrollElement.get(0).scrollHeight > scrollElement.height();
-			if (!flag && !scrollFlag && scrollElement.length) {
+			if (!flag && !scrollFlag && scrollElement.length && !this.props.pagination) {
 				const scrollHeight = resultElement.height() - 100;
 				if (scrollHeight > 0) {
 					scrollElement.css({
@@ -190,7 +190,7 @@ export default class ResultList extends Component {
 				"height": "auto",
 				"padding-bottom": 0
 			});
-			setTimeout(checkHeight, 1000);
+			setTimeout(checkHeight.bind(this), 1000);
 		}
 	}
 

diff --git a/dist/airbnb_recipe.bundle.js b/dist/airbnb_recipe.bundle.js
diff --git a/dist/ecommerce_recipe.bundle.js b/dist/ecommerce_recipe.bundle.js
diff --git a/dist/meetup_recipe.bundle.js b/dist/meetup_recipe.bundle.js
diff --git a/dist/news_recipe.bundle.js b/dist/news_recipe.bundle.js
diff --git a/dist/producthunt_recipe.bundle.js b/dist/producthunt_recipe.bundle.js
diff --git a/dist/simplebeds_recipe.bundle.js b/dist/simplebeds_recipe.bundle.js
diff --git a/dist/yelp_recipe.bundle.js b/dist/yelp_recipe.bundle.js
diff --git a/examples/simplebeds/app.js b/examples/simplebeds/app.js
@@ -60,7 +60,7 @@ class Main extends Component {
 					theme="rbc-red"
 				>
 					<nav>
-						<a href="/examples/airbeds" className="brand">Airbeds</a>
+						<a href="/examples/airbeds" className="brand">Simplebeds</a>
 					</nav>
 
 					<div className="sensor-wrapper clearfix">

diff --git a/lib/actuators/ResultCard.js b/lib/actuators/ResultCard.js
@@ -222,7 +222,7 @@ var ResultCard = function (_Component) {
 			function checkHeight() {
 				var flag = resultElement.get(0).scrollHeight - padding > resultElement.height();
 				var scrollFlag = scrollElement.get(0).scrollHeight > scrollElement.height();
-				if (!flag && !scrollFlag && scrollElement.length) {
+				if (!flag && !scrollFlag && scrollElement.length && !this.props.pagination) {
 					var scrollHeight = resultElement.height() - 100;
 					if (scrollHeight > 0) {
 						scrollElement.css({
@@ -238,7 +238,7 @@ var ResultCard = function (_Component) {
 					"height": "auto",
 					"padding-bottom": 0
 				});
-				setTimeout(checkHeight, 1000);
+				setTimeout(checkHeight.bind(this), 1000);
 			}
 		}
 	}, {

diff --git a/lib/actuators/ResultList.js b/lib/actuators/ResultList.js
@@ -222,7 +222,7 @@ var ResultList = function (_Component) {
 			function checkHeight() {
 				var flag = resultElement.get(0).scrollHeight - padding > resultElement.height();
 				var scrollFlag = scrollElement.get(0).scrollHeight > scrollElement.height();
-				if (!flag && !scrollFlag && scrollElement.length) {
+				if (!flag && !scrollFlag && scrollElement.length && !this.props.pagination) {
 					var scrollHeight = resultElement.height() - 100;
 					if (scrollHeight > 0) {
 						scrollElement.css({
@@ -238,7 +238,7 @@ var ResultList = function (_Component) {
 					"height": "auto",
 					"padding-bottom": 0
 				});
-				setTimeout(checkHeight, 1000);
+				setTimeout(checkHeight.bind(this), 1000);
 			}
 		}
 	}, {

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@appbaseio/reactivesearch",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "description": "A React UI components library for building search experiences",
   "main": "lib/app.js",
   "scripts": {

diff --git a/umd/ReactiveSearch.js b/umd/ReactiveSearch.js