Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-13 13:25:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1078796 - Remove special purpose Matchstick filtering code r=wesj

Browse Source
This commit is contained in:
Mark Finkle 2014-12-22 15:42:04 -05:00
parent d55f7227af
commit b52b5db415
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mobile/android/chrome/content/CastingApps.js
View File

@ -25,8 +25,7 @@ var matchstickDevice = {
id: "matchstick:dial",
target: "urn:dial-multiscreen-org:service:dial:1",
filters: {
server: null,
modelName: "Eureka Dongle"
manufacturer: "openflint"
},
factory: function(aService) {
Cu.import("resource://gre/modules/MatchstickApp.jsm");

7
toolkit/modules/secondscreen/SimpleServiceDiscovery.jsm
View File

@ -87,19 +87,12 @@ var SimpleServiceDiscovery = {
service.location = row.substr(10).trim();
} else if (name.startsWith("ST")) {
service.target = row.substr(4).trim();
} else if (name.startsWith("SERVER")) {
service.server = row.substr(8).trim();
}
}.bind(this));
if (service.location && service.target) {
service.location = this._forceTrailingSlash(service.location);
// We add the server as an additional way to filter services
if (!("server" in service)) {
service.server = null;
}
// When we find a valid response, package up the service information
// and pass it on.
try {