Fix ISearch regressions

chrome/browser/resources/chromeos/chromevox/cvox2/background/panel.js

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview The ChromeVox panel and menus.
  */
 
 goog.provide('Panel');
 
@@ skipping 18 matching lines @@
  * @enum {string}
  */
 Panel.Mode = {
   COLLAPSED: 'collapsed',
   FOCUSED: 'focused',
   FULLSCREEN_MENUS: 'menus',
   FULLSCREEN_TUTORIAL: 'tutorial'
 };
 
 /**
+ * A callback function to be executed to perform the action from selecting
+ * a menu item after the menu has been closed and focus has been restored
+ * to the page or wherever it was previously.
+ * @param {?Function} callback
+ */
+Panel.setPendingCallback = function(callback) {
+  /** @type {?Function} @private */
+  Panel.pendingCallback_ = callback;
+};
+
+/**
  * Initialize the panel.
  */
 Panel.init = function() {
   /** @type {Element} @private */
   this.speechContainer_ = $('speech-container');
 
   /** @type {Element} @private */
   this.speechElement_ = $('speech');
 
   /** @type {Element} @private */
@@ skipping 28 matching lines @@
 
   /**
    * True if the menu button in the panel is enabled at all. It's disabled if
    * ChromeVox Next is not active.
    * @type {boolean}
    * @private
    */
   this.menusEnabled_ = localStorage['useNext'] == 'true';
 
   /**
-   * A callback function to be executed to perform the action from selecting
-   * a menu item after the menu has been closed and focus has been restored
-   * to the page or wherever it was previously.
-   * @type {?Function}
-   * @private
-   */
-  this.pendingCallback_ = null;
-
-  /**
    * True if we're currently in incremental search mode.
    * @type {boolean}
    * @private
    */
   this.searching_ = false;
 
   /**
    * @type {Tutorial}
    * @private
    */
   this.tutorial_ = new Tutorial();
 
+  Panel.setPendingCallback(null);
   Panel.updateFromPrefs();
 
   Msgs.addTranslatedMessagesToDom(document);
 
   window.addEventListener('storage', function(event) {
     if (event.key == 'brailleCaptions') {
       Panel.updateFromPrefs();
     }
   }, false);
 
@@ skipping 12 matching lines @@
   $('close_tutorial').addEventListener('click', Panel.onCloseTutorial, false);
 
   document.addEventListener('keydown', Panel.onKeyDown, false);
   document.addEventListener('mouseup', Panel.onMouseUp, false);
   window.addEventListener('blur', function(evt) {
     if (evt.target != window || document.activeElement == document.body)
       return;
 
     Panel.closeMenusAndRestoreFocus();
   }, false);
-
-  Panel.searchInput_.addEventListener('blur', Panel.onSearchInputBlur, false);
 };
 
 /**
  * Update the display based on prefs.
  */
 Panel.updateFromPrefs = function() {
   if (Panel.searching_) {
     this.speechContainer_.hidden = true;
     this.brailleContainer_.hidden = true;
     this.searchContainer_.hidden = false;
@@ skipping 273 matching lines @@
 };
 
 /** Open incremental search. */
 Panel.onSearch = function() {
   Panel.clearMenus();
   Panel.pendingCallback_ = null;
   Panel.searching_ = true;
   Panel.updateFromPrefs();
   Panel.setMode(Panel.Mode.FOCUSED);
 
-  ISearchUI.get(Panel.searchInput_);
+  ISearchUI.init(Panel.searchInput_);
 };
 
 /**
  * Clear any previous menus. The menus are all regenerated each time the
  * menus are opened.
  */
 Panel.clearMenus = function() {
   while (this.menus_.length) {
     var menu = this.menus_.pop();
     $('menu-bar').removeChild(menu.menuBarItemElement);
@@ skipping 300 matching lines @@
     default:
       // Don't mark this event as handled.
       return;
   }
 
   event.preventDefault();
   event.stopPropagation();
 };
 
 /**
- * Called when focus leaves the search input.
- */
-Panel.onSearchInputBlur = function() {
-  if (Panel.searching_) {
-    if (document.activeElement != Panel.searchInput_ || !document.hasFocus()) {
-      Panel.searching_ = false;
-      Panel.setMode(Panel.Mode.COLLAPSED);
-      Panel.updateFromPrefs();
-      Panel.searchInput_.value = '';
-    }
-  }
-};
-
-/**
  * Open the ChromeVox Options.
  */
 Panel.onOptions = function() {
   var bkgnd =
       chrome.extension.getBackgroundPage()['ChromeVoxState']['instance'];
   bkgnd['showOptionsPage']();
   Panel.setMode(Panel.Mode.COLLAPSED);
 };
 
 /**
@@ skipping 98 matching lines @@
 }, false);
 
 window.addEventListener('hashchange', function() {
   if (location.hash == '#fullscreen' || location.hash == '#focus') {
     this.originalStickyState_ = cvox.ChromeVox.isStickyPrefOn;
     cvox.ChromeVox.isStickyPrefOn = false;
   } else {
     cvox.ChromeVox.isStickyPrefOn = this.originalStickyState_;
   }
 }, false);