bump version

arlolra · May 5, 2015 · 158621a · 158621a
1 parent c96ace9
commit 158621a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 7 deletions.
diff --git a/build/otr.js b/build/otr.js
@@ -1,6 +1,6 @@
 /*!
 
- otr.js v0.2.14 - 2015-01-16
+ otr.js v0.2.15 - 2015-05-04
  (c) 2015 - Arlo Breault <[email protected]>
  Freely distributed under the MPL v2.0 license.
 
@@ -2118,8 +2118,12 @@
  OTR.prototype.io = function (msg, meta) {
 
  // buffer
- msg = ([].concat(msg)).map(function(m){
- return { msg: m, meta: meta }
+ msg = ([].concat(msg)).map(function(m, i, arr) {
+ var obj = { msg: m }
+ if (!(meta instanceof OTRCB) ||
+ i === (arr.length - 1) // only cb after last fragment is sent
+ ) obj.meta = meta
+ return obj
  })
  this.outgoing = this.outgoing.concat(msg)
 
@@ -2608,7 +2612,9 @@
  if (this.smw) this.sm.worker.terminate() // destroy webworker
  this.sm = null
  }
- }
+ } else if (typeof cb === 'function')
+ setTimeout(cb, 0)
+
  this.msgstate = CONST.MSGSTATE_PLAINTEXT
  this.receivedPlaintext = false
  this.trigger('status', [CONST.STATUS_END_OTR])

diff --git a/build/otr.min.js b/build/otr.min.js
diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,10 @@
 
+0.2.15 / 2015-05-04
+===================
+
+ * prevent end callback from getting called multiple times
+ * call end callback even when not in encrypted state
+
 0.2.14 / 2015-01-16
 ===================
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "otr",
- "version": "0.2.14",
+ "version": "0.2.15",
  "description": "Off-the-Record Messaging Protocol",
  "homepage": "https://github.com/arlolra/otr",
  "main": "index.js",