Merge branch 'handler' of dan/ui into master
This commit is contained in:
commit
b3c5b08a74
|
@ -60,14 +60,14 @@ 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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
onPrependMessage: function(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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
function handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
var msg
|
var msg
|
||||||
try {
|
try {
|
||||||
msg = JSON.parse(message)
|
msg = JSON.parse(message)
|
||||||
|
|
|
@ -25,15 +25,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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
onPrependMessage: function(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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function handle(handle, from, displayName, message, image, mid, fromMe, ts) {
|
function handler(handle, from, displayName, message, image, mid, fromMe, ts) {
|
||||||
var msg
|
var msg
|
||||||
try {
|
try {
|
||||||
msg = JSON.parse(message)
|
msg = JSON.parse(message)
|
||||||
|
|
|
@ -59,15 +59,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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
onPrependMessage: function(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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
function handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
||||||
var msg
|
var msg
|
||||||
try {
|
try {
|
||||||
msg = JSON.parse(message)
|
msg = JSON.parse(message)
|
||||||
|
|
|
@ -53,15 +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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
onPrependMessage: function(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)
|
handler(handle, from, displayName, message, image, mid, fromMe, ts, ack, error)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function handle(handle, from, displayName, message, image, mid, fromMe, ts, ack, error) {
|
function handler(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