projects / platform / framework / web / crosswalk-tizen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 424afd3)
Assert key and code in keyup input event spec
authorKevin Sawicki <kevinsawicki@gmail.com>
Fri, 7 Oct 2016 21:57:31 +0000 (14:57 -0700)
committerKevin Sawicki <kevinsawicki@gmail.com>
Mon, 10 Oct 2016 16:35:44 +0000 (09:35 -0700)
atom/common/keyboard_util.h patch | blob | history
spec/fixtures/pages/onkeyup.html patch | blob | history
spec/webview-spec.js patch | blob | history

diff --git a/atom/common/keyboard_util.h b/atom/common/keyboard_util.h
index f16584b2bb0b5ab2cd1f37dcdc71b727c86ab11c..651cf6a92024cc06d7d0e044efda744e70848479 100644 (file)
--- a/atom/common/keyboard_util.h
+++ b/atom/common/keyboard_util.h
@@ -15,6 +15,7 @@ namespace atom {
 // pressed.
 ui::KeyboardCode KeyboardCodeFromStr(const std::string& str, bool* shifted);
 
+// Ported from ui/events/blink/blink_event_util.h
 int WebEventModifiersToEventFlags(int modifiers);
 
 }  // namespace atom
diff --git a/spec/fixtures/pages/onkeyup.html b/spec/fixtures/pages/onkeyup.html
index 4e75dbb1e4ac5759fe556008e5167f1e134dc440..0ff0f3d449cf6ca40e1a3dd6bceaacf277e85e9f 100644 (file)
--- a/spec/fixtures/pages/onkeyup.html
+++ b/spec/fixtures/pages/onkeyup.html
@@ -2,7 +2,7 @@
 <body>
 <script type="text/javascript" charset="utf-8">
 document.onkeyup = function(e) {
-  require('electron').ipcRenderer.sendToHost('keyup', e.keyCode, e.shiftKey, e.ctrlKey);
+  require('electron').ipcRenderer.sendToHost('keyup', e.key, e.code, e.keyCode, e.shiftKey, e.ctrlKey);
 }
 </script>
 </body>
diff --git a/spec/webview-spec.js b/spec/webview-spec.js
index 1eb14442adaa8af50b98cb97541927b589e19de5..1c49688adeb87f5b9373ea0f453eb5cea02c20a6 100644 (file)
--- a/spec/webview-spec.js
+++ b/spec/webview-spec.js
@@ -776,7 +776,7 @@ describe('<webview> tag', function () {
     it('can send keyboard event', function (done) {
       webview.addEventListener('ipc-message', function (e) {
         assert.equal(e.channel, 'keyup')
-        assert.deepEqual(e.args, [67, true, false])
+        assert.deepEqual(e.args, ['C', 'KeyC', 67, true, false])
         done()
       })
       webview.addEventListener('dom-ready', function () {
Domain: Web Framework / Web Runtime;