Merge pull request #26987 from RudyLu/keyboard/Bug1100792-candidatePa…

…nelView

Bug 1100792 - Create CandidatePanelView component.
r=timdream.

apps/keyboard/index.html

@@ -16,10 +16,14 @@
   <script defer type="text/javascript" src="js/keyboard/layout_manager.js"></script>
   <script defer type="text/javascript" src="js/keyboard/layout_normalizer.js"></script>
   <script defer type="text/javascript" src="js/render.js"></script>
+  <script defer type="text/javascript" src="js/views/view_utils.js"></script>
+  <script defer type="text/javascript" src="js/views/base_view.js"></script>
   <script defer type="text/javascript" src="js/views/alternatives_char_menu_view.js"></script>
   <script defer type="text/javascript" src="js/views/handwriting_pad_view.js"></script>
   <script defer type="text/javascript" src="js/views/key_view.js"></script>
   <script defer type="text/javascript" src="js/views/layout_page_view.js"></script>
+  <script defer type="text/javascript" src="js/views/candidate_panel_view.js"></script>
+  <script defer type="text/javascript" src="js/views/latin_candidate_panel_view.js"></script>
   <script defer type="text/javascript" src="js/keyboard/console.js"></script>
   <script defer type="text/javascript" src="js/keyboard/input_method_manager.js"></script>
   <script defer type="text/javascript" src="js/keyboard/input_method_database_loader.js"></script>

apps/keyboard/js/keyboard/candidate_panel_manager.js

@@ -20,7 +20,9 @@ CandidatePanelScrollingMonitor.prototype.start = function() {
 CandidatePanelScrollingMonitor.prototype.stop = function() {
   clearTimeout(this.scrollTimer);
   if (IMERender.candidatePanel) {
-    IMERender.candidatePanel.removeEventListener('scroll', this);
+    var suggestionsContainer =
+      IMERender.candidatePanel.querySelector('.suggestions-container');
+    suggestionsContainer.removeEventListener('scroll', this);
   }
 };
 
@@ -45,13 +47,17 @@ CandidatePanelScrollingMonitor.prototype.startMonitoring = function() {
   // If the candidates list was not truncated,
   // we don't really need to monitor the scroll event.
   if ('truncated' in IMERender.candidatePanel.dataset) {
-    IMERender.candidatePanel.addEventListener('scroll', this);
+    var suggestionsContainer =
+      IMERender.candidatePanel.querySelector('.suggestions-container');
+    suggestionsContainer.addEventListener('scroll', this);
   }
 };
 
 CandidatePanelScrollingMonitor.prototype.stopMonitoring = function() {
   clearTimeout(this.scrollTimer);
-  IMERender.candidatePanel.removeEventListener('scroll', this);
+  var suggestionsContainer =
+    IMERender.candidatePanel.querySelector('.suggestions-container');
+  suggestionsContainer.removeEventListener('scroll', this);
 };
 
 var CandidatePanelManager = function(app) {

apps/keyboard/js/keyboard/layout_rendering_manager.js

@@ -138,11 +138,6 @@ LayoutRenderingManager.prototype.updateLayoutRendering = function() {
   // Make sure JS error is not sliently ignored.
   p.catch(function(e) { console.error(e); });
 
-  // Tell the renderer what input method we're using. This will set a CSS
-  // classname that can be used to style the keyboards differently
-  IMERender.setInputMethodName(
-    this.app.layoutManager.currentPage.imEngine || 'default');
-
   this.app.console.timeEnd('LayoutRenderingManager.updateLayoutRendering()');
 
   return p;