Commit c15bcf0a authored by JC Brand's avatar JC Brand

Bugfix. Menu slid up again after ending OTR session.

parent cd3540de
...@@ -529,7 +529,7 @@ ...@@ -529,7 +529,7 @@
// query message from our buddy. Otherwise, it is us who will // query message from our buddy. Otherwise, it is us who will
// send the query message to them. // send the query message to them.
this.save({'otr_status': UNENCRYPTED}); this.save({'otr_status': UNENCRYPTED});
session = this.getSession(); var session = this.getSession();
this.otr = new otr.OTR({ this.otr = new otr.OTR({
fragment_size: 140, fragment_size: 140,
send_interval: 200, send_interval: 200,
...@@ -1045,6 +1045,10 @@ ...@@ -1045,6 +1045,10 @@
}, },
endOTR: function (ev) { endOTR: function (ev) {
if (typeof ev !== "undefined") {
ev.preventDefault();
ev.stopPropagation();
}
this.model.endOTR(); this.model.endOTR();
}, },
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment