Merge pull request #5473 from oostmeijer/master

dlgski · web-flow · commit 5d17f2b2b86b · 2016-09-20T14:26:25.000-04:00
fix for error when element doesn't have the select function
diff --git a/src/features/edit/js/gridEdit.js b/src/features/edit/js/gridEdit.js
@@ -936,7 +936,7 @@
                   $timeout(function () {
                     $elm[0].focus();
                     //only select text if it is not being replaced below in the cellNav viewPortKeyPress
-                    if ($elm[0].select && $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
`@@ -936,7 +936,7 @@`
`936`	`936`	`$timeout(function () {`
`937`	`937`	`$elm[0].focus();`
`938`	`938`	`//only select text if it is not being replaced below in the cellNav viewPortKeyPress`
`939`		`- if ($elm[0].select && $scope.col.colDef.enableCellEditOnFocus \|\| !(uiGridCtrl && uiGridCtrl.grid.api.cellNav)) {`
	`939`	`+ if ($elm[0].select && ($scope.col.colDef.enableCellEditOnFocus \|\| !(uiGridCtrl && uiGridCtrl.grid.api.cellNav))) {`
`940`	`940`	`$elm[0].select();`
`941`	`941`	`}`
`942`	`942`	`else {`