diff options
| author | Valerian Saliou <valerian@valeriansaliou.name> | 2017-01-26 18:47:28 +0300 |
|---|---|---|
| committer | Valerian Saliou <valerian@valeriansaliou.name> | 2017-01-26 18:47:28 +0300 |
| commit | ea6de7c65b80880bdf85df47c1a8a5d3d68491af (patch) | |
| tree | 4024ed3ec55873b6e944054067c1ef65e48887a4 | |
| parent | 53b16217d247897af04e67a5dd80e07a53b8edc1 (diff) | |
Bump up to v1.1.71.1.7
| -rw-r--r-- | CHANGELOG.md | 6 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | app/javascripts/carbons.js | 11 |
3 files changed, 11 insertions, 8 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 6447a63c..3e333587 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,10 @@ Jappix Changelog Here's the log of what has changed over the Jappix releases. -Primo, v1.1.7 (Development) ---------------------------- +Primo, v1.1.7 (January 2017) +---------------------------- - * (...) + * Improve Carbons @valeriansaliou Primo, v1.1.6 (August 2015) @@ -1 +1 @@ -Primo [1.1.7~dev] +Primo [1.1.7] diff --git a/app/javascripts/carbons.js b/app/javascripts/carbons.js index 4635b94c..220f771a 100644 --- a/app/javascripts/carbons.js +++ b/app/javascripts/carbons.js @@ -127,10 +127,13 @@ var Carbons = (function () { self._getForwarded = function(message) { try { - var forwarded_message = $(message.getNode()).find('forwarded[xmlns="' + NS_URN_FORWARD + '"]:first message:first'); + // Check message is forwarded from our local user + if(Common.bareXID(Common.getStanzaFrom(message)) == Common.getXID()) { + var forwarded_message = $(message.getNode()).find('forwarded[xmlns="' + NS_URN_FORWARD + '"]:first message:first'); - if(forwarded_message[0]) { - return JSJaCPacket.wrapNode(forwarded_message[0]); + if(forwarded_message[0]) { + return JSJaCPacket.wrapNode(forwarded_message[0]); + } } return null; @@ -238,4 +241,4 @@ var Carbons = (function () { */ return self; -})();
\ No newline at end of file +})(); |