Skip to content

Commit 8a55e4b

Browse files
committed
bump version
1 parent 04c89ed commit 8a55e4b

File tree

5 files changed

+24
-15
lines changed

5 files changed

+24
-15
lines changed

bower.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "otr",
3-
"version": "0.2.13",
3+
"version": "0.2.14",
44
"main": "build/otr.js",
55
"ignore": [
66
"**/.*",

build/otr.js

+12-9
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*!
22
3-
otr.js v0.2.13 - 2014-09-07
4-
(c) 2014 - Arlo Breault <[email protected]>
3+
otr.js v0.2.14 - 2015-01-16
4+
(c) 2015 - Arlo Breault <[email protected]>
55
Freely distributed under the MPL v2.0 license.
66
77
This file is concatenated for the browser.
@@ -1620,10 +1620,12 @@
16201620

16211621
this.smpstate = CONST.SMPSTATE_EXPECT0
16221622

1623-
// assume utf8 question
1624-
question = CryptoJS.enc.Latin1
1625-
.parse(question)
1626-
.toString(CryptoJS.enc.Utf8)
1623+
if (question) {
1624+
// assume utf8 question
1625+
question = CryptoJS.enc.Latin1
1626+
.parse(question)
1627+
.toString(CryptoJS.enc.Utf8)
1628+
}
16271629

16281630
// invoke question
16291631
this.trigger('question', [question])
@@ -2410,7 +2412,8 @@
24102412

24112413
// utf8 inputs
24122414
secret = CryptoJS.enc.Utf8.parse(secret).toString(CryptoJS.enc.Latin1)
2413-
question = CryptoJS.enc.Utf8.parse(question).toString(CryptoJS.enc.Latin1)
2415+
if (question)
2416+
question = CryptoJS.enc.Utf8.parse(question).toString(CryptoJS.enc.Latin1)
24142417

24152418
this.sm.rcvSecret(secret, question)
24162419
}
@@ -2473,7 +2476,7 @@
24732476
if (msg) this.io(msg, meta)
24742477
}
24752478

2476-
OTR.prototype.receiveMsg = function (msg) {
2479+
OTR.prototype.receiveMsg = function (msg, meta) {
24772480

24782481
// parse type
24792482
msg = Parse.parseMsg(this, msg)
@@ -2524,7 +2527,7 @@
25242527
this.doAKE(msg)
25252528
}
25262529

2527-
if (msg.msg) this.trigger('ui', [msg.msg, !!msg.encrypted])
2530+
if (msg.msg) this.trigger('ui', [msg.msg, !!msg.encrypted, meta])
25282531
}
25292532

25302533
OTR.prototype.checkInstanceTags = function (it) {

build/otr.min.js

+4-4
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

changelog.md

+6
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11

2+
0.2.14 / 2015-01-16
3+
===================
4+
5+
* add an option to attach metadata to incoming messages
6+
* send type 2 TLV when no question is supplied
7+
28
0.2.13 / 2014-09-07
39
===================
410

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "otr",
3-
"version": "0.2.13",
3+
"version": "0.2.14",
44
"description": "Off-the-Record Messaging Protocol",
55
"homepage": "https://github.com/arlolra/otr",
66
"main": "index.js",

0 commit comments

Comments
 (0)