Bug 909706 - Keyboard manager must wait for applicationready to enume…

…rate all keyboard apps

apps/system/index.html

@@ -20,7 +20,8 @@
     <script defer src="shared/js/mime_mapper.js"></script>
     <script defer src="shared/js/settings_url.js"></script>
     <script defer src="shared/js/advanced_timer.js"></script>
-    <script defer src="shared/js/keyboard_helper.js"></script>
+    <script defer src="shared/js/lazy_loader.js"></script>
+    <!-- <script defer src="shared/js/keyboard_helper.js"></script> -->
 
     <!-- Wrapper -->
     <link rel="stylesheet" type="text/css" href="style/wrapper/wrapper.css">

apps/system/js/keyboard_manager.js

@@ -85,7 +85,6 @@ var KeyboardManager = {
     this.keyboardFrameContainer.classList.add('hide');
 
     // get enabled keyboard from mozSettings, parse their manifest
-    this.updateLayouts();
 
     // For Bug 812115: hide the keyboard when the app is closed here,
     // since it would take a longer round-trip to receive focuschange
@@ -495,4 +494,13 @@ var KeyboardManager = {
   }
 };
 
-KeyboardManager.init();
+if (Applications.ready) {
+  KeyboardManager.init();
+  LazyLoader.load('shared/js/keyboard_helper.js');
+} else {
+  window.addEventListener('applicationready', function mozAppsReady(event) {
+    window.removeEventListener('applicationready', mozAppsReady);
+    KeyboardManager.init();
+    LazyLoader.load('shared/js/keyboard_helper.js');
+  });
+}