Merge pull request #4590 from micahh2/master

swalters · swalters · commit 14b1f84a1585 · 2015-10-30T12:59:33.000-05:00
fix(edit): Change setViewValue to use a fromCharCode based on evt.which
diff --git a/src/features/edit/js/gridEdit.js b/src/features/edit/js/gridEdit.js
@@ -958,7 +958,7 @@
                   if (uiGridCtrl && uiGridCtrl.grid.api.cellNav) {
                     var viewPortKeyDownUnregister = uiGridCtrl.grid.api.cellNav.on.viewPortKeyPress($scope, function (evt, rowCol) {
                       if (uiGridEditService.isStartEditKey(evt)) {
-                        ngModel.$setViewValue(String.fromCharCode(evt.keyCode), evt);
+                        ngModel.$setViewValue(String.fromCharCode( typeof evt.which === 'number' ? evt.which : evt.keyCode), evt);
                         ngModel.$render();
                       }
                       viewPortKeyDownUnregister();

Original file line number	Diff line number	Diff line change
`@@ -958,7 +958,7 @@`
`958`	`958`	`if (uiGridCtrl && uiGridCtrl.grid.api.cellNav) {`
`959`	`959`	`var viewPortKeyDownUnregister = uiGridCtrl.grid.api.cellNav.on.viewPortKeyPress($scope, function (evt, rowCol) {`
`960`	`960`	`if (uiGridEditService.isStartEditKey(evt)) {`
`961`		`- ngModel.$setViewValue(String.fromCharCode(evt.keyCode), evt);`
	`961`	`+ ngModel.$setViewValue(String.fromCharCode( typeof evt.which === 'number' ? evt.which : evt.keyCode), evt);`
`962`	`962`	`ngModel.$render();`
`963`	`963`	`}`
`964`	`964`	`viewPortKeyDownUnregister();`