Merge pull request #5045 from tomgutz/master

swalters · swalters · commit 62683332fea0 · 2016-02-04T09:48:23.000-06:00
fix(edit): Error on opening custom cell editor who's first element has no select method
diff --git a/src/features/edit/js/gridEdit.js b/src/features/edit/js/gridEdit.js
@@ -935,7 +935,7 @@
                   $timeout(function () {
                     $elm[0].focus();
                     //only select text if it is not being replaced below in the cellNav viewPortKeyPress
-                    if ($scope.col.colDef.enableCellEditOnFocus || !(uiGridCtrl && uiGridCtrl.grid.api.cellNav)) {
+                    if ($elm[0].select && $scope.col.colDef.enableCellEditOnFocus || !(uiGridCtrl && uiGridCtrl.grid.api.cellNav)) {
                       $elm[0].select();
                     }
                     else {

Original file line number	Diff line number	Diff line change
`@@ -935,7 +935,7 @@`
`935`	`935`	`$timeout(function () {`
`936`	`936`	`$elm[0].focus();`
`937`	`937`	`//only select text if it is not being replaced below in the cellNav viewPortKeyPress`
`938`		`- if ($scope.col.colDef.enableCellEditOnFocus \|\| !(uiGridCtrl && uiGridCtrl.grid.api.cellNav)) {`
	`938`	`+ if ($elm[0].select && $scope.col.colDef.enableCellEditOnFocus \|\| !(uiGridCtrl && uiGridCtrl.grid.api.cellNav)) {`
`939`	`939`	`$elm[0].select();`
`940`	`940`	`}`
`941`	`941`	`else {`