clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2024-11-14 18:29:02 +01:00
Code Issues Releases Wiki Activity

Fixed Dev backend simulated network behaviour and minor code cleanup

Browse Source
This commit is contained in:
Dario Chiappetta 2015-11-25 11:42:18 +01:00
parent 8b7a438039
commit 0abd559e81
5 changed files with 23 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/delta/js/Clipperz/PM/Connection.js
View File

@ -510,18 +510,12 @@ Clipperz.log("<<< Connection.messageExceptionHandler")
//=========================================================================
// 'uploadAttachment': function(someArguments, aProgressCallback) {
// return this.message('uploadAttachment', someArguments, {'uploadProgressCallback': aProgressCallback});
// },
'uploadAttachment': function(someArguments, aProgressCallback) {
return Clipperz.Async.callbacks("Connction.uploadAttachment", [
MochiKit.Base.method(this, 'message', 'echo', {'echo':"echo"}),
MochiKit.Base.bind(function(){ return this.sharedSecret()}, this),
MochiKit.Base.method(this.proxy(), 'uploadAttachment', someArguments, aProgressCallback/*, this.sharedSecret()*/),
], {trace:false});
// return this.proxy().uploadAttachment(someArguments, aProgressCallback, this.sharedSecret());
},
'downloadAttachment': function(someArguments, aProgressCallback) {
@ -530,8 +524,6 @@ Clipperz.log("<<< Connection.messageExceptionHandler")
MochiKit.Base.bind(function(){ return this.sharedSecret()}, this),
MochiKit.Base.method(this.proxy(), 'downloadAttachment', someArguments, aProgressCallback/*, this.sharedSecret()*/),
], {trace:false});
// return this.proxy().downloadAttachment(someArguments, aProgressCallback, this.sharedSecret());
},
//=========================================================================

3
frontend/delta/js/Clipperz/PM/Proxy/Proxy.JSON.js
View File

@ -102,7 +102,6 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.JSON, Clipperz.PM.Proxy, {
//-------------------------------------------------------------------------
// TODO: test
'_uploadAttachment': function(someArguments, aProgressCallback, aSharedSecret, aToll) {
var formData;
var deferredResult;
@ -142,7 +141,6 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.JSON, Clipperz.PM.Proxy, {
throw someValues['message'];
}
// TODO: check return value with actual request. Expected: ArrayBuffer
return someValues;
});
@ -151,7 +149,6 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.JSON, Clipperz.PM.Proxy, {
return deferredResult;
},
// TODO: test
'_downloadAttachment': function(someArguments, aProgressCallback, aSharedSecret, aToll) {
var deferredResult;
var parameters;

31
frontend/delta/js/Clipperz/PM/Proxy/Proxy.Offline.DataStore.js
View File

@ -281,6 +281,11 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
uploadAttachment: function(someArguments, aProgressCallback, aSharedSecret, aToll) {
var connection = this.currentStaticConnection();
var attachmentReference = someArguments['attachmentReference'];
var payloadSize = someArguments['arrayBufferData'].length;
var resultValue = {
result: {},
toll: this.getTollForRequestType('MESSAGE')
};
if (this.isReadOnly() == false) {
connection['userData']['attachments'][attachmentReference] = {
@ -290,10 +295,10 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
'version': someArguments['version'],
};
return this.simulateNetworkDelayResponse(someArguments['arrayBufferData'].length, aProgressCallback, {
result: {},
toll: this.getTollForRequestType('MESSAGE')
});
return Clipperz.Async.callbacks("Proxy.Offline.DataStore.uploadAttachment", [
MochiKit.Base.method(this, 'simulateNetworkDelay', payloadSize, aProgressCallback, resultValue),
function () { return resultValue; },
], {trace:false});
} else {
throw Clipperz.PM.Proxy.Offline.DataStore.exception.ReadOnly;
}
@ -302,15 +307,19 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
downloadAttachment: function(someArguments, aProgressCallback, aSharedSecret, aToll) {
var connection = this.currentStaticConnection();
var reference = someArguments['reference'];
var result = connection['userData']['attachments'][reference]['data'];
return this.simulateNetworkDelayResponse(result.length, aProgressCallback, {
result: result,
var resultData = connection['userData']['attachments'][reference]['data'];
var resultValue = {
result: resultData,
// toll: this.getTollForRequestType('MESSAGE')
});
};
return Clipperz.Async.callbacks("Proxy.Offline.DataStore.downloadAttachment", [
MochiKit.Base.method(this, 'simulateNetworkDelay', resultData.length, aProgressCallback, resultValue),
function () { return resultValue; },
], {trace:false});
},
simulateNetworkDelayResponse: function(payloadSize, progressCallback, aResponse) {
simulateNetworkDelay: function(payloadSize, progressCallback) {
var deferredResult;
var i;
@ -322,8 +331,6 @@ Clipperz.Base.extend(Clipperz.PM.Proxy.Offline.DataStore, Object, {
deferredResult.addMethod(this, 'runProgressCallback', progressCallback, loaded, payloadSize);
}
deferredResult.addCallback(MochiKit.Async.succeed, aResponse);
deferredResult.callback();
return deferredResult;

2
frontend/delta/js/Clipperz/PM/UI/Components/Cards/Edit.js
View File

@ -696,7 +696,7 @@ console.log("DROP"); //, anEvent);
'progress': aProgress,
'border': 1
});
} else if (! broken /* && aStatus != 'DONE' && aStatus != 'FAILED' */ && aServerStatus != 'AVAILABLE' && queueOperationsInProgress) {
} else if (! broken && aServerStatus != 'AVAILABLE' && queueOperationsInProgress) {
result = Clipperz.PM.UI.Components.RadialProgressIndicator({
'progress': 0,
'border': 1,

17
frontend/delta/js/Clipperz/PM/UI/Components/Cards/View.js
View File

@ -265,7 +265,6 @@ Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
renderAttachmentProgress: function(aStatus, aServerStatus, aProgress) {
var result;
var broken = (! aServerStatus && (! aStatus || aStatus == 'CANCELED' || aStatus == 'FAILED' || aStatus == 'DONE'));
var queueOperationsInProgress = (aStatus != 'DONE' && aStatus != 'CANCELED' && aStatus != 'FAILED');
result = null;
@ -274,7 +273,7 @@ Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
'progress': aProgress,
'border': 1
});
} else if (! broken && queueOperationsInProgress /* && aServerStatus != 'AVAILABLE'*/) {
} else if (queueOperationsInProgress) {
result = Clipperz.PM.UI.Components.RadialProgressIndicator({
'progress': 0,
'border': 1,
@ -337,19 +336,6 @@ Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
}, "remove field");
}
// result = null;
// if (aStatus == 'DOWNLOADING') {
// result = React.DOM.a({
// 'className': 'cancel',
// 'onClick': MochiKit.Base.method(this, 'handleCancelDownload', anAttachment)
// }, "remove field");
// } else if (aServerStatus == 'AVAILABLE' && ! queueOperationsInProgress) {
// result = React.DOM.a({
// 'className': 'download',
// 'onClick': MochiKit.Base.method(this, 'handleGetAttachment', anAttachment),
// }, "\u2b07");
// }
return result;
},
@ -389,7 +375,6 @@ Clipperz.PM.UI.Components.Cards.ViewClass = React.createClass({
renderAttachments: function(someAttachments) {
var result;
//console.log("View props:", this.props, someAttachments);
if (someAttachments.length > 0) {
result = React.DOM.div({'className': 'cardAttachments'}, [
React.DOM.h3({'className': 'summaryText'}, "Attachments"),