diff --git a/js/comm.js b/js/comm.js index 39485cf..6396cf5 100644 --- a/js/comm.js +++ b/js/comm.js @@ -473,7 +473,7 @@ function initCall(){ //start calling tone document.getElementById('callerTone').play(); - //notify callee that we're calling. Don't call startCall yet + //notify callee that we're calling. Don't call startCall() yet wsChat.send(JSON.stringify({ action: 'initCall', msg: callType === 'Video' ? "Video call from remote" : "Audio call from remote", @@ -571,7 +571,7 @@ function startCall(isCaller){ //When remote stream becomes available myPC.ontrack = function(e){ document.getElementById("peerVid").src = window.URL.createObjectURL(e.streams[0]); -// document.getElementById("peerVid").src = window.HTMLMediaElement.srcObject(e.streams[0]); + // document.getElementById("peerVid").src = window.HTMLMediaElement.srcObject(e.streams[0]); }; @@ -637,7 +637,7 @@ function setLocalMedia(streamConstraints, isCaller){ streamConstraints ).then(function(myStream){ document.getElementById("myVid").src = window.URL.createObjectURL(myStream); -// document.getElementById("myVid").src = window.HTMLMediaElement.srcObject(myStream); + // document.getElementById("peerVid").src = window.HTMLMediaElement.srcObject(e.streams[0]); myPC.addStream(myStream);//add my stream to RTCPeerConnection diff --git a/js/config.js b/js/config.js index 7e07e9c..47736c8 100644 --- a/js/config.js +++ b/js/config.js @@ -22,11 +22,15 @@ function setAppRoot(devFolderName, prodFolderName){ var devFolder = devFolderName ? devFolderName+"/" : ""; var prodFolder = prodFolderName ? prodFolderName+"/" : ""; - if((hostname.search("localhost") !== -1) || (hostname.search("192.168.") !== -1) || (hostname.search("127.0.0.") !== -1)){ - return window.location.origin+"/"+devFolder; + var appRoot = ""; + + if(hostname === "localhost" || (hostname.search("192.168.") !== -1) || (hostname.search("127.0.0.") !== -1)){ + appRoot = window.location.origin+"/"+devFolder; } else{ - return window.location.origin+"/"+prodFolder; + appRoot = window.location.origin+"/"+prodFolder; } -} \ No newline at end of file + + return appRoot; +} diff --git a/nbproject/project.properties b/nbproject/project.properties deleted file mode 100644 index 911a7b8..0000000 --- a/nbproject/project.properties +++ /dev/null @@ -1,7 +0,0 @@ -include.path=${php.global.include.path} -php.version=PHP_70 -source.encoding=UTF-8 -src.dir=. -tags.asp=false -tags.short=false -web.root=. diff --git a/nbproject/project.xml b/nbproject/project.xml deleted file mode 100644 index 5a66593..0000000 --- a/nbproject/project.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - org.netbeans.modules.php.project - - - webrtc-ratchet-chat-app - - -