Merge branch 'master' into sync

Author: dhilt

README.md

@@ -15,7 +15,7 @@
     - [Examples](#examples)
     - [Install and connect](#install-and-connect)
 - [uiScroll directive](#uiscroll-directive)
-    - [Parametrs](#parametrs)
+    - [Parameters](#parameters)
     - [Datasource](#datasource)
     - [Adapter](#adapter)
 - [uiScrollViewport directive](#uiscrollviewport-directive)
@@ -142,8 +142,7 @@ Currently we have 2 regular modules which can be added to the angular-app you ar
    - [uiScrollTd directive](#uiscrollth-and-uiscrolltd-directives)
 
 Also there is one more additional module in a separate file
- - __ui.scroll.jqlite__ module
-It is empty since it was deprecated in v1.6.0.
+ - __ui.scroll.jqlite__ module (it is empty since it was deprecated in v1.6.0)
 
 
 -------------------
@@ -468,9 +467,13 @@ PR should include source code (./scr) changes, may include tests (./test) change
 
 ## Change log
 
+### v1.6.2
+ * Added bottomVisible, bottomVisibleElement and bottomVisibleScope properties to the Adapter.
+ * Fixed some issues [149](https://github.com/angular-ui/ui-scroll/issues/149), [150](https://github.com/angular-ui/ui-scroll/issues/150), [151](https://github.com/angular-ui/ui-scroll/issues/151), [158](https://github.com/angular-ui/ui-scroll/issues/158), [159](https://github.com/angular-ui/ui-scroll/issues/159), [160](https://github.com/angular-ui/ui-scroll/issues/160), [163](https://github.com/angular-ui/ui-scroll/issues/163) 
+
 ### v1.6.1
- * Refactored Adapter assignments logic
- * Fixed Chrome Scroll Anchoring enforced feature [bug](https://github.com/angular-ui/ui-scroll/issues/138)
+ * Refactored Adapter assignments logic.
+ * Fixed Chrome Scroll Anchoring enforced feature [bug](https://github.com/angular-ui/ui-scroll/issues/138).
 
 ### v1.6.0
  * Introduced ES6 modules in the source codes.
@@ -501,7 +504,7 @@ PR should include source code (./scr) changes, may include tests (./test) change
 ### v1.4.0
 * Migrated sources from CoffeeScript to ES6.
 * Optimized scroll events handling, removed odd $digest cycles.
-* Examples (demo) refactoring.
+* Refactored sample demos.
 
 ### v1.3.3
 * Implemented new signature of the Datasource get(descriptor, success) method.
@@ -512,7 +515,7 @@ PR should include source code (./scr) changes, may include tests (./test) change
 * Implemented the logic for adjustBuffer triggering during invisible items became visible.
 
 ### v1.3.1
-* Changed the logic of viewport scroll/padding recalculation (to solve the problem [#8](https://github.com/angular-ui/ui-scroll/issues/8)).
+* Changed the logic of viewport scroll/padding recalculation.
 * Splitted test specifications.
 * Updated dev-dependencies (package.json).
 * Implemented append/prepend methods on the adapter.

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "angular-ui-scroll",
   "description": "AngularJS infinite scrolling module",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "main": "./dist/ui-scroll.js",
   "homepage": "https://github.com/angular-ui/ui-scroll.git",
   "license": "MIT",

dist/ui-scroll-grid.js

@@ -1,7 +1,7 @@
 {
   "name": "angular-ui-scroll",
   "description": "AngularJS infinite scrolling module",
-  "version": "1.6.1",
+  "version": "1.6.2",
   "src": "./src/",
   "public": "./dist/",
   "main": "./dist/ui-scroll.js",

dist/ui-scroll-grid.js.map

@@ -183,7 +183,8 @@ angular.module('ui.scroll.grid', [])
           return; // throw an error?
         }
 
-        let mapTo = selected.mapTo, next = null;
+        let mapTo = selected.mapTo,
+          next = null;
         index -= mapTo < index ? 1 : 0;
 
         columns.forEach(c => {

dist/ui-scroll-grid.min.js

@@ -395,4 +395,30 @@ describe('uiScroll', function () {
 
 	});
 
+	describe('scopes wrapping', function () {
+		var scrollSettings = {
+			datasource: 'myGridDatasource',
+			viewportHeight: 120,
+			itemHeight: 20,
+			bufferSize: 3,
+			rowTemplate: '<td ng-repeat="col in columns" ui-scroll-td class="{{col}}">{{item[col]}}</td>'
+		};
+		var columns = ['col0', 'col1', 'col2', 'col3'];
+
+		it('should work', function () {
+			runGridTest(scrollSettings,
+				function(head, body) {
+					for(var i = 0; i < columns.length; i++) {
+						expect(getLastRowElement(body, i).innerHTML).toBe(columns[i]);
+					}
+				},
+				{
+					scope: {
+						columns: columns
+					}
+				}
+			);
+		});
+	});
+
 });

dist/ui-scroll-grid.min.js.map

@@ -27,15 +27,19 @@ function createGridHtml (settings) {
 			'<thead style="display:block">' +
 				'<tr>';
 	columns.forEach(col => { html +=
-					'<th ui-scroll-th class="' + col + '">' + col + '</th>'
+					'<th ui-scroll-th class="' + col + '">' + col + '</th>';
 	}); html +=
 				'</tr>' +
 			'</thead>' +
 			'<tbody class="grid">' +
 				'<tr ui-scroll="item in ' + settings.datasource + '" adapter="adapter">';
-	columns.forEach(col => { html +=
-					'<td ui-scroll-td class="' + col + '">{{item.' + col + '}}</td>'
-	}); html +=
+				if(settings.rowTemplate) {
+					html += settings.rowTemplate;
+				} else {
+					columns.forEach(col => { html +=
+						'<td ui-scroll-td class="' + col + '">{{item.' + col + '}}</td>';
+					});
+				} html +=
 				'</tr>' +
 			'</tbody>' +
 		'</table>';
@@ -85,6 +89,10 @@ function runGridTest (scrollSettings, run, options) {
 		var head = angular.element(scroller.children()[0]);
 		var body = angular.element(scroller.children()[1]);
 
+		if(options && options.scope) {
+			angular.extend(scope, options.scope);
+		}
+
 		$compile(scroller)(scope);
 
 		scope.$apply();