diff options
author | Melissa Noelle <madamei@mojolingo.com> | 2015-02-18 18:53:23 +0300 |
---|---|---|
committer | Melissa Noelle <madamei@mojolingo.com> | 2015-02-18 18:53:23 +0300 |
commit | ed0e57722a1fe96c03dba90648de51eda1b6eb80 (patch) | |
tree | 114925b0ef77fad82f7a326b7a488eaec49c0828 | |
parent | 895d068606b179aeca2d8c3d471ac426b8662aba (diff) |
Add stanza to before-render and after-render.
-rw-r--r-- | src/view/observer.js | 2 | ||||
-rw-r--r-- | src/view/pane/message.js | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/view/observer.js b/src/view/observer.js index a6dcdc8..e826346 100644 --- a/src/view/observer.js +++ b/src/view/observer.js @@ -304,7 +304,7 @@ Candy.View.Observer = (function(self, $) { // Message received from alternative resource. Release the resource lock. room.targetJid = args.roomJid; } - Candy.View.Pane.Message.show(args.roomJid, args.message.name, args.message.body, args.message.xhtmlMessage, args.timestamp, args.message.from, args.carbon); + Candy.View.Pane.Message.show(args.roomJid, args.message.name, args.message.body, args.message.xhtmlMessage, args.timestamp, args.message.from, args.carbon, args.stanza); } }; diff --git a/src/view/pane/message.js b/src/view/pane/message.js index 85fbd4c..2e3a851 100644 --- a/src/view/pane/message.js +++ b/src/view/pane/message.js @@ -97,7 +97,7 @@ Candy.View.Pane = (function(self, $) { * candy.view.message.before-render using {template, templateData} * candy:view.message.after-show using {roomJid, name, message, element} */ - show: function(roomJid, name, message, xhtmlMessage, timestamp, from, carbon) { + show: function(roomJid, name, message, xhtmlMessage, timestamp, from, carbon, stanza) { message = Candy.Util.Parser.all(message.substring(0, Candy.View.getOptions().crop.message.body)); if(Candy.View.getOptions().enableXHTML === true && xhtmlMessage) { xhtmlMessage = Candy.Util.parseAndCropXhtml(xhtmlMessage, Candy.View.getOptions().crop.message.body); @@ -120,7 +120,8 @@ Candy.View.Pane = (function(self, $) { 'name': name, 'message': message, 'xhtmlMessage': xhtmlMessage, - 'from': from + 'from': from, + 'stanza': stanza }; /** Event: candy:view.message.before-show @@ -158,7 +159,8 @@ Candy.View.Pane = (function(self, $) { timestamp: timestamp.toISOString(), roomjid: roomJid, from: from - } + }, + stanza: stanza }; /** Event: candy:view.message.before-render |