Fix(gridFactory): cellTemplate must be undefined until properly retri…

…eved
jpuri · Dec 2, 2014 · 26358fc · 26358fc
1 parent f353c06
commit 26358fc
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 14 deletions.
diff --git a/src/js/core/services/gridClassFactory.js b/src/js/core/services/gridClassFactory.js
@@ -110,9 +110,9 @@
            *
            */
           if (!colDef.headerCellTemplate) {
-            col.headerCellTemplate = 'ui-grid/uiGridHeaderCell';
+            col.providedHeaderCellTemplate = 'ui-grid/uiGridHeaderCell';
           } else {
-            col.headerCellTemplate = colDef.headerCellTemplate;
+            col.providedHeaderCellTemplate = colDef.headerCellTemplate;
           }
 
           /**
@@ -125,12 +125,12 @@
            *
            */
           if (!colDef.cellTemplate) {
-            col.cellTemplate = 'ui-grid/uiGridCell';
+            col.providedCellTemplate = 'ui-grid/uiGridCell';
           } else {
-            col.cellTemplate = colDef.cellTemplate;
+            col.providedCellTemplate = colDef.cellTemplate;
           }
 
-          col.cellTemplatePromise = gridUtil.getTemplate(col.cellTemplate);
+          col.cellTemplatePromise = gridUtil.getTemplate(col.providedCellTemplate);
           templateGetPromises.push(col.cellTemplatePromise
             .then(
               function (template) {
@@ -141,7 +141,7 @@
               })
           );
 
-          templateGetPromises.push(gridUtil.getTemplate(col.headerCellTemplate)
+          templateGetPromises.push(gridUtil.getTemplate(col.providedHeaderCellTemplate)
               .then(
               function (template) {
                 col.headerCellTemplate = template.replace(uiGridConstants.CUSTOM_FILTERS, col.headerCellFilter ? "|" + col.headerCellFilter : "");

diff --git a/test/unit/core/services/GridClassFactory.spec.js b/test/unit/core/services/GridClassFactory.spec.js
@@ -38,8 +38,8 @@ describe('gridClassFactory', function() {
 
       gridClassFactory.defaultColumnBuilder( testSetup.colDef, testSetup.col, testSetup.gridOptions );
 
-      expect(testSetup.col.headerCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
-      expect(testSetup.col.cellTemplate).toEqual('ui-grid/uiGridCell');
+      expect(testSetup.col.providedHeaderCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
+      expect(testSetup.col.providedCellTemplate).toEqual('ui-grid/uiGridCell');
 
       testSetup.$rootScope.$digest();
 
@@ -53,8 +53,8 @@ describe('gridClassFactory', function() {
 
       gridClassFactory.defaultColumnBuilder( testSetup.colDef, testSetup.col, testSetup.gridOptions );
 
-      expect(testSetup.col.headerCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
-      expect(testSetup.col.cellTemplate).toEqual('ui-grid/uiGridCell');
+      expect(testSetup.col.providedHeaderCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
+      expect(testSetup.col.providedCellTemplate).toEqual('ui-grid/uiGridCell');
 
       testSetup.$rootScope.$digest();
 
@@ -71,8 +71,8 @@ describe('gridClassFactory', function() {
 
       gridClassFactory.defaultColumnBuilder( testSetup.colDef, testSetup.col, testSetup.gridOptions );
 
-      expect(testSetup.col.headerCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
-      expect(testSetup.col.cellTemplate).toEqual('ui-grid/uiGridCell');
+      expect(testSetup.col.providedHeaderCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
+      expect(testSetup.col.providedCellTemplate).toEqual('ui-grid/uiGridCell');
 
       testSetup.$rootScope.$digest();
 
@@ -89,8 +89,12 @@ describe('gridClassFactory', function() {
 
       gridClassFactory.defaultColumnBuilder( testSetup.colDef, testSetup.col, testSetup.gridOptions );
 
-      expect(testSetup.col.headerCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
-      expect(testSetup.col.cellTemplate).toEqual('ui-grid/uiGridCell');
+      expect(testSetup.col.providedHeaderCellTemplate).toEqual('ui-grid/uiGridHeaderCell');
+      expect(testSetup.col.providedCellTemplate).toEqual('ui-grid/uiGridCell');
+
+      // the code appears to rely on cellTemplate being undefined until properly retrieved (i.e. we cannot
+      // just push 'ui-grid/uiGridCell' into here, then later replace it with the template body)
+      expect(testSetup.col.cellTemplate).toEqual(undefined);
 
       testSetup.$rootScope.$digest();