Merge branch 'handler' of dan/ui into master

This commit is contained in:
erinn 2019-04-10 12:25:08 -07:00 committed by Gogs
commit b3c5b08a74
4 changed files with 12 additions and 12 deletions

View File

@ -60,14 +60,14 @@ ColumnLayout {
}
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) {
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
try {
msg = JSON.parse(message)

View File

@ -25,15 +25,15 @@ ColumnLayout {
}
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) {
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
try {
msg = JSON.parse(message)

View File

@ -59,15 +59,15 @@ ColumnLayout {
}
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) {
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
try {
msg = JSON.parse(message)

View File

@ -53,15 +53,15 @@ ColumnLayout {
}
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) {
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
try {
msg = JSON.parse(message)