Commit 8a8590e8 by Lee Munkyeong

Merge branch 'feature/43017_ボード協業でスタートして写真協業に切り替えると写真選択ができない' into 'develop'

ボード協業から写真協業に切り替えると写真選択ができない問題対応

See merge request !155
parents ae69f2a0 29b87aa5
...@@ -252,7 +252,7 @@ $(function () { ...@@ -252,7 +252,7 @@ $(function () {
} }
if (globalUserInfo.coWorkType == collaborationTypeKey.BOARD) { if (globalUserInfo.coWorkType == collaborationTypeKey.BOARD) {
isBoard = true; isBoard = true;
globalUserInfo.coWorkType = collaborationTypeKey.CAMERA; globalUserInfo.coWorkType = collaborationTypeKey.AUDIO;
} }
hostSearchInterval(); hostSearchInterval();
if (collaborationJoinFlg == "1") { if (collaborationJoinFlg == "1") {
...@@ -316,11 +316,6 @@ $(function () { ...@@ -316,11 +316,6 @@ $(function () {
}, },
0 0
); );
if (isBoard) {
$('#open_file_upload').on("click",function(e){
e.preventDefault();
});
}
} else { } else {
} }
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment