From cc354660b5b9b597adfe87eaaadd579c5ef75f39 Mon Sep 17 00:00:00 2001 From: Rudy Lu Date: Fri, 13 Jun 2014 18:11:57 +0800 Subject: [PATCH] Merge pull request #20485 from RudyLu/keyboard/Bug1013739-persistent_alternativeMenu_master Bug 1013739 - [Dolphin][Flame][FFOS 1.4]Long touch the build-in keyboard r=timdream --- apps/keyboard/js/keyboard.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/keyboard/js/keyboard.js b/apps/keyboard/js/keyboard.js index f9a2d313cbf8..83bb08485f59 100644 --- a/apps/keyboard/js/keyboard.js +++ b/apps/keyboard/js/keyboard.js @@ -1590,6 +1590,8 @@ function hideKeyboard() { settingsPromiseManager.set({ 'keyboard.current': undefined }); + + clearTouchedKeys(); } // Resize event handler @@ -1757,6 +1759,11 @@ function clearTouchedKeys() { hideAlternatives(); touchedKeys = {}; + + // Reset all the pending actions here. + clearTimeout(deleteTimeout); + clearInterval(deleteInterval); + clearTimeout(menuTimeout); } // Hide the keyboard via input method API