haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #678 from geekgonecrazy/master 

Switch to https on iframe creation
This commit is contained in:
Emil Ivov 2016-06-07 14:50:21 -05:00
parent 207e6e1b7d 98919e0996
commit c82bf2a19c
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
external_api.js
View File

@ -25,10 +25,11 @@ var JitsiMeetExternalAPI = (function()
* @param parent_node the node that will contain the iframe * @param parent_node the node that will contain the iframe
* @param filmStripOnly if the value is true only the small videos will be * @param filmStripOnly if the value is true only the small videos will be
* visible. * visible.
* @param noSsl if the value is true https won't be used
* @constructor * @constructor
*/ */
function JitsiMeetExternalAPI(domain, room_name, width, height, parentNode, function JitsiMeetExternalAPI(domain, room_name, width, height, parentNode,
configOverwrite, interfaceConfigOverwrite) { configOverwrite, interfaceConfigOverwrite, noSsl) {
if (!width || width < MIN_WIDTH) if (!width || width < MIN_WIDTH)
width = MIN_WIDTH; width = MIN_WIDTH;
if (!height || height < MIN_HEIGHT) if (!height || height < MIN_HEIGHT)
@ -50,7 +51,7 @@ var JitsiMeetExternalAPI = (function()
if(height) if(height)
this.iframeHolder.style.height = height + "px"; this.iframeHolder.style.height = height + "px";
this.frameName = "jitsiConferenceFrame" + JitsiMeetExternalAPI.id; this.frameName = "jitsiConferenceFrame" + JitsiMeetExternalAPI.id;
this.url = "//" + domain + "/"; this.url = (noSsl) ? "http" : "https" +"://" + domain + "/";
if(room_name) if(room_name)
this.url += room_name; this.url += room_name;
this.url += "#external=true"; this.url += "#external=true";