@@ -277,25 +277,25 @@ Utils.type = function(doc, element, text, opt_useNativeEvents, jsTimer, releaseM
277
277
if ( controlKey ) {
278
278
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_CONTROL ;
279
279
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
280
- controlKey = false , shiftKey , altKey , metaKey , false ) ;
280
+ controlKey = false , shiftKey , altKey , metaKey ) ;
281
281
}
282
282
283
283
if ( shiftKey ) {
284
284
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_SHIFT ;
285
285
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
286
- controlKey , shiftKey = false , altKey , metaKey , false ) ;
286
+ controlKey , shiftKey = false , altKey , metaKey ) ;
287
287
}
288
288
289
289
if ( altKey ) {
290
290
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_ALT ;
291
291
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
292
- controlKey , shiftKey , altKey = false , metaKey , false ) ;
292
+ controlKey , shiftKey , altKey = false , metaKey ) ;
293
293
}
294
294
295
295
if ( metaKey ) {
296
296
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_META ;
297
297
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
298
- controlKey , shiftKey , altKey , metaKey = false , false ) ;
298
+ controlKey , shiftKey , altKey , metaKey = false ) ;
299
299
}
300
300
301
301
continue ;
@@ -475,7 +475,7 @@ Utils.type = function(doc, element, text, opt_useNativeEvents, jsTimer, releaseM
475
475
476
476
if ( modifierEvent ) {
477
477
Utils . keyEvent ( doc , element , modifierEvent , keyCode , 0 ,
478
- controlKey , shiftKey , altKey , metaKey , false ) ;
478
+ controlKey , shiftKey , altKey , metaKey ) ;
479
479
continue ;
480
480
}
481
481
@@ -489,7 +489,7 @@ Utils.type = function(doc, element, text, opt_useNativeEvents, jsTimer, releaseM
489
489
if ( needsShift && ! shiftKey ) {
490
490
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_SHIFT ;
491
491
Utils . keyEvent ( doc , element , 'keydown' , kCode , 0 ,
492
- controlKey , true , altKey , metaKey , false ) ;
492
+ controlKey , true , altKey , metaKey ) ;
493
493
Utils . shiftCount += 1 ;
494
494
}
495
495
@@ -509,7 +509,7 @@ Utils.type = function(doc, element, text, opt_useNativeEvents, jsTimer, releaseM
509
509
var mapTo = '~!@#$%^&*()_+{}|:"<>?' ;
510
510
511
511
var value = String . fromCharCode ( charCode ) .
512
- replace ( / ( [ \[ \\ \. ] ) / g, '\\$1' ) ;
512
+ replace ( / ( [ \[ \\ \. ] ) / g, '\\$1' ) ;
513
513
var index = mapFrom . search ( value ) ;
514
514
if ( index >= 0 ) {
515
515
charCode = mapTo . charCodeAt ( index ) ;
@@ -519,21 +519,23 @@ Utils.type = function(doc, element, text, opt_useNativeEvents, jsTimer, releaseM
519
519
}
520
520
521
521
var accepted =
522
- Utils . keyEvent ( doc , element , 'keydown' , keyCode , 0 ,
523
- controlKey , needsShift || shiftKey , altKey , metaKey , false ) ;
522
+ Utils . keyEvent ( doc , element , 'keydown' , keyCode , 0 ,
523
+ controlKey , needsShift || shiftKey , altKey , metaKey ) ;
524
524
525
- Utils . keyEvent ( doc , element , 'keypress' , pressCode , charCode ,
526
- controlKey , needsShift || shiftKey , altKey , metaKey , ! accepted ) ;
525
+ if ( accepted ) {
526
+ Utils . keyEvent ( doc , element , 'keypress' , pressCode , charCode ,
527
+ controlKey , needsShift || shiftKey , altKey , metaKey ) ;
528
+ }
527
529
528
530
Utils . keyEvent ( doc , element , 'keyup' , keyCode , 0 ,
529
- controlKey , needsShift || shiftKey , altKey , metaKey , false ) ;
531
+ controlKey , needsShift || shiftKey , altKey , metaKey ) ;
530
532
531
533
// shift up if needed
532
534
533
535
if ( needsShift && ! shiftKey ) {
534
536
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_SHIFT ;
535
537
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
536
- controlKey , false , altKey , metaKey , false ) ;
538
+ controlKey , false , altKey , metaKey ) ;
537
539
}
538
540
}
539
541
@@ -542,25 +544,25 @@ Utils.type = function(doc, element, text, opt_useNativeEvents, jsTimer, releaseM
542
544
if ( controlKey && releaseModifiers ) {
543
545
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_CONTROL ;
544
546
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
545
- controlKey = false , shiftKey , altKey , metaKey , false ) ;
547
+ controlKey = false , shiftKey , altKey , metaKey ) ;
546
548
}
547
549
548
550
if ( shiftKey && releaseModifiers ) {
549
551
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_SHIFT ;
550
552
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
551
- controlKey , shiftKey = false , altKey , metaKey , false ) ;
553
+ controlKey , shiftKey = false , altKey , metaKey ) ;
552
554
}
553
555
554
556
if ( altKey && releaseModifiers ) {
555
557
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_ALT ;
556
558
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
557
- controlKey , shiftKey , altKey = false , metaKey , false ) ;
559
+ controlKey , shiftKey , altKey = false , metaKey ) ;
558
560
}
559
561
560
562
if ( metaKey && releaseModifiers ) {
561
563
var kCode = Components . interfaces . nsIDOMKeyEvent . DOM_VK_META ;
562
564
Utils . keyEvent ( doc , element , 'keyup' , kCode , 0 ,
563
- controlKey , shiftKey , altKey , metaKey = false , false ) ;
565
+ controlKey , shiftKey , altKey , metaKey = false ) ;
564
566
}
565
567
566
568
if ( opt_keysState ) {
@@ -573,8 +575,7 @@ Utils.type = function(doc, element, text, opt_useNativeEvents, jsTimer, releaseM
573
575
574
576
575
577
Utils . keyEvent = function ( doc , element , type , keyCode , charCode ,
576
- controlState , shiftState , altState , metaState ,
577
- shouldPreventDefault ) {
578
+ controlState , shiftState , altState , metaState ) {
578
579
// Silently bail out if the element is no longer attached to the DOM.
579
580
var isAttachedToDom = goog . dom . getAncestor ( element , function ( node ) {
580
581
return node === element . ownerDocument . documentElement ;
@@ -602,12 +603,7 @@ Utils.keyEvent = function(doc, element, type, keyCode, charCode,
602
603
modifiers += windowUtils . MODIFIER_META ;
603
604
}
604
605
605
- var additionalFlags = 0 ;
606
- if ( shouldPreventDefault ) {
607
- additionalFlags += windowUtils . KEY_FLAG_PREVENT_DEFAULT ;
608
- }
609
-
610
- return windowUtils . sendKeyEvent ( type , keyCode , charCode , modifiers , additionalFlags ) ;
606
+ return windowUtils . sendKeyEvent ( type , keyCode , charCode , modifiers , 0 ) ;
611
607
} ;
612
608
613
609
0 commit comments