DOMUI Prefs: Replace search engine edit overlay with inline editing.

chrome/browser/resources/options/search_engine_manager_engine_list.js

Index: chrome/browser/resources/options/search_engine_manager_engine_list.js
diff --git a/chrome/browser/resources/options/search_engine_manager_engine_list.js b/chrome/browser/resources/options/search_engine_manager_engine_list.js
index 1e7d93e3b785b04805604310c19d3b722910b1d3..3eb0c3c98166d27141de203b8745981fcfe6a544 100644
--- a/chrome/browser/resources/options/search_engine_manager_engine_list.js
+++ b/chrome/browser/resources/options/search_engine_manager_engine_list.js
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 cr.define('options.search_engines', function() {
-  const DeletableItem = options.DeletableItem;
-  const DeletableItemList = options.DeletableItemList;
+  const InlineEditableItemList = options.InlineEditableItemList;
+  const InlineEditableItem = options.InlineEditableItem;
   const ListInlineHeaderSelectionController =
       options.ListInlineHeaderSelectionController;
 
@@ -31,46 +31,270 @@ cr.define('options.search_engines', function() {
   };
 
   SearchEngineListItem.prototype = {
-    __proto__: DeletableItem.prototype,
+    __proto__: InlineEditableItem.prototype,
+
+    /**
+     * Input field for editing the engine name.
+     * @type {HTMLElement}
+     * @private
+     */
+    nameField_: null,
+
+    /**
+     * Input field for editing the engine keyword.
+     * @type {HTMLElement}
+     * @private
+     */
+    keywordField_: null,
+
+    /**
+     * Input field for editing the engine url.
+     * @type {HTMLElement}
+     * @private
+     */
+    urlField_: null,
+
+    /**
+     * Whether or not this is a placeholder for adding an engine.
+     * @type {boolean}
+     * @private
+     */
+    isPlaceholder_: false,
+
+    /**
+     * Whether or not an input validation request is currently outstanding.
+     * @type {boolean}
+     * @private
+     */
+    waitingForValidation_: false,
+
+    /**
+     * Whether or not the current set of input is known to be valid.
+     * @type {boolean}
+     * @private
+     */
+    currentlyValid_: false,
 
     /** @inheritDoc */
     decorate: function() {
-      DeletableItem.prototype.decorate.call(this);
+      InlineEditableItem.prototype.decorate.call(this);
 
       var engine = this.searchEngine_;
 
-      if (engine['heading'])
+      if (engine['modelIndex'] == '-1') {
+        this.isPlaceholder_ = true;
+        engine['name'] = '';
+        engine['keyword'] = '';
+        engine['url'] = '';
+      }
+
+      this.currentlyValid_ = !this.isPlaceholder_;
+
+      if (engine['heading']) {
         this.classList.add('heading');
-      else if (engine['default'])
+        this.editable = false;
+      } else if (engine['default']) {
         this.classList.add('default');
+      }
 
       this.deletable = engine['canBeRemoved'];
 
-      var nameEl = this.ownerDocument.createElement('div');
-      nameEl.className = 'name';
+      var nameText = engine['name'];
+      var keywordText = engine['keyword'];
+      var urlText = engine['url'];
       if (engine['heading']) {
-        nameEl.textContent = engine['heading'];
-      } else {
-        nameEl.textContent = engine['name'];
-        nameEl.classList.add('favicon-cell');
-        nameEl.style.backgroundImage = url('chrome://favicon/iconurl/' +
-                                           engine['iconURL']);
+        nameText = engine['heading'];
+        keywordText = localStrings.getString('searchEngineTableKeywordHeader');
+        urlText = localStrings.getString('searchEngineTableURLHeader');
+      }
+
+      // Construct the name column.
+      var nameColEl = this.ownerDocument.createElement('div');
+      nameColEl.className = 'name-column';
+      this.contentElement.appendChild(nameColEl);
+
+      // For non-heading rows, start with a favicon.
+      if (!engine['heading']) {
+        var faviconDivEl = this.ownerDocument.createElement('div');
+        faviconDivEl.className = 'favicon';
+        var imgEl = this.ownerDocument.createElement('img');
+        imgEl.src = 'chrome://favicon/iconurl/' + engine['iconURL'];
+        faviconDivEl.appendChild(imgEl);
+        nameColEl.appendChild(faviconDivEl);
       }
-      this.contentElement.appendChild(nameEl);
 
-      var keywordEl = this.ownerDocument.createElement('div');
-      keywordEl.className = 'keyword';
-      keywordEl.textContent = engine['heading'] ?
-          localStrings.getString('searchEngineTableKeywordHeader') :
-          engine['keyword'];
+      var nameEl = this.createEditableTextCell_(nameText);
+      nameColEl.appendChild(nameEl);
+
+      // Then the keyword column.
+      var keywordEl = this.createEditableTextCell_(keywordText);
+      keywordEl.className = 'keyword-column';
       this.contentElement.appendChild(keywordEl);
+
+      // And the URL column.
+      var urlEl = this.createEditableTextCell_(urlText);
+      urlEl.className = 'url-column';
+      this.contentElement.appendChild(urlEl);
+
+      // Finally, do final adjustment to the input fields.
+      if (!engine['heading']) {
+        this.nameField_ = nameEl.querySelector('input');
+        this.keywordField_ = keywordEl.querySelector('input');
+        this.urlField_ = urlEl.querySelector('input');
+
+        if (engine['urlLocked'])
+          this.urlField_.disabled = true;
+
+        if (this.isPlaceholder_) {
+          this.nameField_.placeholder =
+              localStrings.getString('searchEngineTableNamePlaceholder');
+          this.keywordField_.placeholder =
+              localStrings.getString('searchEngineTableKeywordPlaceholder');
+          this.urlField_.placeholder =
+              localStrings.getString('searchEngineTableURLPlaceholder');
+        }
+
+        var fields = [ this.nameField_, this.keywordField_, this.urlField_ ];
+          for (var i = 0; i < fields.length; i++) {
+          fields[i].oninput = this.startFieldValidation_.bind(this);
+        }
+      }
+    },
+
+    /**
+     * Returns a div containing an <input>, as well as static text if needed.
+     * @param {string} text The text of the cell.
+     * @return {HTMLElement} The HTML element for the cell.
+     * @private
+     */
+    createEditableTextCell_: function(text) {
+      var container = this.ownerDocument.createElement('div');
+
+      if (!this.isPlaceholder_) {
+        var textEl = this.ownerDocument.createElement('div');
+        textEl.className = 'static-text';
+        textEl.textContent = text;
+        textEl.setAttribute('editmode', false);
+        container.appendChild(textEl);
+      }
+
+      var inputEl = this.ownerDocument.createElement('input');
+      inputEl.type = 'text';
+      inputEl.value = text;
+      if (!this.isPlaceholder_) {
+        inputEl.setAttribute('editmode', true);
+        inputEl.staticVersion = textEl;
+      }
+      container.appendChild(inputEl);
+
+      return container;
+    },
+
+    /** @inheritDoc */
+    initialFocusElement: function() {
+      return this.nameField_;
+    },
+
+    /** @inheritDoc */
+    currentInputIsValid: function() {
+      return (!this.waitingForValidation_ && this.currentlyValid_)

[Evan Stade, 2011/01/11 21:06:01]

no (), need trailing ;

[stuartmorgan, 2011/01/11 23:18:41]

Done.

+    },
+
+    /** @inheritDoc */
+    hasBeenEdited: function() {
+      var engine = this.searchEngine_;
+      return (this.nameField_.value != engine['name'] ||

[Evan Stade, 2011/01/11 21:06:01]

ditto

[stuartmorgan, 2011/01/11 23:18:41]

Done.

+              this.keywordField_.value != engine['keyword'] ||
+              this.urlField_.value != engine['url'])
+    },
+
+    /** @inheritDoc */
+    onEditStarted: function() {
+      var editIndex = this.searchEngine_['modelIndex']

[Evan Stade, 2011/01/11 21:06:01]

;

[stuartmorgan, 2011/01/11 23:18:41]

Done.

+      chrome.send('editSearchEngine', [String(editIndex)]);
+    },
+
+    /** @inheritDoc */
+    onEditCommitted: function() {
+      chrome.send('searchEngineEditCompleted', this.getInputFieldValues_());
+      // Update the static version immediately to prevent flickering before
+      // the model update callback updates the UI.
+      var editFields = [ this.nameField_, this.keywordField_, this.urlField_ ];
+      for (var i = 0; i < editFields.length; i++) {
+        var staticLabel = editFields[i].staticVersion;
+        if (staticLabel)
+          staticLabel.textContent = editFields[i].value;
+      }
+    },
+
+    /** @inheritDoc */
+    onEditCancelled: function() {
+      chrome.send('searchEngineEditCancelled');
+      var engine = this.searchEngine_;
+      this.nameField_.value = engine['name'];
+      this.keywordField_.value = engine['keyword'];
+      this.urlField_.value = engine['url'];
+
+      var editFields = [ this.nameField_, this.keywordField_, this.urlField_ ];
+      for (var i = 0; i < editFields.length; i++) {
+        editFields[i].classList.remove('invalid');
+      }
+      this.currentlyValid_ = !this.isPlaceholder_;
+    },
+
+    /**
+     * Returns the input field values as an array suitable for passing to
+     * chrome.send. The order of the array is important.
+     * @private
+     * @return {array} The current input field values.
+     */
+    getInputFieldValues_: function() {
+      return [ this.nameField_.value,
+               this.keywordField_.value,
+               this.urlField_.value ];
+    },
+
+    /**
+     * Begins the process of asynchronously validing the input fields.
+     * @private
+     */
+    startFieldValidation_: function() {
+      this.waitingForValidation_ = true;
+      var args = this.getInputFieldValues_();
+      args.push(this.searchEngine_['modelIndex']);
+      chrome.send('checkSearchEngineInfoValidity', args);
+    },
+
+    /**
+     * Callback for the completion of an input validition check.
+     * @param {Object} validity A dictionary of validitation results.
+     */
+    validationComplete: function(validity) {
+      this.waitingForValidation_ = false;
+      // TODO(stuartmorgan): Implement the full validation UI with
+      // checkmark/exclamation mark icons and tooltips.
+      if (validity['name'])
+        this.nameField_.classList.remove('invalid');
+      else
+        this.nameField_.classList.add('invalid');

[Evan Stade, 2011/01/11 21:06:01]

nit: can you put a blank line after each else clause

[stuartmorgan, 2011/01/11 23:18:41]

Done.

+      if (validity['keyword'])
+        this.keywordField_.classList.remove('invalid');
+      else
+        this.keywordField_.classList.add('invalid');
+      if (validity['url'])
+        this.urlField_.classList.remove('invalid');
+      else
+        this.urlField_.classList.add('invalid');
+
+      this.currentlyValid_ = validity['name'] && validity['keyword'] &&
+          validity['url'];
     },
   };
 
   var SearchEngineList = cr.ui.define('list');
 
   SearchEngineList.prototype = {
-    __proto__: DeletableItemList.prototype,
+    __proto__: InlineEditableItemList.prototype,
 
     /** @inheritDoc */
     createItem: function(searchEngine) {
@@ -95,6 +319,20 @@ cr.define('options.search_engines', function() {
     canSelectIndex: function(index) {
       return !this.dataModel.item(index).hasOwnProperty('heading');
     },
+
+    /**
+     * Passes the results of an input validation check to the requesting row
+     * if it's still being edited.
+     * @param {number} modelIndex The model index of the item that was checked.
+     * @param {Object} validity A dictionary of validitation results.
+     */
+    validationComplete: function(validity, modelIndex) {
+      // If it's not still being edited, it no longer matters.
+      var currentSelection = this.selectedItem;
+      var listItem = this.getListItem(currentSelection);
+      if (listItem.editing && currentSelection['modelIndex'] == modelIndex)
+        listItem.validationComplete(validity);
+    },
   };
 
   // Export