Skip to content

Commit 58d30e7

Browse files
author
Jeremy White
committed
Merge branch 'develop'
2 parents 612b6cf + 05e6d68 commit 58d30e7

File tree

4 files changed

+42
-2
lines changed

4 files changed

+42
-2
lines changed

dist/connect_bridge.js

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -678,6 +678,7 @@ var connectsdk = (function () {
678678
};
679679
} else {
680680
// Look for "webOSAppChannelSocketUrl" parameter
681+
var foundSocketUrl = false;
681682
if (window.location.search) {
682683
console.log("found params: ", window.location.search);
683684
/**
@@ -700,12 +701,31 @@ var connectsdk = (function () {
700701

701702
if (parsed.webOSAppChannelSocketUrl) {
702703
console.log("found websocket URL: ", parsed.webOSAppChannelSocketUrl);
704+
foundSocketUrl = true;
703705

704706
this.getAppChannelWebSocket = function (callback) {
705707
callback(new WebSocket(parsed.webOSAppChannelSocketUrl));
706708
};
707709
}
708710
}
711+
712+
if (!foundSocketUrl && window.NetCastCreateAppChannel) {
713+
var callbackName = "_webOSCreateAppChannelCallback";
714+
715+
this.getAppChannelWebSocket = function (callback) {
716+
717+
window[callbackName] = function (response) {
718+
delete window[callbackName];
719+
//console.log("got NetCastCreateAppChannel response: " + JSON.stringify(response));
720+
721+
if (response.socketUrl) {
722+
callback(new WebSocket(response.socketUrl));
723+
}
724+
};
725+
726+
window.NetCastCreateAppChannel('{}', callbackName, false);
727+
};
728+
}
709729
}
710730
},
711731

0 commit comments

Comments
 (0)