MD Settings: Internet: Cleanup JS

chrome/browser/resources/settings/internet_page/internet_detail_page.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
  * 'settings-internet-detail' is the settings subpage containing details
  * for a network.
  */
 (function() {
@@ skipping 14 matching lines @@
     /**
      * The current properties for the network matching |guid|.
      * @type {!CrOnc.NetworkProperties|undefined}
      */
     networkProperties: {
       type: Object,
       observer: 'networkPropertiesChanged_',
     },
 
     /**
-     * The network AutoConnect state.
-     */
-    autoConnect: {
-      type: Boolean,
-      value: false,
-      observer: 'autoConnectChanged_',
-    },
-
-    /**
-     * The network preferred state.
-     */
-    preferNetwork: {
-      type: Boolean,
-      value: false,
-      observer: 'preferNetworkChanged_',
-    },
-
-    /**
-     * The network IP Address.
-     */
-    IPAddress: {
-      type: String,
-      value: '',
-    },
-
-    /**
      * Highest priority connected network or null.
      * @type {?CrOnc.NetworkStateProperties}
      */
     defaultNetwork: {
       type: Object,
       value: null,
     },
 
-    advancedExpanded: {type: Boolean},
+    /**
+     * Interface for networkingPrivate calls, passed from internet_page.
+     * @type {NetworkingPrivate}
+     */
+    networkingPrivate: Object,
+
+    /** The network AutoConnect state. */

[dschuyler, 2016/08/31 20:52:05]

Should each of these be @private
now that they have the trailing
underscore?

[stevenjb, 2016/08/31 21:33:44]

Huh. I didn't think that was valid for properties, but I looked again and did
find some use cases. I will add it.

+    autoConnect_: {
+      type: Boolean,
+      value: false,
+      observer: 'autoConnectChanged_',
+    },
+
+    /** The network preferred state. */
+    preferNetwork_: {
+      type: Boolean,
+      value: false,
+      observer: 'preferNetworkChanged_',
+    },
+
+    /** The network IP Address. */
+    IPAddress_: {
+      type: String,
+      value: '',
+    },
+
+    advancedExpanded_: {type: Boolean},
 
     /**
      * Object providing network type values for data binding.
      * @const
      */
-    NetworkType: {
+    NetworkType_: {
       type: Object,
       value: {
         CELLULAR: CrOnc.Type.CELLULAR,
         ETHERNET: CrOnc.Type.ETHERNET,
         VPN: CrOnc.Type.VPN,
         WIFI: CrOnc.Type.WI_FI,
         WIMAX: CrOnc.Type.WI_MAX,
       },
       readOnly: true
     },
-
-    /**
-     * Interface for networkingPrivate calls, passed from internet_page.
-     * @type {NetworkingPrivate}
-     */
-    networkingPrivate: {type: Object},
   },
 
   /**
    * Listener function for chrome.networkingPrivate.onNetworksChanged event.
    * @type {?function(!Array<string>)}
    * @private
    */
   networksChangedListener_: null,
 
   /**
@@ skipping 33 matching lines @@
     });
   },
 
   /** @private */
   networkPropertiesChanged_: function() {
     if (!this.networkProperties)
       return;
 
     // Update autoConnect if it has changed. Default value is false.
     var autoConnect = CrOnc.getAutoConnect(this.networkProperties);
-    if (autoConnect != this.autoConnect)
-      this.autoConnect = autoConnect;
+    if (autoConnect != this.autoConnect_)
+      this.autoConnect_ = autoConnect;
 
     // Update preferNetwork if it has changed. Default value is false.
     var priority = /** @type {number} */ (
         CrOnc.getActiveValue(this.networkProperties.Priority) || 0);
     var preferNetwork = priority > 0;
-    if (preferNetwork != this.preferNetwork)
-      this.preferNetwork = preferNetwork;
+    if (preferNetwork != this.preferNetwork_)
+      this.preferNetwork_ = preferNetwork;
 
     // Set the IPAddress property to the IPV4 Address.
     var ipv4 =
         CrOnc.getIPConfigForType(this.networkProperties, CrOnc.IPType.IPV4);
-    this.IPAddress = (ipv4 && ipv4.IPAddress) || '';
+    this.IPAddress_ = (ipv4 && ipv4.IPAddress) || '';
   },
 
   /** @private */
   autoConnectChanged_: function() {
     if (!this.networkProperties || !this.guid)
       return;
     var onc = this.getEmptyNetworkProperties_();
-    CrOnc.setTypeProperty(onc, 'AutoConnect', this.autoConnect);
+    CrOnc.setTypeProperty(onc, 'AutoConnect', this.autoConnect_);
     this.setNetworkProperties_(onc);
   },
 
   /** @private */
   preferNetworkChanged_: function() {
     if (!this.networkProperties || !this.guid)
       return;
     var onc = this.getEmptyNetworkProperties_();
-    onc.Priority = this.preferNetwork ? 1 : 0;
+    onc.Priority = this.preferNetwork_ ? 1 : 0;
     this.setNetworkProperties_(onc);
   },
 
   /**
    * networkingPrivate.onNetworksChanged event callback.
    * @param {!Array<string>} networkIds The list of changed network GUIDs.
    * @private
    */
   onNetworksChangedEvent_: function(networkIds) {
     if (networkIds.indexOf(this.guid) != -1)
@@ skipping 236 matching lines @@
     this.networkingPrivate.startActivate(this.guid);
   },
 
   /**
    * @param {Event} event
    * @private
    */
   toggleAdvancedExpanded_: function(event) {
     if (event.target.id == 'expandButton')
       return;  // Already handled.
-    this.advancedExpanded = !this.advancedExpanded;
+    this.advancedExpanded_ = !this.advancedExpanded_;
   },
 
   /**
    * Event triggered for elements associated with network properties.
    * @param {!{detail: !{field: string, value: (string|!Object)}}} event
    * @private
    */
   onNetworkPropertyChange_: function(event) {
     if (!this.networkProperties)
       return;
@@ skipping 299 matching lines @@
    */
   allPropertiesMatch_: function(curValue, newValue) {
     for (let key in newValue) {
       if (newValue[key] != curValue[key])
         return false;
     }
     return true;
   }
 });
 })();