fix(taBind.keyevents): Attempted fix for polish character issues

Fixes #518
textAngular · Apr 1, 2015 · 26226dd · 26226dd
1 parent b2c7886
commit 26226dd
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/dist/textAngular.min.js b/dist/textAngular.min.js
diff --git a/lib/taBind.js b/lib/taBind.js
@@ -460,9 +460,8 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 						/* istanbul ignore else: this is for catching the jqLite testing*/
 						if(eventData) angular.extend(event, eventData);
 						/* istanbul ignore else: readonly check */
-						var ctrlKey = event.keyCode === 17; /* bugFix: in Polish Programmer keyboard event.ctrlKey === true when altKey is pressed */
 						if(!_isReadonly){
-							if(!event.altKey && event.metaKey || ctrlKey){
+							if(!event.altKey && (event.metaKey || event.ctrlKey)){
 								// covers ctrl/command + z
 								if((event.keyCode === 90 && !event.shiftKey)){
 									_undo();

diff --git a/src/textAngular.js b/src/textAngular.js
@@ -1444,7 +1444,7 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
 						if(eventData) angular.extend(event, eventData);
 						/* istanbul ignore else: readonly check */
 						if(!_isReadonly){
-							if(!event.altKey && event.metaKey || event.ctrlKey){
+							if(!event.altKey && (event.metaKey || event.ctrlKey)){
 								// covers ctrl/command + z
 								if((event.keyCode === 90 && !event.shiftKey)){
 									_undo();

diff --git a/test/taBind/taBind.undoManager.spec.js b/test/taBind/taBind.undoManager.spec.js
@@ -214,16 +214,18 @@ describe('taBind.undoManager', function () {
 				expect($rootScope.html).toBe(second);
 			}));
 
-			it('not alt+z', inject(function($timeout){
+			it('not alt+ctrl+z #518', inject(function($timeout){
 				if(angular.element === jQuery) {
 					event = jQuery.Event('keydown');
 					event.keyCode = 90;
 					event.altKey = true;
+					event.ctrlKey = true;
 					element.triggerHandler(event);
 				}else{
 					event = {
 						keyCode: 90,
-						altKey: true
+						altKey: true,
+						ctrlKey: true
 					};
 					element.triggerHandler('keydown', event);
 				}