From caca12d423ea29a562f53adc8efa9ad3ccce5004 Mon Sep 17 00:00:00 2001 From: Dario Chiappetta Date: Tue, 24 Nov 2015 17:17:29 +0100 Subject: [PATCH] Attachment fixes and some more closed tickets --- frontend/delta/js/Clipperz/PM/Connection.js | 4 +- .../PM/UI/Components/ExtraFeatures/OTP.js | 51 ++++++++++++++----- .../js/Clipperz/PM/UI/Components/Help.js | 10 ++++ .../delta/js/Clipperz/PM/UI/MainController.js | 10 ++++ 4 files changed, 60 insertions(+), 15 deletions(-) diff --git a/frontend/delta/js/Clipperz/PM/Connection.js b/frontend/delta/js/Clipperz/PM/Connection.js index e8384fa..3b16568 100644 --- a/frontend/delta/js/Clipperz/PM/Connection.js +++ b/frontend/delta/js/Clipperz/PM/Connection.js @@ -516,7 +516,7 @@ Clipperz.log("<<< Connection.messageExceptionHandler") 'uploadAttachment': function(someArguments, aProgressCallback) { return Clipperz.Async.callbacks("Connction.uploadAttachment", [ - MochiKit.Base.method(this, 'message', 'knock', {'requestType':'MESSAGE'}), + MochiKit.Base.method(this, 'message', 'echo', {'echo':"echo"}), MochiKit.Base.method(this.proxy(), 'uploadAttachment', someArguments, aProgressCallback, this.sharedSecret()), ], {trace:false}); @@ -525,7 +525,7 @@ Clipperz.log("<<< Connection.messageExceptionHandler") 'downloadAttachment': function(someArguments, aProgressCallback) { return Clipperz.Async.callbacks("Connction.uploadAttachment", [ - MochiKit.Base.method(this, 'message', 'knock', {'requestType':'MESSAGE'}), + MochiKit.Base.method(this, 'message', 'echo', {'echo':"echo"}), MochiKit.Base.method(this.proxy(), 'downloadAttachment', someArguments, aProgressCallback, this.sharedSecret()), ], {trace:false}); diff --git a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js index 497f71c..695afc7 100644 --- a/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js +++ b/frontend/delta/js/Clipperz/PM/UI/Components/ExtraFeatures/OTP.js @@ -116,29 +116,54 @@ Clipperz.PM.UI.Components.ExtraFeatures.OTPClass = React.createClass({ '' + 'Active One Time Passwords - Clipperz' + '' + '' + '' + - '' + + // '' + + this.renderPrintedOtpList(filteredOtpList) + '' + '' ); - // newWindow.document.close(); - // newWindow.focus(); - // newWindow.print(); - // newWindow.close(); + newWindow.document.close(); + newWindow.focus(); + newWindow.print(); + newWindow.close(); + }, + + renderPrintedOtpList: function(aList) { + var result; + var i; + + var date = new Date(); + var header = '

Clipperz OTPs'+date.getDate()+'/'+date.getMonth()+'/'+date.getFullYear()+'

' + + result = '