From 17709f53c0864a3426844898967eee4941c115d7 Mon Sep 17 00:00:00 2001 From: lindenkron Date: Thu, 6 Apr 2023 00:40:53 +0200 Subject: [PATCH 1/4] [Initial] Minor director finess changes. --- index.html | 14 -------- main.css | 95 +++++++++++++++++++++++++----------------------------- 2 files changed, 44 insertions(+), 65 deletions(-) diff --git a/index.html b/index.html index a46f9e5..448d19d 100644 --- a/index.html +++ b/index.html @@ -1454,9 +1454,6 @@ S9 - - - @@ -1568,8 +1565,6 @@ - -
@@ -1599,8 +1594,6 @@
- -
@@ -1615,8 +1608,6 @@
- - @@ -1688,8 +1679,6 @@ G6 - - @@ -1704,9 +1693,6 @@ - - - diff --git a/main.css b/main.css index ad0f1b1..17dbf0a 100644 --- a/main.css +++ b/main.css @@ -122,7 +122,7 @@ th { padding:4px; } .preSelectButton { - margin: 4px 0 4px 8px; + margin: 4px 0 4px 4px; padding: 1px 4px; } .meter { @@ -252,7 +252,7 @@ button { user-select: none; margin: 10px 0px; cursor: pointer; - border-radius: 2px; + border-radius: 4px; } @@ -588,9 +588,11 @@ body.darktheme .credits>a:visited { } .advDirectGuestSettings { - padding: 10px 5px; + padding: 10px 5px; max-height: 400px; overflow-y: auto; + border-radius: 0px 0px 4px 4px; + background-color: #222; } .darktheme .advDirectGuestSettings label { @@ -694,6 +696,7 @@ hr { width: 100%; height: 148px; max-width: 260px; + border-radius: 4px; } .directorsgrid .vidcon { @@ -702,6 +705,7 @@ hr { background: #7E7E7E; color: #FCFCFC; vertical-align: top; + border-radius: 4px; } .directorBox { @@ -1584,23 +1588,23 @@ input[type=range]::-webkit-slider-runnable-track { height: 8.4px; cursor: pointer; box-shadow: 1px 1px 1px #000000, 0px 0px 1px #0d0d0d; - background: #3071a9; + background: #5ca930; border-radius: 1.3px; border: 0.2px solid #010101; } input[type=range]::-webkit-slider-thumb { box-shadow: 1px 1px 1px #000000, 0px 0px 1px #0d0d0d; border: 1px solid #000000; - height: 30px; - width: 16px; - border-radius: 3px; + height: 24px; + width: 8px; + border-radius: 2px; background: #ffffff; cursor: pointer; -webkit-appearance: none; - margin-top: -11px; + margin-top: -8px; } input[type=range]:focus::-webkit-slider-runnable-track { - background: #367ebd; + background: #57a32a; } input[type=range]::-moz-range-track { width: 100%; @@ -2177,13 +2181,16 @@ span[data-action-type="stats-graphs-details-container"]>span{ padding-bottom: 20px; } .soloButton{ - padding:5px; word-wrap: break-word; overflow:hidden; white-space: nowrap; overflow: hidden; font-size:0.7em; text-overflow: ellipsis; + margin-top: 5px; +} +.soloButton button { + margin: 5px 0px 0px 0px; } .lowerRaisedHand{ @@ -3423,32 +3430,27 @@ div#roomnotes2 { grid-column: 1; } .directorsgrid button { - text-transform: lowercase; + text-transform: capitalize; } - - - - - /* ---- DIRECTORS PAGE - Guest Controls Box ---- */ .controlsGrid { display: flex; flex-wrap: wrap; + gap: 4px; } .controlsGrid .group { width: 100%; display: flex; flex-direction: column; + gap: 4px; } .controlsGrid .row { width: 100%; display: flex; flex-wrap: wrap; - gap: 10px; - margin-top: 5px; - margin-bottom: 5px; + gap: 4px; } .controlsGrid .row > .row { margin: 0; @@ -3467,40 +3469,31 @@ div#roomnotes2 { } .controlsGrid button { + display: flex; + justify-content: center; margin: 0; text-align: right; + padding: 5px; + border-radius: 4px; } .controlsGrid button.center { - display: flex; align-self: center; - justify-content: center; - padding: 0 5px; - padding-top: 7px; - padding-bottom: 6px; -} - -.controlsGrid .spacer { - width: 100%; - height: 5px; -} -.controlsGrid .spacer.big { - height: 15px; } /* Specitic CSS for different elements inside the guest control-buttons */ .controlsGrid .director-message-box { - flex: 1 100% !important; - padding: 10px; - - background: rgba(0, 0, 0, .15); - display: flex; flex-wrap: wrap; gap: 5px; + flex: 1 100% !important; + padding: 5px; + background: rgba(0, 0, 0, .15); + border-radius: 4px; } .controlsGrid .director-message-box textarea { flex: 1 100%; padding: 5px; + border-radius: 4px; } .controlsGrid .director-message-box .message-close { flex: 1; @@ -3518,15 +3511,20 @@ div#roomnotes2 { margin: 0; } .controlsGrid .tooltip .tooltiptext { - top: -25px; + height: 18px; + line-height: 1.2; + top: 3px !important; + left: 100% !important; + background-color: #7a9d50; + border: 1px solid rgba(0,0,0,1); + border-radius: 4px; + font-size: 12px; } .controlsGrid .hideDropMenu{ user-select: none; grid-column: 1; width: 100%; - margin-top: 10px; - margin-bottom: 5px; font-size: 80%; cursor: pointer; } @@ -3547,16 +3545,16 @@ div#roomnotes2 { /* Hightlights for buttons in the guest control-buttons */ .controlsGrid .btn-HL-yellow { - background: rgb(255, 235, 154); + background: rgb(255, 229, 127); } .controlsGrid .btn-HL-peach { - background: rgb(243, 197, 242); + background: rgb(228, 203, 189); } .controlsGrid .btn-HL-green { - background: rgb(130, 223, 128); + background: rgb(189, 228, 199); } .controlsGrid .btn-HL-blue { - background: rgb(170, 204, 248); + background: rgb(170, 204, 248) } /* Hides buttons that are supposed to be hidden when &novice is added to URL */ @@ -3564,10 +3562,6 @@ div#roomnotes2 { display: none; } - - - - #widget { position: absolute; width: 25%; @@ -3586,8 +3580,7 @@ div#roomnotes2 { right: 10px; } .controlCenterBox{ - margin-top:2px; - padding: 0 5px; + padding: 5px; } .contolboxLabel { @@ -3873,7 +3866,7 @@ a#reshare { height:0%; min-width:2px; bottom: 1px; - right: 5px; + right: 7px; background-color:#0000; position:absolute; border-radius: 2vh; From 1ceae44e692185d173ea8ad1657c12f8e176b29d Mon Sep 17 00:00:00 2001 From: lindenkron Date: Thu, 6 Apr 2023 03:21:13 +0200 Subject: [PATCH 2/4] Select/Button for Audio/Video Settings --- lib.js | 16 ++++++++-------- main.css | 51 ++++++++++++++++++++++++++++++++++++++++++++++++--- 2 files changed, 56 insertions(+), 11 deletions(-) diff --git a/lib.js b/lib.js index 0bb08e1..63d61d0 100644 --- a/lib.js +++ b/lib.js @@ -16236,8 +16236,8 @@ function createControlBox(UUID, soloLink, streamID) { iframeDetails.id = "iframeDetails_" + UUID; // needed to delete on user disconnect iframeDetails.className = "iframeDetails hidden"; - controls.innerHTML += ""; - controls.innerHTML += ""; + controls.innerHTML += ""; + controls.innerHTML += ""; var handsID = "hands_" + UUID; @@ -17971,7 +17971,7 @@ function gotDevicesRemote(deviceInfos, UUID) { } else { var videoSelect = document.createElement("select"); videoSelect.id = "remoteVideoSelect_"+UUID; - videoSelect.style = "max-width:170px;font-size: 70% !important; margin: 5px 5px 5px 0; padding:2px;"; + videoSelect.style = "font-size: 70% !important;"; @@ -18013,7 +18013,7 @@ function gotDevicesRemote(deviceInfos, UUID) { } else { var audioSelect = document.createElement("select"); audioSelect.id = "remoteAudioSelect_"+UUID; - audioSelect.style = "max-width:170px;font-size: 70% !important; margin: 5px 5px 5px 0; padding:2px;"; + audioSelect.style = "font-size: 70% !important;"; audioSelect.onchange = function(){ @@ -18029,7 +18029,7 @@ function gotDevicesRemote(deviceInfos, UUID) { var buttonGO = document.createElement("button"); buttonGO.innerHTML = ' refresh'; - buttonGO.style = "padding: 5px;"; + // buttonGO.style = "padding: 5px;"; buttonGO.title = "This will refresh the current device"; buttonGO.id = "requestAudioDevice_"+UUID; @@ -18055,7 +18055,7 @@ function gotDevicesRemote(deviceInfos, UUID) { } else { var audioOutputSelect = document.createElement("select"); audioOutputSelect.id = "remoteAudioOutputSelect_"+UUID; - audioOutputSelect.style = "max-width:170px;font-size: 70% !important; margin: 5px 5px 5px 0; padding:2px;"; + audioOutputSelect.style = "font-size: 70% !important;"; audioOutputSelect.onchange = function(){ if (session.rpcs[UUID].stats.info && session.rpcs[UUID].stats.info.consent){ @@ -34930,8 +34930,8 @@ function createControlBoxScreenshare(UUID, soloLink, streamID) { iframeDetails.id = "iframeDetails_" + UUID; // needed to delete on user disconnect iframeDetails.className = "iframeDetails hidden"; - controls.innerHTML += ""; - controls.innerHTML += ""; + controls.innerHTML += ""; + controls.innerHTML += ""; var handsID = "hands_" + UUID; diff --git a/main.css b/main.css index 17dbf0a..262a53b 100644 --- a/main.css +++ b/main.css @@ -587,15 +587,60 @@ body.darktheme .credits>a:visited { background-color: black; } -.advDirectGuestSettings { - padding: 10px 5px; +.advancedAudioSettings, .advancedVideoSettings { + display: flex; + flex-direction: column; + padding: 5px; max-height: 400px; overflow-y: auto; border-radius: 0px 0px 4px 4px; background-color: #222; + width: 100%; +} +.advancedAudioSettings div { + display: flex; + overflow: hidden; + align-items: center; + gap: 4px; + padding: 4px; +} +.advancedAudioSettings div button { + padding: 4px; + height: 24px; + margin: unset; + flex: 1; } -.darktheme .advDirectGuestSettings label { +.advancedAudioSettings div select { + width: 100%; + border-radius: 4px; + flex: 2; + height: 24px; + +} +.advancedVideoSettings div:nth-child(2) { + display: flex; + width: 100%; + padding: 4px; + align-items: center; + gap: 4px; +} + +.advancedVideoSettings div:nth-child(2) select { + width: 100%; + flex: 2; + height: 24px; + border-radius: 4px; +} + +.advancedVideoSettings div:nth-child(2) button { + width: 100%; + flex: 1; + height: 24px; + margin: unset; +} + +.darktheme .advancedAudioSettings label, .darktheme .advancedVideoSettings label { color: #FFF; } From 81eada963ea4508ac1873c60629862509a9687f4 Mon Sep 17 00:00:00 2001 From: lindenkron Date: Thu, 6 Apr 2023 15:33:27 +0200 Subject: [PATCH 3/4] Removed requestAudioOutputDevice padding. --- lib.js | 1 - 1 file changed, 1 deletion(-) diff --git a/lib.js b/lib.js index 0bb08e1..719097d 100644 --- a/lib.js +++ b/lib.js @@ -18069,7 +18069,6 @@ function gotDevicesRemote(deviceInfos, UUID) { var buttonGO = document.createElement("button"); buttonGO.innerHTML = ' refresh'; - buttonGO.style = "padding: 5px;"; buttonGO.title = "This will refresh the current device"; buttonGO.id = "requestAudioOutputDevice_"+UUID; buttonGO.onclick = function(){ From 9b205e2f53305787bc219a1ab28e7ec748bebe70 Mon Sep 17 00:00:00 2001 From: steveseguin Date: Thu, 6 Apr 2023 09:52:17 -0400 Subject: [PATCH 4/4] syncing current alpha --- comms.html | 177 ++++++++++++++++++++++-------------------- examples/multi.html | 48 +++++++++--- examples/rotated.html | 135 ++++++++++++++++++++++++++++++++ index.html | 36 +++++---- lib.js | 168 +++++++++++++++++++++++++++++++-------- main.css | 2 + main.js | 20 +++-- webrtc.js | 2 +- 8 files changed, 438 insertions(+), 150 deletions(-) create mode 100644 examples/rotated.html diff --git a/comms.html b/comms.html index 64a7e2c..d88edfc 100644 --- a/comms.html +++ b/comms.html @@ -1103,22 +1103,9 @@ //getById("chatModule").classList.add("hidden"); } - - var password = false; - if (urlParams.has('password') || urlParams.has('pass') || urlParams.has('pw') || urlParams.has('p')) { - password = urlParams.get('password') || urlParams.get('pass') || urlParams.get('pw') || urlParams.get('p'); - } - - - var aspectRatio = 16/9.0; document.documentElement.style.setProperty('--aspect-ratio', aspectRatio); - var roomname = false; - if (urlParams.has("room") || urlParams.has("r") ||urlParams.has("dir") || urlParams.has("director")){ - roomname = urlParams.get("room") || urlParams.get("r") ||urlParams.get("dir") || urlParams.get("director"); - roomname = sanitizeRoomName(roomname); - } var savedLastRoom = getStorage("savedRoom_comms"); if (savedLastRoom){ @@ -1133,6 +1120,20 @@ } } } + + + var password = false; + if (urlParams.has('password') || urlParams.has('pass') || urlParams.has('pw') || urlParams.has('p')) { + password = urlParams.get('password') || urlParams.get('pass') || urlParams.get('pw') || urlParams.get('p'); + } + + var roomname = false; + if (urlParams.has("room") || urlParams.has("r") ||urlParams.has("dir") || urlParams.has("director")){ + roomname = urlParams.get("room") || urlParams.get("r") ||urlParams.get("dir") || urlParams.get("director"); + roomname = sanitizeRoomName(roomname) || false; + } + + function randomRoomName(){ document.getElementById("roomname").value = generateString(8); } @@ -1159,7 +1160,11 @@ this.onclick = null; } roomname = rid; + + loadSavedSession(roomname); loadIframe(); + saveSession(); + document.getElementById("welcomeWindow").classList.add("fadeout"); setTimeout(function(){ document.getElementById("welcomeWindow").classList.add("hidden"); @@ -1472,6 +1477,17 @@ } } + var streamID = ""; + if (urlParams.has("push") || urlParams.has("sid")){ + streamID = urlParams.get("push") || urlParams.get("sid") || ""; + streamID = "&push="+streamID; + } + + var label = "&label"; + if (urlParams.has("label") || urlParams.has("l")){ + label += "=" + (urlParams.get("label") || urlParams.get("l") || ""); + } + var colors = [ "#00AAAA", "#FF0000", @@ -1486,7 +1502,7 @@ ]; var remoteGroups = {}; - + var savedSession = {}; var initialgroups = {}; initialgroups.settings = {}; @@ -1495,80 +1511,70 @@ initialgroups.groups = []; - var savedSession = getStorage("savedSession_comms"); + function loadSavedSession(roomname){ - if (savedSession){ - initialgroups = JSON.parse(savedSession); - if (!("activeViewGroups" in initialgroups)){ - initialgroups.activeViewGroups = []; + savedSession = getStorage("savedSession_comms_"+roomname) || getStorage("savedSession_comms"); + + if (savedSession){ + initialgroups = JSON.parse(savedSession); + if (!("activeViewGroups" in initialgroups)){ + initialgroups.activeViewGroups = []; + } else { + initialgroups.activeViewGroups.forEach(group=>{ + if (!initialgroups.groups.includes(group)){ + initialgroups.groups.push(group); + } + }); + } } else { - initialgroups.activeViewGroups.forEach(group=>{ - if (!initialgroups.groups.includes(group)){ - initialgroups.groups.push(group); - } - }); - } - } else { - var data = "1"; - initialgroups.groups.push(data); - - var data = "2"; - initialgroups.groups.push(data); - - var data = "3"; - initialgroups.groups.push(data); - - var data = "4"; - initialgroups.groups.push(data); - - var data = "5"; - initialgroups.groups.push(data); + var data = "1"; + initialgroups.groups.push(data); + + var data = "2"; + initialgroups.groups.push(data); + + var data = "3"; + initialgroups.groups.push(data); + + var data = "4"; + initialgroups.groups.push(data); + + var data = "5"; + initialgroups.groups.push(data); - var data = "6"; - initialgroups.groups.push(data); - } - - - - - if (urlParams.has("group") || urlParams.has("groups")){ - var groups = urlParams.get("group") || urlParams.get("groups"); - if (groups){ - groups.split(",").forEach(group=>{ - if (!initialgroups.groups.includes(group)){ - initialgroups.groups.push(group); - if (!initialgroups.activeGroups.includes(group)){ - initialgroups.activeGroups.push(group); - }; - } - }); + var data = "6"; + initialgroups.groups.push(data); } - } - - - if (urlParams.has("groupview") || urlParams.has("gv")){ - var viewgroups = urlParams.get("groupview") || urlParams.get("gv"); - if (viewgroups){ - viewgroups.split(",").forEach(group=>{ - if (!initialgroups.groups.includes(group)){ - initialgroups.groups.push(group); - } - initialgroups.activeViewGroups.push(group); - }); + + if (urlParams.has("group") || urlParams.has("groups")){ + var groups = urlParams.get("group") || urlParams.get("groups"); + initialgroups.groups = []; + if (groups){ + groups.split(",").forEach(group=>{ + if (!initialgroups.groups.includes(group)){ + initialgroups.groups.push(group); + //if (!initialgroups.activeGroups.includes(group)){ + // initialgroups.activeGroups.push(group); + //}; + } + }); + } } + + if (urlParams.has("groupview") || urlParams.has("gv")){ + var viewgroups = urlParams.get("groupview") || urlParams.get("gv"); + if (viewgroups){ + viewgroups.split(",").forEach(group=>{ + if (!initialgroups.groups.includes(group)){ + initialgroups.groups.push(group); + } + initialgroups.activeViewGroups.push(group); + }); + } + } + + savedSession = initialgroups; } - var streamID = ""; - if (urlParams.has("push") || urlParams.has("sid")){ - streamID = urlParams.get("push") || urlParams.get("sid") || ""; - streamID = "&push="+streamID; - } - - var label = "&label"; - if (urlParams.has("label") || urlParams.has("l")){ - label += "=" + (urlParams.get("label") || urlParams.get("l") || ""); - } - - savedSession = initialgroups; if (iframe){ iframe.contentWindow.postMessage({ groups: savedSession.activeGroups , groupView: savedSession.activeViewGroups }, "*"); @@ -1718,7 +1724,7 @@ function generateString(LLL = 7){ var text = ""; - var words = ["the","of","to","and","a","in","is","it","you","that","he","was","for","on","are","with","as","I","his","they","be","at","one","have","this","from","or","had","by","word","but","what","some","we","can","out","other","were","all","there","when","up","use","your","how","said","an","each","she","which","do","their","time","if","will","way","about","many","then","them","write","would","like","so","these","her","long","make","thing","see","him","two","has","look","more","day","could","go","come","did","number","sound","no","most","people","my","over","know","water","than","call","first","who","may","down","side","been","now","find","any","new","work","part","take","get","place","made","live","where","after","back","little","only","round","man","year","came","show","every","good","me","give","our","under","name","very","through","just","form","sentence","great","think","say","help","low","line","differ","turn","cause","much","mean","before","move","right","boy","old","too","same","tell","does","set","three","want","air","well","also","play","small","end","put","home","read","hand","port","large","spell","add","even","land","here","must","big","high","such","follow","act","why","ask","men","change","went","light","kind","off","need","house","picture","try","us","again","animal","point","mother","world","near","build","self","earth","father","head","stand","own","page","should","country","found","answer","school","grow","study","still","learn","plant","cover","food","sun","four","between","state","keep","eye","never","last","let","thought","city","tree","cross","farm","hard","start","might","story","saw","far","sea","draw","left","late","run","don't","while","press","close","night","real","life","few","north","open","seem","together","next","white","children","begin","got","walk","example","ease","paper","group","always","music","those","both","mark","often","letter","until","mile","river","car","feet","care","second","book","carry","took","science","eat","room","friend","began","idea","fish","mountain","stop","once","base","hear","horse","cut","sure","watch","color","face","wood","main","enough","plain","girl","usual","young","ready","above","ever","red","list","though","feel","talk","bird","soon","body","dog","family","direct","pose","leave","song","measure","door","product","black","short","numeral","class","wind","question","happen","complete","ship","area","half","rock","order","fire","south","problem","piece","told","knew","pass","since","top","whole","king","space","heard","best","hour","better","true .","during","hundred","five","remember","step","early","hold","west","ground","interest","reach","fast","verb","sing","listen","six","table","travel","less","morning","ten","simple","several","vowel","toward","war","lay","against","pattern","slow","center","love","person","money","serve","appear","road","map","rain","rule","govern","pull","cold","notice","voice","unit","power","town","fine","certain","fly","fall","lead","cry","dark","machine","note","wait","plan","figure","star","box","noun","field","rest","correct","able","pound","done","beauty","drive","stood","contain","front","teach","week","final","gave","green","oh","quick","develop","ocean","warm","free","minute","strong","special","mind","behind","clear","tail","produce","fact","street","inch","multiply","nothing","course","stay","wheel","full","force","blue","object","decide","surface","deep","moon","island","foot","system","busy","test","record","boat","common","gold","possible","plane","stead","dry","wonder","laugh","thousand","ago","ran","check","game","shape","equate","hot","miss","brought","heat","snow","tire","bring","yes","distant","fill","east","paint","language","among","grand","ball","yet","wave","drop","heart","am","present","heavy","dance","engine","position","arm","wide","sail","material","size","vary","settle","speak","weight","general","ice","matter","circle","pair","include","divide","syllable","felt","perhaps","pick","sudden","count","square","reason","length","represent","art","subject","region","energy","hunt","probable","bed","brother","egg","ride","cell","believe","fraction","forest","sit","race","window","store","summer","train","sleep","prove","lone","leg","exercise","wall","catch","mount","wish","sky","board","joy","winter","sat","written","wild","instrument","kept","glass","grass","cow","job","edge","sign","visit","past","soft","fun","bright","gas","weather","month","million","bear","finish","happy","hope","flower","clothe","strange","gone","jump","baby","eight","village","meet","root","buy","raise","solve","metal","whether","push","seven","paragraph","third","shall","held","hair","describe","cook","floor","either","result","burn","hill","safe","cat","century","consider","type","law","bit","coast","copy","phrase","silent","tall","sand","soil","roll","temperature","finger","industry","value","fight","lie","beat","excite","natural","view","sense","ear","else","quite","broke","case","middle","kill","son","lake","moment","scale","loud","spring","observe","child","straight","consonant","nation","dictionary","milk","speed","method","organ","pay","age","section","dress","cloud","surprise","quiet","stone","tiny","climb","cool","design","poor","lot","experiment","bottom","key","iron","single","stick","flat","twenty","skin","smile","crease","hole","trade","melody","trip","office","receive","row","mouth","exact","symbol","die","least","trouble","shout","except","wrote","seed","tone","join","suggest","clean","break","lady","yard","rise","bad","blow","oil","blood","touch","grew","cent","mix","team","wire","cost","lost","brown","wear","garden","equal","sent","choose","fell","fit","flow","fair","bank","collect","save","control","decimal","gentle","woman","captain","practice","separate","difficult","doctor","please","protect","noon","whose","locate","ring","character","insect","caught","period","indicate","radio","spoke","atom","human","history","effect","electric","expect","crop","modern","element","hit","student","corner","party","supply","bone","rail","imagine","provide","agree","thus","capital","won't","chair","danger","fruit","rich","thick","soldier","process","operate","guess","necessary","sharp","wing","create","neighbor","wash","bat","rather","crowd","corn","compare","poem","string","bell","depend","meat","rub","tube","famous","dollar","stream","fear","sight","thin","triangle","planet","hurry","chief","colony","clock","mine","tie","enter","major","fresh","search","send","yellow","gun","allow","print","dead","spot","desert","suit","current","lift","rose","continue","block","chart","hat","sell","success","company","subtract","event","particular","deal","swim","term","opposite","wife","shoe","shoulder","spread","arrange","camp","invent","cotton","born","determine","quart","nine","truck","noise","level","chance","gather","shop","stretch","throw","shine","property","column","molecule","select","wrong","gray","repeat","require","broad","prepare","salt","nose","plural","anger","claim","continent","oxygen","sugar","death","pretty","skill","women","season","solution","magnet","silver","thank","branch","match","suffix","especially","fig","afraid","huge","sister","steel","discuss","forward","similar","guide","experience","score","apple","bought","led","pitch","coat","mass","card","band","rope","slip","win","dream","evening","condition","feed","tool","total","basic","smell","valley","nor","double","seat","arrive","master","track","parent","shore","division","sheet","substance","favor","connect","post","spend","chord","fat","glad","original","share","station","dad","bread","charge","proper","bar","offer","segment","slave","duck","instant","market","degree","populate","chick","dear","enemy","reply","drink","occur","support","speech","nature","range","steam","motion","path","liquid","log","meant","quotient","teeth","shell","neck"]; + var words = ["the","of","to","and","a","in","is","it","you","that","he","was","for","on","are","with","as","I","his","they","be","at","one","have","this","from","or","had","by","word","but","what","some","we","can","out","other","were","all","there","when","up","use","your","how","said","an","each","she","which","do","their","time","if","will","way","about","many","then","them","write","would","like","so","these","her","long","make","thing","see","him","two","has","look","more","day","could","go","come","did","number","sound","no","most","people","my","over","know","water","than","call","first","who","may","down","side","been","now","find","any","new","work","part","take","get","place","made","live","where","after","back","little","only","round","man","year","came","show","every","good","me","give","our","under","name","very","through","just","form","sentence","great","think","say","help","low","line","differ","turn","cause","much","mean","before","move","right","boy","old","too","same","tell","does","set","three","want","air","well","also","play","small","end","put","home","read","hand","port","large","spell","add","even","land","here","must","big","high","such","follow","act","why","ask","men","change","went","light","kind","off","need","house","picture","try","us","again","animal","point","mother","world","near","build","self","earth","father","head","stand","own","page","should","country","found","answer","school","grow","study","still","learn","plant","cover","food","sun","four","between","state","keep","eye","never","last","let","thought","city","tree","cross","farm","hard","start","might","story","saw","far","sea","draw","left","late","run","dont","while","press","close","night","real","life","few","north","open","seem","together","next","white","children","begin","got","walk","example","ease","paper","group","always","music","those","both","mark","often","letter","until","mile","river","car","feet","care","second","book","carry","took","science","eat","room","friend","began","idea","fish","mountain","stop","once","base","hear","horse","cut","sure","watch","color","face","wood","main","enough","plain","girl","usual","young","ready","above","ever","red","list","though","feel","talk","bird","soon","body","dog","family","direct","pose","leave","song","measure","door","product","black","short","numeral","class","wind","question","happen","complete","ship","area","half","rock","order","fire","south","problem","piece","told","knew","pass","since","top","whole","king","space","heard","best","hour","better","true .","during","hundred","five","remember","step","early","hold","west","ground","interest","reach","fast","verb","sing","listen","six","table","travel","less","morning","ten","simple","several","vowel","toward","war","lay","against","pattern","slow","center","love","person","money","serve","appear","road","map","rain","rule","govern","pull","cold","notice","voice","unit","power","town","fine","certain","fly","fall","lead","cry","dark","machine","note","wait","plan","figure","star","box","noun","field","rest","correct","able","pound","done","beauty","drive","stood","contain","front","teach","week","final","gave","green","oh","quick","develop","ocean","warm","free","minute","strong","special","mind","behind","clear","tail","produce","fact","street","inch","multiply","nothing","course","stay","wheel","full","force","blue","object","decide","surface","deep","moon","island","foot","system","busy","test","record","boat","common","gold","possible","plane","stead","dry","wonder","laugh","thousand","ago","ran","check","game","shape","equate","hot","miss","brought","heat","snow","tire","bring","yes","distant","fill","east","paint","language","among","grand","ball","yet","wave","drop","heart","am","present","heavy","dance","engine","position","arm","wide","sail","material","size","vary","settle","speak","weight","general","ice","matter","circle","pair","include","divide","syllable","felt","perhaps","pick","sudden","count","square","reason","length","represent","art","subject","region","energy","hunt","probable","bed","brother","egg","ride","cell","believe","fraction","forest","sit","race","window","store","summer","train","sleep","prove","lone","leg","exercise","wall","catch","mount","wish","sky","board","joy","winter","sat","written","wild","instrument","kept","glass","grass","cow","job","edge","sign","visit","past","soft","fun","bright","gas","weather","month","million","bear","finish","happy","hope","flower","clothe","strange","gone","jump","baby","eight","village","meet","root","buy","raise","solve","metal","whether","push","seven","paragraph","third","shall","held","hair","describe","cook","floor","either","result","burn","hill","safe","cat","century","consider","type","law","bit","coast","copy","phrase","silent","tall","sand","soil","roll","temperature","finger","industry","value","fight","lie","beat","excite","natural","view","sense","ear","else","quite","broke","case","middle","kill","son","lake","moment","scale","loud","spring","observe","child","straight","consonant","nation","dictionary","milk","speed","method","organ","pay","age","section","dress","cloud","surprise","quiet","stone","tiny","climb","cool","design","poor","lot","experiment","bottom","key","iron","single","stick","flat","twenty","skin","smile","crease","hole","trade","melody","trip","office","receive","row","mouth","exact","symbol","die","least","trouble","shout","except","wrote","seed","tone","join","suggest","clean","break","lady","yard","rise","bad","blow","oil","blood","touch","grew","cent","mix","team","wire","cost","lost","brown","wear","garden","equal","sent","choose","fell","fit","flow","fair","bank","collect","save","control","decimal","gentle","woman","captain","practice","separate","difficult","doctor","please","protect","noon","whose","locate","ring","character","insect","caught","period","indicate","radio","spoke","atom","human","history","effect","electric","expect","crop","modern","element","hit","student","corner","party","supply","bone","rail","imagine","provide","agree","thus","capital","wont","chair","danger","fruit","rich","thick","soldier","process","operate","guess","necessary","sharp","wing","create","neighbor","wash","bat","rather","crowd","corn","compare","poem","string","bell","depend","meat","rub","tube","famous","dollar","stream","fear","sight","thin","triangle","planet","hurry","chief","colony","clock","mine","tie","enter","major","fresh","search","send","yellow","gun","allow","print","dead","spot","desert","suit","current","lift","rose","continue","block","chart","hat","sell","success","company","subtract","event","particular","deal","swim","term","opposite","wife","shoe","shoulder","spread","arrange","camp","invent","cotton","born","determine","quart","nine","truck","noise","level","chance","gather","shop","stretch","throw","shine","property","column","molecule","select","wrong","gray","repeat","require","broad","prepare","salt","nose","plural","anger","claim","continent","oxygen","sugar","death","pretty","skill","women","season","solution","magnet","silver","thank","branch","match","suffix","especially","fig","afraid","huge","sister","steel","discuss","forward","similar","guide","experience","score","apple","bought","led","pitch","coat","mass","card","band","rope","slip","win","dream","evening","condition","feed","tool","total","basic","smell","valley","nor","double","seat","arrive","master","track","parent","shore","division","sheet","substance","favor","connect","post","spend","chord","fat","glad","original","share","station","dad","bread","charge","proper","bar","offer","segment","slave","duck","instant","market","degree","populate","chick","dear","enemy","reply","drink","occur","support","speech","nature","range","steam","motion","path","liquid","log","meant","quotient","teeth","shell","neck"]; for (var i=0;i<2;i++){ try{ @@ -1778,7 +1784,6 @@ } roomname = sanitizeRoomName(roomname); - var iframeContainer = document.getElementById("iframeContainer"); iframe.allow = "autoplay;camera;microphone;fullscreen;picture-in-picture;display-capture;"; iframe.id = "vdoninja"; @@ -2280,7 +2285,7 @@ } } } - setStorage("savedSession_comms", JSON.stringify(savedSession)); + setStorage("savedSession_comms_"+roomname, JSON.stringify(savedSession)); if (iframe){ iframe.contentWindow.postMessage({ groups: savedSession.activeGroups , groupView: savedSession.activeViewGroups}, "*"); @@ -2314,7 +2319,9 @@ }); if (roomname){ + loadSavedSession(roomname); loadIframe(); + saveSession(); } else { document.getElementById("welcomeWindow").style.display = "block"; } diff --git a/examples/multi.html b/examples/multi.html index 1b2914a..1c9c932 100644 --- a/examples/multi.html +++ b/examples/multi.html @@ -20,16 +20,12 @@ iframe { display:block; } - - + + \ No newline at end of file diff --git a/index.html b/index.html index a46f9e5..e05ce4b 100644 --- a/index.html +++ b/index.html @@ -28,13 +28,13 @@ - - - - + + + + VDO.Ninja - + @@ -56,7 +56,7 @@ - + @@ -81,9 +81,9 @@ - + - + - +