Settings > Network: Remove incorrect use of iron-a11y-keys

iron-a11y-keys is not scoped, i.e. it is global within a
component, so it is not a good choice for complex components.

Bug: 827953
Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
Change-Id: I65ce312f3476a85d75b2f806ecd5fac7ec70fe12
Reviewed-on: https://chromium-review.googlesource.com/1100311Reviewed-by: Scott Chen <scottchen@chromium.org>
Commit-Queue: Steven Bennetts <stevenjb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567379}

ui/webui/resources/cr_components/chromeos/network/network_config.html

@@ -4,7 +4,6 @@
 <link rel="import" href="chrome://resources/cr_elements/cr_input/cr_input.html">
 <link rel="import" href="chrome://resources/cr_elements/cr_toggle/cr_toggle.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11y-keys.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="network_shared_css.html">
 <link rel="import" href="network_password_input.html">
@@ -36,9 +35,8 @@
     <template is="dom-if" if="[[configRequiresPassphrase_(type, security_)]]"
         restamp>
       <network-password-input label="[[i18n('OncWiFi-Passphrase')]]"
-          value="{{configProperties_.WiFi.Passphrase}}">
-        <iron-a11y-keys keys="enter" on-keys-pressed="connectIfConfigured_">
-        </iron-a11y-keys>
+          value="{{configProperties_.WiFi.Passphrase}}"
+          on-enter="connectIfConfigured_">
       </network-password-input>
     </template>
 

ui/webui/resources/cr_components/chromeos/network/network_password_input.html

@@ -18,8 +18,9 @@
       }
     </style>
 
-    <cr-input label="[[label]]" value="{{value}}" disabled="[[disabled]]"
-        type="[[getInputType_(showPassword)]]">
+    <cr-input id="input" label="[[label]]" value="{{value}}"
+        disabled="[[disabled]]" type="[[getInputType_(showPassword)]]"
+        on-keypress="onInputKeypress_">
       <paper-icon-button-light id="icon" slot="suffix"
           class$="[[getIconClass_(showPassword)]]">
         <button on-tap="onShowPasswordTap_"

ui/webui/resources/cr_components/chromeos/network/network_password_input.js

@@ -61,8 +61,23 @@ Polymer({
                                this.i18n('showPassword');
   },
 
-  /** @private */
-  onShowPasswordTap_: function() {
+  /**
+   * @param {!Event} event
+   * @private
+   */
+  onShowPasswordTap_: function(event) {
     this.showPassword = !this.showPassword;
+    event.stopPropagation();
+  },
+
+  /**
+   * @param {!Event} event
+   * @private
+   */
+  onInputKeypress_: function(event) {
+    if (event.target.id != 'input' || event.key != 'Enter')
+      return;
+    event.stopPropagation();
+    this.fire('enter');
   },
 });

ui/webui/resources/cr_components/chromeos/network/network_proxy.html

@@ -9,7 +9,6 @@
 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/html/md_select_css.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11y-keys.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-input/iron-input.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
@@ -133,13 +132,11 @@
                 editable, useSharedProxies)]]">
         </network-proxy-exclusions>
         <div id="addException" class="layout horizontal center">
-          <cr-input id="proxyExclusion" class="flex">
+          <cr-input id="proxyExclusion" class="flex"
+              on-keypress="onAddProxyExclusionKeypress_">
             <paper-button on-tap="onAddProxyExclusionTap_" slot="suffix">
               [[i18n('networkProxyAddException')]]
             </paper-button>
-            <iron-a11y-keys keys="enter"
-                on-keys-pressed="onAddProxyExclusionTap_">
-            </iron-a11y-keys>
           </cr-input>
         </div>
       </div>

ui/webui/resources/cr_components/chromeos/network/network_proxy.js

@@ -344,12 +344,8 @@ Polymer({
     this.proxyIsUserModified_ = true;
   },
 
-  /**
-   * Event triggered when a proxy exclusion is added.
-   * @param {!Event} event The add proxy exclusion event.
-   * @private
-   */
-  onAddProxyExclusionTap_: function(event) {
+  /** @private */
+  onAddProxyExclusionTap_: function() {
     var value = this.$.proxyExclusion.value;
     if (!value)
       return;
@@ -359,6 +355,17 @@ Polymer({
     this.proxyIsUserModified_ = true;
   },
 
+  /**
+   * @param {!Event} event
+   * @private
+   */
+  onAddProxyExclusionKeypress_: function(event) {
+    if (event.key != 'Enter')
+      return;
+    event.stopPropagation();
+    this.onAddProxyExclusionTap_();
+  },
+
   /**
    * Event triggered when the proxy exclusion list changes.
    * @param {!Event} event The remove proxy exclusions change event.

ui/webui/resources/cr_components/chromeos/network/network_siminfo.html

@@ -8,7 +8,6 @@
 <link rel="import" href="chrome://resources/html/assert.html">
 <link rel="import" href="chrome://resources/html/cr/ui/focus_without_ink.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11y-keys.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
@@ -96,9 +95,7 @@
       <div slot="title">[[i18n('networkSimEnterPinTitle')]]</div>
       <div slot="body">
         <network-password-input id="enterPin" value="{{pin_}}"
-            label="[[i18n('networkSimEnterPin')]]">
-          <iron-a11y-keys keys="enter" on-keys-pressed="sendEnterPin_">
-          </iron-a11y-keys>
+            label="[[i18n('networkSimEnterPin')]]" on-enter="sendEnterPin_">
         </network-password-input>
         <div class="dialog-error">
           [[getErrorMsg_(error_, networkProperties)]]
@@ -127,9 +124,8 @@
             label="[[i18n('networkSimEnterNewPin')]]">
         </network-password-input>
         <network-password-input id="changePinNew2" value="{{pin_new2_}}"
-            label="[[i18n('networkSimReEnterNewPin')]]">
-          <iron-a11y-keys keys="enter" on-keys-pressed="sendChangePin_">
-          </iron-a11y-keys>
+            label="[[i18n('networkSimReEnterNewPin')]]"
+            on-enter="sendChangePin_">
         </network-password-input>
         <div class="dialog-error">
           [[getErrorMsg_(error_, networkProperties)]]
@@ -152,9 +148,7 @@
       <div slot="title">[[i18n('networkSimLockedTitle')]]</div>
       <div slot="body">
         <network-password-input id="unlockPin" value="{{pin_}}"
-            label="[[i18n('networkSimEnterPin')]]">
-          <iron-a11y-keys keys="enter" on-keys-pressed="sendUnlockPin_">
-          </iron-a11y-keys>
+            label="[[i18n('networkSimEnterPin')]]" on-enter="sendUnlockPin_">
         </network-password-input>
         <div class="dialog-error">
           [[getErrorMsg_(error_, networkProperties)]]
@@ -186,9 +180,8 @@
             label="[[i18n('networkSimEnterNewPin')]]">
         </network-password-input>
         <network-password-input id="unlockPin2" value="{{pin_new2_}}"
-            label="[[i18n('networkSimReEnterNewPin')]]">
-          <iron-a11y-keys keys="enter" on-keys-pressed="sendUnlockPuk_">
-          </iron-a11y-keys>
+            label="[[i18n('networkSimReEnterNewPin')]]"
+            on-enter="sendUnlockPuk_">
         </network-password-input>
         <div class="dialog-error">
           [[i18n('networkSimLockedWarning')]]