Skip to content

Commit 26226dd

Browse files
SimeonCSimeonC
SimeonC
authored and
SimeonC
committedApr 1, 2015
fix(taBind.keyevents): Attempted fix for polish character issues
Fixes #518
1 parent b2c7886 commit 26226dd

File tree

4 files changed

+7
-6
lines changed

4 files changed

+7
-6
lines changed
 

‎dist/textAngular.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/taBind.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -460,9 +460,8 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
460460
/* istanbul ignore else: this is for catching the jqLite testing*/
461461
if(eventData) angular.extend(event, eventData);
462462
/* istanbul ignore else: readonly check */
463-
var ctrlKey = event.keyCode === 17; /* bugFix: in Polish Programmer keyboard event.ctrlKey === true when altKey is pressed */
464463
if(!_isReadonly){
465-
if(!event.altKey && event.metaKey || ctrlKey){
464+
if(!event.altKey && (event.metaKey || event.ctrlKey)){
466465
// covers ctrl/command + z
467466
if((event.keyCode === 90 && !event.shiftKey)){
468467
_undo();

‎src/textAngular.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1444,7 +1444,7 @@ angular.module('textAngular.taBind', ['textAngular.factories', 'textAngular.DOM'
14441444
if(eventData) angular.extend(event, eventData);
14451445
/* istanbul ignore else: readonly check */
14461446
if(!_isReadonly){
1447-
if(!event.altKey && event.metaKey || event.ctrlKey){
1447+
if(!event.altKey && (event.metaKey || event.ctrlKey)){
14481448
// covers ctrl/command + z
14491449
if((event.keyCode === 90 && !event.shiftKey)){
14501450
_undo();

‎test/taBind/taBind.undoManager.spec.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -214,16 +214,18 @@ describe('taBind.undoManager', function () {
214214
expect($rootScope.html).toBe(second);
215215
}));
216216

217-
it('not alt+z', inject(function($timeout){
217+
it('not alt+ctrl+z #518', inject(function($timeout){
218218
if(angular.element === jQuery) {
219219
event = jQuery.Event('keydown');
220220
event.keyCode = 90;
221221
event.altKey = true;
222+
event.ctrlKey = true;
222223
element.triggerHandler(event);
223224
}else{
224225
event = {
225226
keyCode: 90,
226-
altKey: true
227+
altKey: true,
228+
ctrlKey: true
227229
};
228230
element.triggerHandler('keydown', event);
229231
}

0 commit comments

Comments
 (0)