summaryrefslogtreecommitdiff
path: root/frontend/gamma/js/Clipperz/PM/DataModel/User.js
Unidiff
Diffstat (limited to 'frontend/gamma/js/Clipperz/PM/DataModel/User.js') (more/less context) (show whitespace changes)
-rw-r--r--frontend/gamma/js/Clipperz/PM/DataModel/User.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
index fd18faf..b94fe4c 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
@@ -705,50 +705,50 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
705 return MochiKit.Async.succeed(MochiKit.Base.keys(this.transientState()).length != 0); 705 return MochiKit.Async.succeed(MochiKit.Base.keys(this.transientState()).length != 0);
706 }, this) 706 }, this)
707 }); 707 });
708 deferredResult.addCallback(Clipperz.Async.or); 708 deferredResult.addCallback(Clipperz.Async.or);
709 deferredResult.callback(); 709 deferredResult.callback();
710 710
711 return deferredResult; 711 return deferredResult;
712 }, 712 },
713 713
714 //========================================================================= 714 //=========================================================================
715 715
716 'prepareRemoteDataWithKey': function (aKey /*, aCurrentKey*/) { 716 'prepareRemoteDataWithKey': function (aKey /*, aCurrentKey*/) {
717 var deferredResult; 717 var deferredResult;
718 varresult; 718 varresult;
719 719
720 result = {}; 720 result = {};
721 deferredResult = new Clipperz.Async.Deferred("User.prepareRemoteDataWithKey", {trace:false}); 721 deferredResult = new Clipperz.Async.Deferred("User.prepareRemoteDataWithKey", {trace:false});
722 deferredResult.addMethod(this, 'invokeMethodNamedOnHeader', 'prepareRemoteDataWithKey', aKey /*, aCurrentKey*/); 722 deferredResult.addMethod(this, 'invokeMethodNamedOnHeader', 'prepareRemoteDataWithKey', aKey /*, aCurrentKey*/);
723 deferredResult.addCallback(MochiKit.Base.bind(function (aResult, someHeaderPackedData) { 723 deferredResult.addCallback(MochiKit.Base.bind(function (aResult, someHeaderPackedData) {
724 var header; 724 var header;
725 725
726 header = {}; 726 header = {};
727 header['records'] = someHeaderPackedData['recordIndex']['records']; 727 header['records'] = someHeaderPackedData['recordIndex']['records'];
728 header['directLogins'] = someHeaderPackedData['recordIndex']['directLogins']; 728 header['directLogins'] = someHeaderPackedData['recordIndex']['directLogins'];
729 header['preferences'] = {'data': someHeaderPackedData['preferences']['data']}; // this._serverData['header']['preferences']; // Clipperz.Base.evalJSON(this._serverData['header']['data'])['preferences']; //??????????? 729 header['preferences'] = {'data': someHeaderPackedData['preferences']['data']};
730 header['oneTimePasswords'] = {'data': someHeaderPackedData['oneTimePasswords']['data']}; // this._serverData['header']['oneTimePasswords']; // Clipperz.Base.evalJSON(this._serverData['header']['data'])['oneTimePasswords']; //??????????? 730 header['oneTimePasswords']= {'data': someHeaderPackedData['oneTimePasswords']['data']};
731 header['version'] = '0.1'; 731 header['version'] = '0.1';
732 732
733 aResult['header'] = Clipperz.Base.serializeJSON(header); 733 aResult['header'] = Clipperz.Base.serializeJSON(header);
734 aResult['statistics'] = this._serverData['statistics']; //"someHeaderPackedData['statistics']['data']"; 734 aResult['statistics'] = this._serverData['statistics']; //"someHeaderPackedData['statistics']['data']";
735 735
736 return aResult; 736 return aResult;
737 }, this), result); 737 }, this), result);
738 deferredResult.addCallback(Clipperz.Async.setItem, result, 'version', Clipperz.PM.Crypto.encryptingFunctions.currentVersion); 738 deferredResult.addCallback(Clipperz.Async.setItem, result, 'version', Clipperz.PM.Crypto.encryptingFunctions.currentVersion);
739 // deferredResult.addCallback(Clipperz.Async.setItem, result, 'lock', this.serverLockValue()); 739 // deferredResult.addCallback(Clipperz.Async.setItem, result, 'lock', this.serverLockValue());
740 deferredResult.callback(); 740 deferredResult.callback();
741 741
742 return deferredResult; 742 return deferredResult;
743 }, 743 },
744 744
745 //========================================================================= 745 //=========================================================================
746 746
747 'saveChanges': function () { 747 'saveChanges': function () {
748 vardeferredResult; 748 vardeferredResult;
749 var messageParameters; 749 var messageParameters;
750 750
751 messageParameters = {}; 751 messageParameters = {};
752 752
753 deferredResult = new Clipperz.Async.Deferred("User.saveChangaes", {trace:false}); 753 deferredResult = new Clipperz.Async.Deferred("User.saveChangaes", {trace:false});
754 754