Fix pincode versus passkey issues for Bluetooth pairing.

chrome/browser/resources/options2/chromeos/bluetooth_pair_device_overlay.js

 // Copyright (c) 2012 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.
 
 cr.define('options', function() {
   /** @const */ var OptionsPage = options.OptionsPage;
 
   /**
    * Enumeration of possible states during pairing.  The value associated with
    * each state maps to a localized string in the global variable
@@ skipping 12 matching lines @@
     ERROR_CONNECTION_FAILED: 'bluetoothErrorConnectionFailed'
   };
 
   /**
    * List of IDs for conditionally visible elements in the dialog.
    * @type {Array.<String>}
    * @const
    */
   var ELEMENTS = ['bluetooth-pairing-passkey-display',
                   'bluetooth-pairing-passkey-entry',
+                  'bluetooth-pairing-pincode-entry',
                   'bluetooth-pair-device-connect-button',
                   'bluetooth-pair-device-cancel-button',
                   'bluetooth-pair-device-accept-button',
                   'bluetooth-pair-device-reject-button',
                   'bluetooth-pair-device-dismiss-button'];
 
 
   /**
    * Encapsulated handling of the Bluetooth device pairing page.
    * @constructor
@@ skipping 35 matching lines @@
         OptionsPage.closeOverlay();
       };
       $('bluetooth-pair-device-reject-button').onclick = function() {
         chrome.send('updateBluetoothDevice',
                     [self.device_.address, 'reject']);
         OptionsPage.closeOverlay();
       };
       $('bluetooth-pair-device-connect-button').onclick = function() {
         var args = [self.device_.address, 'connect'];
         var passkey = self.device_.passkey;
-        if (!passkey && !$('bluetooth-pairing-passkey-entry').hidden)
-          passkey = $('bluetooth-passkey').value;
         if (passkey)
           args.push(String(passkey));
+        else if (!$('bluetooth-pairing-passkey-entry').hidden)
+          args.push($('bluetooth-passkey').value);
+        else if (!$('bluetooth-pairing-pincode-entry').hidden)
+          args.push($('bluetooth-pincode').value);
         chrome.send('updateBluetoothDevice', args);
         OptionsPage.closeOverlay();
       };
       $('bluetooth-pair-device-accept-button').onclick = function() {
         chrome.send('updateBluetoothDevice',
                     [self.device_.address, 'accept']);
         OptionsPage.closeOverlay();
       };
       $('bluetooth-pair-device-dismiss-button').onclick = function() {
         OptionsPage.closeOverlay();
       };
       $('bluetooth-passkey').oninput = function() {
+        var inputField = $('bluetooth-passkey');
+        var value = inputField.value;
+        // Note that using <input type="number"> is insufficient to restrict
+        // the input as it allows negative numbers and does not limit the
+        // number of charactes typed even if a range is set.  Furthermore,
+        // it sometimes produces strange repaint artifacts.
+        var filtered = value.replace(/[^0-9]/g, '');
+        if (filtered != value)
+          inputField.value = filtered;
         $('bluetooth-pair-device-connect-button').disabled =
-            $('bluetooth-passkey').value.length == 0;
+            inputField.value.length == 0;
+      }
+      $('bluetooth-pincode').oninput = function() {
+        $('bluetooth-pair-device-connect-button').disabled =
+            $('bluetooth-pincode').value.length == 0;
       }
     },
 
     /**
      * Override to prevent showing the overlay if the Bluetooth device details
      * have not been specified.  Prevents showing an empty dialog if the user
      * quits and restarts Chrome while in the process of pairing with a device.
      * @return {boolean} True if the overlay can be displayed.
      */
     canShowPage: function() {
@@ skipping 28 matching lines @@
           // Remote entering a passkey.
           this.displayElements_(['bluetooth-pairing-passkey-display',
                                  'bluetooth-pair-device-cancel-button']);
         }
       } else if (this.device_.pincode) {
         this.updatePinCode_();
         this.displayElements_(['bluetooth-pairing-passkey-display',
                                'bluetooth-pair-device-cancel-button']);
       } else if (this.device_.pairing == PAIRING.ENTER_PIN_CODE) {
         // Prompting the user to enter a PIN code.
-        this.displayElements_(['bluetooth-pairing-passkey-entry',
+        this.displayElements_(['bluetooth-pairing-pincode-entry',
                                'bluetooth-pair-device-connect-button',
                                'bluetooth-pair-device-cancel-button']);
+        $('bluetooth-pincode').value = '';
       } else if (this.device_.pairing == PAIRING.ENTER_PASSKEY) {
         // Prompting the user to enter a passkey.
         this.displayElements_(['bluetooth-pairing-passkey-entry',
                                'bluetooth-pair-device-connect-button',
                                'bluetooth-pair-device-cancel-button']);
+        $('bluetooth-passkey').value = '';
       } else {
         // Displaying an error message.
         this.displayElements_(['bluetooth-pair-device-dismiss-button']);
       }
-      $('bluetooth-pair-device-connect-button').disabled =
-          $('bluetooth-passkey').value.length == 0;
+      // User is required to enter a passkey or pincode before the connect
+      // button can be enabled.  The 'oninput' methods for the input fields
+      // determine when the connect button becomes active.
+      $('bluetooth-pair-device-connect-button').disabled = true;
     },
 
     /**
      * Updates the visibility of elements in the dialog.
      * @param {Array.<string>} list List of conditionally visible elements that
      *     are to be made visible.
      * @private
      */
     displayElements_: function(list) {
       var enabled = {};
@@ skipping 87 matching lines @@
   BluetoothPairing.showDialog = function(device) {
     BluetoothPairing.getInstance().update(device);
     OptionsPage.navigateToPage('bluetoothPairing');
   };
 
   // Export
   return {
     BluetoothPairing: BluetoothPairing
   };
 });