Commit 3d4d3996 by Lee Munkyeong

Merge branch 'feature/43223' into 'develop'

協業画面が最初レンダリングされる時ローディングバー追加。

See merge request !185
parents 63be3aff 7b2db678
...@@ -142,6 +142,11 @@ ...@@ -142,6 +142,11 @@
<div style="vertical-align: middle;display: table-cell;">協業中 <div style="vertical-align: middle;display: table-cell;">協業中
</div> </div>
</div> </div>
<div class="before_loading_indicator">
<div id="page_loader" class="before_loading_indicator">
<i class="fa fa-circle-o-notch fa-spin fa-1x fa-fw"></i>
</div>
</div>
<script src="./js/libs/jquery-3.3.1.min.js"></script> <script src="./js/libs/jquery-3.3.1.min.js"></script>
<script src="./js/libs/socket.io.js"></script> <script src="./js/libs/socket.io.js"></script>
<script src="./js/libs/moment.js"></script> <script src="./js/libs/moment.js"></script>
......
...@@ -887,6 +887,32 @@ input[name="tab_item"] { ...@@ -887,6 +887,32 @@ input[name="tab_item"] {
text-align: center; text-align: center;
} }
.before_loading_indicator {
display: table;
vertical-align: middle;
font-size: xxx-large;
top: 0px;
width: 100%;
height: 100vh;
background-color: black;
position: fixed;
z-index: 1001;
text-align: center;
}
#page_loader {
position: fixed;
top: 50%;
left: 50%;
width: 200px;
height: 200px;
margin-top: -100px;
margin-left: -100px;
text-align: center;
color: #fff;
z-index: 999;
}
@media screen and (max-width: 768px) { @media screen and (max-width: 768px) {
/* chat item */ /* chat item */
.tab_item { .tab_item {
......
...@@ -685,7 +685,7 @@ function scrollLockOFF() { ...@@ -685,7 +685,7 @@ function scrollLockOFF() {
}); });
} }
function initCollaborationUI(changeCollaborationType) { async function initCollaborationUI(changeCollaborationType) {
$("#coviewEraserCtrBtn").click(); $("#coviewEraserCtrBtn").click();
if ($(".user_btn").hasClass("hide")) { if ($(".user_btn").hasClass("hide")) {
$(".user_btn").click(); $(".user_btn").click();
...@@ -752,6 +752,8 @@ function initCollaborationUI(changeCollaborationType) { ...@@ -752,6 +752,8 @@ function initCollaborationUI(changeCollaborationType) {
); );
break; break;
} }
await waitMillisecond(1000);
$(".before_loading_indicator").addClass("none");
} }
function Coview_exitCollaboration(isDocument = false) { function Coview_exitCollaboration(isDocument = false) {
...@@ -1187,3 +1189,7 @@ function requestCollaborationFinish() { ...@@ -1187,3 +1189,7 @@ function requestCollaborationFinish() {
); );
} }
} }
async function waitMillisecond(millesecond) {
await new Promise(done => setTimeout(() => done(), millesecond));
}
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