mirror of
https://gitlab.linphone.org/BC/public/linphone-desktop.git
synced 2026-01-17 11:28:07 +00:00
Fix sip address selection.
Come back to Home after removing call history.
This commit is contained in:
parent
f9bafa8c7a
commit
0ff0fef7ed
2 changed files with 6 additions and 10 deletions
|
|
@ -64,9 +64,8 @@ SearchBox {
|
|||
secure: 0,
|
||||
visible: true,
|
||||
handler: function (entry) {
|
||||
var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory
|
||||
searchBox.launchVideoCall(entry.sipAddress)
|
||||
searchBox.closeMenu()
|
||||
searchBox.launchVideoCall(sipAddress)
|
||||
},
|
||||
visible: SettingsModel.videoEnabled && SettingsModel.outgoingCallsEnabled && SettingsModel.showStartVideoCallButton
|
||||
}, {
|
||||
|
|
@ -74,18 +73,16 @@ SearchBox {
|
|||
secure: 0,
|
||||
visible: true,
|
||||
handler: function (entry) {
|
||||
var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory
|
||||
searchBox.launchCall(entry.sipAddress)
|
||||
searchBox.closeMenu()
|
||||
searchBox.launchCall(sipAddress)
|
||||
},
|
||||
visible: SettingsModel.outgoingCallsEnabled
|
||||
}, {
|
||||
colorSet: SettingsModel.getShowStartChatButton() ? SipAddressesViewStyle.chat : SipAddressesViewStyle.history,
|
||||
secure: 0,
|
||||
handler: function (entry) {
|
||||
var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory
|
||||
searchBox.launchChat(entry.sipAddress)
|
||||
searchBox.closeMenu()
|
||||
searchBox.launchChat(sipAddress)
|
||||
},
|
||||
visible: SettingsModel.standardChatEnabled,
|
||||
zz: 'toto'
|
||||
|
|
@ -94,9 +91,8 @@ SearchBox {
|
|||
secure: 1,
|
||||
visible: SettingsModel.secureChatEnabled && AccountSettingsModel.conferenceUri != '',
|
||||
handler: function (entry) {
|
||||
var sipAddress = entry.sipAddress // closeMenu() will remove entry. Keep it in memory
|
||||
searchBox.launchSecureChat(entry.sipAddress)
|
||||
searchBox.closeMenu()
|
||||
searchBox.launchSecureChat(sipAddress)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -117,9 +113,8 @@ SearchBox {
|
|||
}
|
||||
|
||||
onEntryClicked: {
|
||||
var entryBackup = entry
|
||||
searchBox.entryClicked(entry)
|
||||
searchBox.closeMenu()
|
||||
searchBox.entryClicked(entryBackup)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ function removeAllEntries () {
|
|||
}, function (status) {
|
||||
if (status) {
|
||||
historyProxyModel.removeAllEntries()
|
||||
window.setView('Home')
|
||||
}
|
||||
})
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue