diff --git a/src/templates/ui-grid/ui-grid-header.html b/src/templates/ui-grid/ui-grid-header.html index 78b80b4d03..9530ebd05c 100644 --- a/src/templates/ui-grid/ui-grid-header.html +++ b/src/templates/ui-grid/ui-grid-header.html @@ -4,11 +4,11 @@
-
+
- \ No newline at end of file + diff --git a/src/templates/ui-grid/ui-grid-row.html b/src/templates/ui-grid/ui-grid-row.html index 88d6a37814..cb69469ced 100644 --- a/src/templates/ui-grid/ui-grid-row.html +++ b/src/templates/ui-grid/ui-grid-row.html @@ -1,2 +1 @@ -
- \ No newline at end of file +
diff --git a/test/unit/core/directives/uiGridCell.spec.js b/test/unit/core/directives/uiGridCell.spec.js index 4d8d10f2f0..886e2dca4a 100644 --- a/test/unit/core/directives/uiGridCell.spec.js +++ b/test/unit/core/directives/uiGridCell.spec.js @@ -60,7 +60,7 @@ describe('uiGridCell', function () { recompile(); var displayHtml = gridCell.html(); expect(gridCell.hasClass('funcCellClass')).toBe(true); - + $scope.col.noClass = true; $scope.grid.api.core.notifyDataChange( uiGridConstants.dataChange.COLUMN ); expect(gridCell.hasClass('funcCellClass')).toBe(false); @@ -80,18 +80,17 @@ describe('uiGridCell', function () { recompile(); var displayHtml = gridCell.html(); expect(gridCell.hasClass('funcCellClass')).toBe(true); - + $scope.col = new GridColumn({name: 'col2'}, 0, $scope.grid); $scope.$digest(); expect(gridCell.hasClass('funcCellClass')).toBe(false); })); */ }); - + // Don't run this on IE9. The behavior looks correct when testing interactively but these tests fail -/* not a valid test.....we think if (!navigator.userAgent.match(/MSIE\s+9\.0/)) { - it("should change a column's class when its uid changes", inject(function (gridUtil, $compile, uiGridConstants) { + iit("should change a column's class when its uid changes", inject(function (gridUtil, $compile, uiGridConstants) { // Reset the UIDs (used by columns) so they're fresh and clean gridUtil.resetUids(); @@ -146,5 +145,5 @@ describe('uiGridCell', function () { angular.element(gridElm).remove(); })); } -*/ -}); \ No newline at end of file + +});