Merge branch 'master' into interpolation

Author: dhilt

dist/ui-scroll-grid.js

@@ -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.js.map

@@ -399,4 +399,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

@@ -25,15 +25,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>';
@@ -83,6 +87,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();