MD Settings: Internet: Clean up network and proxy sections.

chrome/browser/resources/settings/internet_page/network_nameservers.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 Polymer element for displaying network nameserver options.
  */
-(function() {
-'use strict';
-
 Polymer({
   is: 'network-nameservers',
 
   properties: {
     /**
      * The network properties dictionary containing the nameserver properties to
      * display and modify.
      * @type {!CrOnc.NetworkProperties|undefined}
      */
     networkProperties: {
       type: Object,
-      observer: 'networkPropertiesChanged_'
+      observer: 'networkPropertiesChanged_',
     },
 
     /**
      * Whether or not the nameservers can be edited.
      */
     editable: {
       type: Boolean,
-      value: false
+      value: false,
     },
 
     /**
      * Array of nameserver addresses stored as strings.
      * @type {!Array<string>}
      */
     nameservers: {
       type: Array,
-      value: function() { return []; }
+      value: function() {
+        return [];
+      },
     },
 
     /**
      * The selected nameserver type.
      */
     nameserversType: {
       type: String,
-      value: 'automatic'
+      value: 'automatic',
     },
 
     /**
      * Array of nameserver types.
      */
     nameserverTypeNames_: {
       type: Array,
       value: ['automatic', 'google', 'custom'],
-      readOnly: true
+      readOnly: true,
     },
   },
 
-  /** @const */ GoogleNameservers: ['8.8.4.4', '8.8.8.8'],
+  /** @const */
+  GoogleNameservers: [
+    '8.8.4.4',
+    '8.8.8.8',
+  ],
 
   /**
    * Saved nameservers when switching to 'automatic'.
    * @type {!Array<string>}
    */
   savedNameservers_: [],
 
-  /**
-   * Polymer networkProperties changed method.
-   */
+  /** @private */
   networkPropertiesChanged_: function(newValue, oldValue) {
     if (!this.networkProperties)
       return;
 
     if (!oldValue || newValue.GUID != oldValue.GUID)
       this.savedNameservers_ = [];
 
     // Update the 'nameservers' property.
     var nameservers = [];
     var ipv4 =
         CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV4);
     if (ipv4 && ipv4.NameServers)
       nameservers = ipv4.NameServers;
 
     // Update the 'nameserversType' property.
     var configType =
         CrOnc.getActiveValue(this.networkProperties.NameServersConfigType);
     var type;
     if (configType == CrOnc.IPConfigType.STATIC) {
-      if (nameservers.join(',') == this.GoogleNameservers.join(','))
+      if (nameservers.join(',') == this.GoogleNameservers.join(',')) {
         type = 'google';
-      else
+      } else {
         type = 'custom';
+      }
     } else {
       type = 'automatic';
     }
-    this.nameserversType = type;
-    this.$$('#type').selectedIndex = this.getSelectedIndex_(type);
+    this.setNameservers_(type, nameservers);
+  },
 
+  /**
+   * @param {string} nameserversType
+   * @param {!Array<string>} nameservers
+   * @private
+   */
+  setNameservers_: function(nameserversType, nameservers) {
+    this.nameserversType = nameserversType;
+    if (nameserversType == 'custom') {
+      // Add empty entries for unset custom nameservers.
+      for (let i = nameservers.length; i < 4; ++i)

[dschuyler, 2016/07/29 19:27:01]

nit: maybe a comment about why there are 4.

[stevenjb, 2016/07/29 22:23:29]

Added const MAX_NAMESERVERS = 4.

+        nameservers[i] = '';
+    }
     this.nameservers = nameservers;
   },
 
   /**
-   * @param {string} nameserversType The nameservers type.
-   * @return {number} The selected index for |nameserversType|.
-   * @private
-   */
-  getSelectedIndex_: function(nameserversType) {
-    var idx = this.nameserverTypeNames_.indexOf(nameserversType);
-    if (idx != -1)
-      return idx;
-    console.error('Unexpected type: ' + nameserversType);
-    return 0;
-  },
-
-  /**
    * @param {string} nameserversType The nameservers type.
    * @return {string} The description for |nameserversType|.
    * @private
    */
   nameserverTypeDesc_: function(nameserversType) {
     // TODO(stevenjb): Translate.
     if (nameserversType == 'custom')
       return 'Custom name servers';
     if (nameserversType == 'google')
       return 'Google name servers';
     return 'Automatic name servers';
   },
 
   /**
    * @param {boolean} editable The editable state.
    * @param {string} nameserversType The nameservers type.
    * @return {boolean} True if the nameservers are editable.
    * @private
    */
   canEdit_: function(editable, nameserversType) {
     return editable && nameserversType == 'custom';
   },
 
   /**
    * Event triggered when the selected type changes. Updates nameservers and
    * sends the change value if necessary.
-   * @param {Event} event The select node change event.
+   * @param {!{detail: !{selected: string}}} e
    * @private
    */
-  onTypeChange_: function(event) {
+  onTypeChange_: function(e) {
     if (this.nameserversType == 'custom')
       this.savedNameservers_ = this.nameservers;
-    var type = this.nameserverTypeNames_[event.target.selectedIndex];
+    var type = e.detail.selected;
     this.nameserversType = type;
     if (type == 'custom') {
+      // Restore the saved nameservers.
+      this.setNameservers_(type, this.savedNameservers_);
+      // Only send custom nameservers if they are not empty.
       if (this.savedNameservers_.length == 0)
-        return;  // Don't change nameservers until onValueChange_().
-      // Restore the saved nameservers and send them.
-      this.nameservers = this.savedNameservers_;
+        return;
     }
     this.sendNameServers_();
   },
 
   /**
    * Event triggered when a nameserver value changes.
    * @private
    */
   onValueChange_: function() {
     if (this.nameserversType != 'custom') {
       // If a user inputs Google nameservers in the custom nameservers fields,
       // |nameserversType| will change to 'google' so don't send the values.
       return;
     }
     this.sendNameServers_();
   },
 
   /**
    * Sends the current nameservers type (for automatic) or value.
    * @private
    */
   sendNameServers_: function() {
     var type = this.nameserversType;
 
-    var nameservers;
     if (type == 'custom') {
-      nameservers = [];
+      let nameservers = [];
       for (let i = 0; i < 4; ++i) {
         let id = 'nameserver' + i;
-        let nameserver = this.$$('#' + id).value;
-        if (nameserver)
-          nameservers.push(nameserver);
+        let nameserverInput = this.$$('#' + id);
+        let nameserver = '';
+        if (nameserverInput)
+          nameserver = this.$$('#' + id).value;
+        nameservers.push(nameserver);
       }
       this.fire('nameservers-change', {
         field: 'NameServers',
-        value: nameservers
+        value: nameservers,
       });
     } else if (type == 'google') {
-      nameservers = this.GoogleNameservers;
+      let nameservers = this.GoogleNameservers;
       this.fire('nameservers-change', {
         field: 'NameServers',
-        value: nameservers
+        value: nameservers,
       });
     } else {
       // automatic
       this.fire('nameservers-change', {
         field: 'NameServersConfigType',
-        value: CrOnc.IPConfigType.DHCP
+        value: CrOnc.IPConfigType.DHCP,
       });
     }
   },
 });
-})();