MD Settings: Internet: Cleanup JS

chrome/browser/resources/settings/internet_page/network_ip_config.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 the IP Config properties for
  * a network state. TODO(stevenjb): Allow editing of static IP configurations
  * when 'editable' is true.
  */
 Polymer({
   is: 'network-ip-config',
 
   properties: {
     /**
      * The network properties dictionary containing the IP Config properties to
      * display and modify.
      * @type {!CrOnc.NetworkProperties|undefined}
      */
     networkProperties: {
       type: Object,
       observer: 'networkPropertiesChanged_',
     },
 
     /**
      * Whether or not the IP Address can be edited.
-     * TODO(stevenjb): Implement editing.
      */
     editable: {
       type: Boolean,
       value: false,
     },
 
-    /**
-     * State of 'Configure IP Addresses Automatically'.
-     */
-    automatic: {
+    /** State of 'Configure IP Addresses Automatically'. */
+    automatic_: {
       type: Boolean,
       value: false,
       observer: 'automaticChanged_',
     },
 
     /**
      * The currently visible IP Config property dictionary. The 'RoutingPrefix'
      * property is a human-readable mask instead of a prefix length.
      * @type {!{
      *   ipv4: !CrOnc.IPConfigUIProperties,
      *   ipv6: !CrOnc.IPConfigUIProperties
      * }|undefined}
      */
-    ipConfig: {type: Object},
+    ipConfig_: {type: Object},
 
     /**
      * Array of properties to pass to the property list.
      * @type {!Array<string>}
      */
     ipConfigFields_: {
       type: Array,
       value: function() {
         return [
           'ipv4.IPAddress',
@@ skipping 18 matching lines @@
   networkPropertiesChanged_: function(newValue, oldValue) {
     if (!this.networkProperties)
       return;
 
     if (newValue.GUID != (oldValue && oldValue.GUID))
       this.savedStaticIp_ = undefined;
 
     // Update the 'automatic' property.
     var ipConfigType =
         CrOnc.getActiveValue(this.networkProperties.IPAddressConfigType);
-    this.automatic = (ipConfigType != CrOnc.IPConfigType.STATIC);
+    this.automatic_ = (ipConfigType != CrOnc.IPConfigType.STATIC);
 
     // Update the 'ipConfig' property.
     var ipv4 =
         CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV4);
     var ipv6 =
         CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV6);
-    this.ipConfig = {
+    this.ipConfig_ = {
       ipv4: this.getIPConfigUIProperties_(ipv4),
       ipv6: this.getIPConfigUIProperties_(ipv6)
     };
   },
 
   /**
    * Polymer automatic changed method.
    */
   automaticChanged_: function() {
-    if (!this.automatic || !this.ipConfig)
+    if (!this.automatic_ || !this.ipConfig_)
       return;
-    if (this.automatic || !this.savedStaticIp_) {
+    if (this.automatic_ || !this.savedStaticIp_) {
       // Save the static IP configuration when switching to automatic.
-      this.savedStaticIp_ = this.ipConfig.ipv4;
+      this.savedStaticIp_ = this.ipConfig_.ipv4;
       var configType =
-          this.automatic ? CrOnc.IPConfigType.DHCP : CrOnc.IPConfigType.STATIC;
+          this.automatic_ ? CrOnc.IPConfigType.DHCP : CrOnc.IPConfigType.STATIC;
       this.fire('ip-change', {
         field: 'IPAddressConfigType',
         value: configType,
       });
     } else {
       // Restore the saved static IP configuration.
       var ipconfig = {
         Gateway: this.savedStaticIp_.Gateway,
         IPAddress: this.savedStaticIp_.IPAddress,
         RoutingPrefix: this.savedStaticIp_.RoutingPrefix,
@@ skipping 42 matching lines @@
       else
         result[key] = value;
     }
     return result;
   },
 
   /**
    * @return {boolean}
    * @private
    */
-  showIPEditFields_: function(editable, automatic) {
-    return editable && !automatic;
+  showIPEditFields_: function() {
+    return this.editable && !this.automatic_;
   },
 
   /**
    * @return {Object} An object with the edit type for each editable field.
    * @private
    */
-  getIPEditFields_: function(ipConfig, editable, automatic) {
-    if (!editable || automatic)
+  getIPEditFields_: function() {
+    if (!this.editable || this.automatic__)
       return {};
     return {
       'ipv4.IPAddress': 'String',
       'ipv4.RoutingPrefix': 'String',
       'ipv4.Gateway': 'String'
     };
   },
 
   /**
    * Event triggered when the network property list changes.
    * @param {!{detail: { field: string, value: string}}} event The

[Dan Beam, 2016/08/31 21:59:47]

nit: spurious space, \sfield

[stevenjb, 2016/08/31 22:10:16]

Done.

    *     network-property-list change event.
    * @private
    */
   onIPChange_: function(event) {
-    if (!this.ipConfig)
+    if (!this.ipConfig_)
       return;
     var field = event.detail.field;
     var value = event.detail.value;
     // Note: |field| includes the 'ipv4.' prefix.
     this.set('ipConfig.' + field, value);
     this.fire('ip-change', {
       field: 'StaticIPConfig',
-      value: this.getIPConfigProperties_(this.ipConfig.ipv4)
+      value: this.getIPConfigProperties_(this.ipConfig_.ipv4)
     });
   },
 });