Merge pull request #20438 from RudyLu/keyboard/Bug1013739-persistent_…

…alternativeMenu Keyboard/bug1013739 persistent alternative menu
mozilla-b2g · Jun 13, 2014 · 164644d · 164644d
2 parents 01086cb + 5aec190
commit 164644d
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/apps/keyboard/js/keyboard.js b/apps/keyboard/js/keyboard.js
@@ -1742,6 +1742,8 @@ function hideKeyboard() {
   navigator.mozSettings.createLock().set({
     'keyboard.current': undefined
   });
+
+  clearTouchedKeys();
 }
 
 // Resize event handler
@@ -1972,6 +1974,11 @@ function clearTouchedKeys() {
 
   hideAlternatives();
   touchedKeys = {};
+
+  // Reset all the pending actions here.
+  clearTimeout(deleteTimeout);
+  clearInterval(deleteInterval);
+  clearTimeout(menuTimeout);
 }
 /*
  * This is a helper to scroll the keyboard layout menu when the touch moves near