Skip to content

Commit ea6de7c

Browse files
Bump up to v1.1.7
1 parent 53b1621 commit ea6de7c

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

Diff for: CHANGELOG.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ Jappix Changelog
44
Here's the log of what has changed over the Jappix releases.
55

66

7-
Primo, v1.1.7 (Development)
8-
---------------------------
7+
Primo, v1.1.7 (January 2017)
8+
----------------------------
99

10-
* (...)
10+
* Improve Carbons @valeriansaliou
1111

1212

1313
Primo, v1.1.6 (August 2015)

Diff for: VERSION

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Primo [1.1.7~dev]
1+
Primo [1.1.7]

Diff for: app/javascripts/carbons.js

+7-4
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,13 @@ var Carbons = (function () {
127127
self._getForwarded = function(message) {
128128

129129
try {
130-
var forwarded_message = $(message.getNode()).find('forwarded[xmlns="' + NS_URN_FORWARD + '"]:first message:first');
130+
// Check message is forwarded from our local user
131+
if(Common.bareXID(Common.getStanzaFrom(message)) == Common.getXID()) {
132+
var forwarded_message = $(message.getNode()).find('forwarded[xmlns="' + NS_URN_FORWARD + '"]:first message:first');
131133

132-
if(forwarded_message[0]) {
133-
return JSJaCPacket.wrapNode(forwarded_message[0]);
134+
if(forwarded_message[0]) {
135+
return JSJaCPacket.wrapNode(forwarded_message[0]);
136+
}
134137
}
135138

136139
return null;
@@ -238,4 +241,4 @@ var Carbons = (function () {
238241
*/
239242
return self;
240243

241-
})();
244+
})();

0 commit comments

Comments
 (0)