Merge pull request #17687 from RudyLu/keyboard/Bug984328

Bug 984328 - [Keyboard][V1.3T] The alternative char menu cannot be r=timdream
mozilla-b2g · Mar 27, 2014 · 6c3dc37 · 6c3dc37
2 parents 386f4ac + 1956499
commit 6c3dc37
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/apps/keyboard/js/render.js b/apps/keyboard/js/render.js
@@ -41,6 +41,9 @@ const IMERender = (function() {
     isSpecialKey = keyTest;
     ime = document.getElementById('keyboard');
     menu = document.getElementById('keyboard-accent-char-menu');
+
+    cachedWindowHeight = window.innerHeight;
+    cachedWindowWidth = window.innerWidth;
   };
 
   var setInputMethodName = function(name) {

diff --git a/apps/keyboard/test/unit/keyboard_test.js b/apps/keyboard/test/unit/keyboard_test.js
@@ -3,11 +3,13 @@
 suite('keyboard.js', function() {
 
   requireApp('keyboard/js/keyboard.js');
-  var mockMozInputMethod;
   var realMozInputMethod;
 
   suiteSetup(function() {
-    realMozInputMethod = window.navigator.mozInputMethod;
+    if ('mozInputMethod' in window.navigator) {
+      realMozInputMethod = window.navigator.mozInputMethod;
+    }
+
     window.navigator.mozInputMethod = {
       mgmt: {
         showAll: sinon.stub()
@@ -16,7 +18,11 @@ suite('keyboard.js', function() {
   });
 
   suiteTeardown(function() {
-    window.navigator.mozInputMethod = realMozInputMethod;
+    if (realMozInputMethod) {
+      window.navigator.mozInputMethod = realMozInputMethod;
+    } else {
+      delete window.navigator.mozInputMethod;
+    }
   });
 
   suite('clearTouchedKeys', function() {