diff options
Diffstat (limited to 'devtools')
| -rw-r--r-- | devtools/client/webconsole/console-output.js | 2 | ||||
| -rw-r--r-- | devtools/shared/discovery/discovery.js | 13 |
2 files changed, 2 insertions, 13 deletions
diff --git a/devtools/client/webconsole/console-output.js b/devtools/client/webconsole/console-output.js index 52d848494..bd290dcc6 100644 --- a/devtools/client/webconsole/console-output.js +++ b/devtools/client/webconsole/console-output.js @@ -31,7 +31,7 @@ const {PluralForm} = require("devtools/shared/plural-form"); const MAX_STRING_GRIP_LENGTH = 36; const {ELLIPSIS} = require("devtools/shared/l10n"); -const validProtocols = /^(http|https|ftp|data|javascript|resource|chrome):/i; +const validProtocols = /^(http|https|ftp|resource|chrome):/i; // Constants for compatibility with the Web Console output implementation before // bug 778766. diff --git a/devtools/shared/discovery/discovery.js b/devtools/shared/discovery/discovery.js index d0b49f129..3aa82ef6e 100644 --- a/devtools/shared/discovery/discovery.js +++ b/devtools/shared/discovery/discovery.js @@ -181,18 +181,7 @@ LocalDevice.prototype = { * Triggers the |name| setter to persist if needed. */ _generate: function () { - if (Services.appinfo.widgetToolkit == "gonk") { - // For Firefox OS devices, create one from the device name plus a little - // randomness. The goal is just to distinguish devices in an office - // environment where many people may have the same device model for - // testing purposes (which would otherwise all report the same name). - let name = libcutils.property_get("ro.product.device"); - // Pick a random number from [0, 2^32) - let randomID = Math.floor(Math.random() * Math.pow(2, 32)); - // To hex and zero pad - randomID = ("00000000" + randomID.toString(16)).slice(-8); - this.name = name + "-" + randomID; - } else if (Services.appinfo.widgetToolkit == "android") { + if (Services.appinfo.widgetToolkit == "android") { // For Firefox for Android, use the device's model name. // TODO: Bug 1180997: Find the right way to expose an editable name this.name = sysInfo.get("device"); |