Index: remoting/tools/javascript_key_tester/event_listeners.js |
diff --git a/remoting/tools/javascript_key_tester/event_listeners.js b/remoting/tools/javascript_key_tester/event_listeners.js |
index 164777cd30afdb6a55207bccbf6c8224e44316be..e0cc974badf79f7ceda437c0603fe4a1764af6ff 100644 |
--- a/remoting/tools/javascript_key_tester/event_listeners.js |
+++ b/remoting/tools/javascript_key_tester/event_listeners.js |
@@ -100,8 +100,8 @@ EventListeners.prototype.onKeyPress_ = function(event) { |
EventListeners.prototype.onMessage_ = function (event) { |
var pnaclEvent = /** @type {PNaClEvent} */ (event['data']); |
- this.appendToTextLog_(this.jsonifyPnaclKeyboardInputEvent_(pnaclEvent)); |
- var title = this.jsonifyPnaclKeyboardInputEvent_(pnaclEvent, 2); |
+ this.appendToTextLog_(this.jsonifyPnaclInputEvent_(pnaclEvent)); |
+ var title = this.jsonifyPnaclInputEvent_(pnaclEvent, 2); |
if (pnaclEvent.type == "KEYDOWN") { |
this.pnaclChordTracker_.addKeyDownEvent(pnaclEvent.code, title); |
} |
@@ -159,10 +159,13 @@ EventListeners.prototype.jsonifyJavascriptKeyEvent_ = |
* @return {string} |
* @private |
*/ |
-EventListeners.prototype.jsonifyPnaclKeyboardInputEvent_ = |
+EventListeners.prototype.jsonifyPnaclInputEvent_ = |
function(event, opt_space) { |
- return "PNaCl KeyboardInputEvent = " + JSON.stringify( |
+ return "PNaCl InputEvent = " + JSON.stringify( |
event, |
- ['type', 'modifiers', 'keyCode', 'characterText', 'code'], |
+ ['type', |
+ 'modifiers', 'keyCode', 'characterText', 'code', |
+ 'button', 'position', 'clickcount', 'movement', |
+ 'delta', 'ticks', 'scrollByPage' ], |
opt_space); |
}; |