Merge branch 'qt512fix' of dan/ui into master
This commit is contained in:
commit
7ce73ec89d
|
@ -59,9 +59,13 @@ ColumnLayout {
|
||||||
jsonModel4.clear()
|
jsonModel4.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
onAppendMessage: handle
|
onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
onPrependMessage: handle
|
onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
var msg
|
var msg
|
||||||
|
|
|
@ -24,9 +24,14 @@ ColumnLayout {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
onAppendMessage: handle
|
onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
onPrependMessage: handle
|
|
||||||
|
|
||||||
function handle(handle, from, displayName, message, image, mid, fromMe, ts) {
|
function handle(handle, from, displayName, message, image, mid, fromMe, ts) {
|
||||||
var msg
|
var msg
|
||||||
|
|
|
@ -58,9 +58,14 @@ ColumnLayout {
|
||||||
jsonModel4.clear()
|
jsonModel4.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
onAppendMessage: handle
|
onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
onPrependMessage: handle
|
|
||||||
|
|
||||||
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
var msg
|
var msg
|
||||||
|
|
|
@ -53,6 +53,15 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
|
|
||||||
onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
onAppendMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
onPrependMessage: function(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
|
handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
var msg
|
var msg
|
||||||
try {
|
try {
|
||||||
msg = JSON.parse(message)
|
msg = JSON.parse(message)
|
||||||
|
|
Reference in New Issue