Skip to content
Permalink
Browse files Browse the repository at this point in the history
Bump up to v1.1.7
  • Loading branch information
valeriansaliou committed Jan 26, 2017
1 parent 53b1621 commit ea6de7c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 8 deletions.
6 changes: 3 additions & 3 deletions CHANGELOG.md
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion VERSION
@@ -1 +1 @@
Primo [1.1.7~dev]
Primo [1.1.7]
11 changes: 7 additions & 4 deletions app/javascripts/carbons.js
Expand Up @@ -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;
Expand Down Expand Up @@ -238,4 +241,4 @@ var Carbons = (function () {
*/
return self;

})();
})();

0 comments on commit ea6de7c

Please sign in to comment.