| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** | 5 /** |
| 6 * @fileoverview | 6 * @fileoverview |
| 7 * The deserialized form of the chromoting host as returned by Apiary. | 7 * The deserialized form of the chromoting host as returned by Apiary. |
| 8 */ | 8 */ |
| 9 | 9 |
| 10 'use strict'; | 10 'use strict'; |
| (...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 92 /** @type {remoting.PairingInfo} */ ( | 92 /** @type {remoting.PairingInfo} */ ( |
| 93 base.getObjectAttr(options, 'pairingInfo', that.pairingInfo)); | 93 base.getObjectAttr(options, 'pairingInfo', that.pairingInfo)); |
| 94 | 94 |
| 95 // Load the key remappings, allowing for either old or new formats. | 95 // Load the key remappings, allowing for either old or new formats. |
| 96 var remappings = /** string|!Object */ (options['remapKeys']); | 96 var remappings = /** string|!Object */ (options['remapKeys']); |
| 97 if (typeof(remappings) === 'string') { | 97 if (typeof(remappings) === 'string') { |
| 98 remappings = remoting.Host.Options.convertRemapKeys(remappings); | 98 remappings = remoting.Host.Options.convertRemapKeys(remappings); |
| 99 } else if (typeof(remappings) !== 'object') { | 99 } else if (typeof(remappings) !== 'object') { |
| 100 remappings = {}; | 100 remappings = {}; |
| 101 } | 101 } |
| 102 that.remapKeys = remappings; | 102 that.remapKeys = /** @type {!Object} */ (base.deepCopy(remappings)); |
| 103 }); | 103 }); |
| 104 }; | 104 }; |
| 105 | 105 |
| 106 /** | 106 /** |
| 107 * Convert an old-style string key remapping into a new-style dictionary one. | 107 * Convert an old-style string key remapping into a new-style dictionary one. |
| 108 * | 108 * |
| 109 * @param {string} remappings | 109 * @param {string} remappings |
| 110 * @return {!Object} The same remapping expressed as a dictionary. | 110 * @return {!Object} The same remapping expressed as a dictionary. |
| 111 */ | 111 */ |
| 112 remoting.Host.Options.convertRemapKeys = function(remappings) { | 112 remoting.Host.Options.convertRemapKeys = function(remappings) { |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 148 var hostMajorVersion = parseInt(host.hostVersion, 10); | 148 var hostMajorVersion = parseInt(host.hostVersion, 10); |
| 149 if (isNaN(hostMajorVersion)) { | 149 if (isNaN(hostMajorVersion)) { |
| 150 // Host versions 26 and higher include the version number in heartbeats, | 150 // Host versions 26 and higher include the version number in heartbeats, |
| 151 // so if it's missing then the host is at most version 25. | 151 // so if it's missing then the host is at most version 25. |
| 152 hostMajorVersion = 25; | 152 hostMajorVersion = 25; |
| 153 } | 153 } |
| 154 return (parseInt(webappVersion, 10) - hostMajorVersion) > 1; | 154 return (parseInt(webappVersion, 10) - hostMajorVersion) > 1; |
| 155 }; | 155 }; |
| 156 | 156 |
| 157 })(); | 157 })(); |
| OLD | NEW |