Comunic/ComunicWeb
1
0
Fork 0
mirror of https://github.com/pierre42100/ComunicWeb synced 2025-11-03 19:54:14 +00:00
Code Issues Projects Releases Wiki Activity

Start to anchor video calls

Browse Source
This commit is contained in:
Pierre HUBERT
2020-04-13 11:18:04 +02:00
parent 3961e79491
commit b1dd0d1dd4
9 changed files with 85 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
assets/js/pages/conversations/conversation.js
View File

@@ -334,7 +334,7 @@ const ConversationPageConvPart = {
//Enable / update slimscroll
var target = ComunicWeb.pages.conversations.conversation._conv_info.window.messagesTarget;
var scrollBottom = $(target).prop("scrollHeight")+"px";
ComunicWeb.pages.conversations.utils.enableSlimScroll(target, ComunicWeb.pages.conversations.utils.getAvailableHeight(), scrollBottom);
//ComunicWeb.pages.conversations.utils.enableSlimScroll(target, "100%", scrollBottom);
}, 100);
}
@@ -580,10 +580,10 @@ const ConversationPageConvPart = {
newScrollPos = oldestMessage.offsetTop - 30;
if(newScrollPos < 0)
newScrollPos = 0;
ComunicWeb.pages.conversations.utils.enableSlimScroll(
convInfo.window.messagesTarget,
ComunicWeb.pages.conversations.utils.getAvailableHeight(),
newScrollPos);
/*ComunicWeb.pages.conversations.utils.enableSlimScroll(
convInfo.window.messagesTarget,
"100%",
newScrollPos);*/
});
});
},

8
assets/js/pages/conversations/main.js
View File

@@ -23,6 +23,14 @@ ComunicWeb.pages.conversations.main = {
//Check if a conversation has to be opened
if(args.subfolder){
// Add a target for video calls
createElem2({
appendTo: container,
type: "div",
id: "target-for-video-call-"+this.getCurrentConversationID()
})
ComunicWeb.pages.conversations.conversation.open(this.getCurrentConversationID(), container);
}

4
assets/js/pages/conversations/utils.js
View File

@@ -10,14 +10,14 @@ ComunicWeb.pages.conversations.utils = {
* Enable slimscroll for the conversation element
*
* @param {HMTLElement} target The target for slimscroll
* @param {Number} height The available height for the element
* @param {Number|String} height The available height for the element
* @param {Number} pos Scroll position to go to
*/
enableSlimScroll: function(target, height, pos){
$(target).slimScroll({
scrollTo: pos + "px",
height: height + "px",
height: height + (typeof height == "number" ? "px" : ""),
});
},