lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-08-06 07:45:51 +02:00
Code Activity

messagewebview: reload mainview if webengineview does not finish loading js

Browse source 
Gitlab: #134
Change-Id: I0d6406b80ad80cc7278e395bd51d0d7b02538aa0
This commit is contained in:
Ming Rui Zhang 2020-10-06 14:19:28 -04:00 • committed by Andreas Traczyk
parent 3e5ee2fb8e
commit 54093e5c96
2 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/mainview/MainView.qml
View file

@ -177,6 +177,19 @@ Window {
// ConversationSmartListViewItemDelegate provides UI information // ConversationSmartListViewItemDelegate provides UI information
function setMainView(currentUserDisplayName, currentUserAlias, currentUID, function setMainView(currentUserDisplayName, currentUserAlias, currentUID,
callStackViewShouldShow, isAudioOnly, callState) { callStackViewShouldShow, isAudioOnly, callState) {
if (!(communicationPageMessageWebView.jsLoaded)) {
communicationPageMessageWebView.jsLoadedChanged.connect(
function(currentUserDisplayName, currentUserAlias, currentUID,
callStackViewShouldShow, isAudioOnly, callState) {
return function() {
setMainView(currentUserDisplayName, currentUserAlias, currentUID,
callStackViewShouldShow, isAudioOnly, callState)
}
}(currentUserDisplayName, currentUserAlias, currentUID,
callStackViewShouldShow, isAudioOnly, callState))
return
}
if (callStackViewShouldShow) { if (callStackViewShouldShow) {
if (inSettingsView) { if (inSettingsView) {
toggleSettingsView() toggleSettingsView()

4
src/mainview/components/MessageWebView.qml
View file

@ -32,6 +32,7 @@ Rectangle {
property int messageWebViewHeaderPreferredHeight: 64 property int messageWebViewHeaderPreferredHeight: 64
property string headerUserAliasLabelText: "" property string headerUserAliasLabelText: ""
property string headerUserUserNameLabelText: "" property string headerUserUserNameLabelText: ""
property bool jsLoaded: false
signal needToHideConversationInCall signal needToHideConversationInCall
@ -256,7 +257,8 @@ Rectangle {
messageWebView.runJavaScript(UtilsAdapter.qStringFromFile( messageWebView.runJavaScript(UtilsAdapter.qStringFromFile(
":/qwebchannel.js")) ":/qwebchannel.js"))
messageWebView.runJavaScript(UtilsAdapter.qStringFromFile( messageWebView.runJavaScript(UtilsAdapter.qStringFromFile(
":/chatview.js")) ":/chatview.js"),
function(){jsLoaded = true})
messageWebView.runJavaScript("init_i18n();") messageWebView.runJavaScript("init_i18n();")
messageWebView.runJavaScript("displayNavbar(false);") messageWebView.runJavaScript("displayNavbar(false);")
} }