Merge pull request angular-ui#778 from kolesnik/master

Update column.js
jan-molak · Oct 15, 2013 · 2af8f37 · 2af8f37
2 parents b0b6141 + 90ccbff
commit 2af8f37
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/classes/column.js b/src/classes/column.js
@@ -50,7 +50,7 @@
     self.headerCellTemplate = colDef.headerCellTemplate || $templateCache.get('headerCellTemplate.html');
     self.cellTemplate = colDef.cellTemplate || $templateCache.get('cellTemplate.html').replace(CUSTOM_FILTERS, self.cellFilter ? "|" + self.cellFilter : "");
     if(self.enableCellEdit) {
-        self.cellEditTemplate = $templateCache.get('cellEditTemplate.html');
+        self.cellEditTemplate = colDef.cellEditTemplate || $templateCache.get('cellEditTemplate.html');
         self.editableCellTemplate = colDef.editableCellTemplate || $templateCache.get('editableCellTemplate.html');
     }
     if (colDef.cellTemplate && !TEMPLATE_REGEXP.test(colDef.cellTemplate)) {