Merge branch 'master' of github.com:ExactTarget/fuelux into gruntTask…

…s-make-modules Conflicts: Gruntfile.js
ExactTarget · Aug 18, 2015 · eea13a6 · eea13a6
2 parents addb76b + baacc5c
commit eea13a6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/js/repeater-list.js b/js/repeater-list.js
@@ -538,7 +538,7 @@
 			$col.html(checkBoxMarkup);
 		}
 
-		if (this.viewOptions.list_columnRendered) {
+		if (!(columns[columnIndex].property === '@_CHECKBOX_@' || columns[columnIndex].property === '@_ACTIONS_@') && this.viewOptions.list_columnRendered) {
 			this.viewOptions.list_columnRendered({
 				container: $row,
 				columnAttr: columns[columnIndex].property,

diff --git a/js/repeater.js b/js/repeater.js
@@ -325,8 +325,8 @@
 		},
 
 		infiniteScrolling: function (enable, options) {
-			var itemization = this.$element.find('.repeater-itemization');
-			var pagination = this.$element.find('.repeater-pagination');
+			var footer = this.$element.find('.repeater-footer');
+			var viewport = this.$element.find('.repeater-viewport');
 			var cont, data;
 
 			options = options || {};
@@ -337,8 +337,10 @@
 				delete options.dataSource;
 				delete options.end;
 				this.infiniteScrollingOptions = options;
-				itemization.hide();
-				pagination.hide();
+				viewport.css({
+					height: viewport.height() + footer.outerHeight()
+				});
+				footer.hide();
 			} else {
 				cont = this.infiniteScrollingCont;
 				data = cont.data();
@@ -350,8 +352,10 @@
 				this.infiniteScrollingEnabled = false;
 				this.infiniteScrollingEnd = null;
 				this.infiniteScrollingOptions = {};
-				itemization.show();
-				pagination.show();
+				viewport.css({
+					height: viewport.height() - footer.outerHeight()
+				});
+				footer.show();
 			}
 		},