Updated version of /gamma

Tons of changes, included a new draft of the mobile version (still VERY rough)

1 files changed, 10 insertions, 10 deletions

diff --git a/frontend/gamma/js/Clipperz/PM/DataModel/User.js b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
index 72d4006..646ce21 100644
--- a/frontend/gamma/js/Clipperz/PM/DataModel/User.js
+++ b/frontend/gamma/js/Clipperz/PM/DataModel/User.js
@@ -43,9 +43,9 @@ Clipperz.PM.DataModel.User = function (args) {
 	this._connection = null;
 	this._connectionVersion = 'current';
 
 	this._serverData = null;
-	this._serverLockValue = null;
+//	this._serverLockValue = null;
 	this._transientState = null;
 
 	this._deferredLocks = {
 		'passphrase':			new MochiKit.Async.DeferredLock(),
@@ -92,17 +92,17 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 		return this._data;
 	},
 
 	//-------------------------------------------------------------------------
-
+/*
 	'serverLockValue': function () {
 		return this._serverLockValue;
 	},
 	
 	'setServerLockValue': function (aValue) {
 		this._serverLockValue = aValue;
 	},
-
+*/
 	//-------------------------------------------------------------------------
 
 	'transientState': function () {
 		if (this._transientState == null) {
@@ -219,10 +219,10 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 		deferredResult.addMethod(this, 'getPassphrase');
 		deferredResult.addMethod(this, 'prepareRemoteDataWithKey');
 		deferredResult.addCallbackPass(MochiKit.Signal.signal, Clipperz.Signal.NotificationCenter, 'advanceProgress');
 		deferredResult.addMethod(this.connection(), 'register');
-		deferredResult.addCallback(MochiKit.Base.itemgetter('lock'));
-		deferredResult.addMethod(this, 'setServerLockValue');
+//		deferredResult.addCallback(MochiKit.Base.itemgetter('lock'));
+//		deferredResult.addMethod(this, 'setServerLockValue');
 		deferredResult.addCallbackPass(MochiKit.Signal.signal,	Clipperz.Signal.NotificationCenter, 'userSuccessfullyRegistered');
 
 //		deferredResult.addErrback (MochiKit.Base.method(this, 'handleRegistrationFailure'));
 
@@ -246,9 +246,9 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 			MochiKit.Base.method(this.connection(), 'redeemOneTimePassword'),
 			MochiKit.Base.method(this.data(), 'setValue', 'passphrase')
 		], []));
 		deferredResult.addErrback(MochiKit.Base.method(this, 'getPassphrase'));
-		deferredResult.addMethod(this.connection(), 'login');
+		deferredResult.addMethod(this.connection(), 'login', false);
 		deferredResult.addCallbackPass(MochiKit.Signal.signal,	Clipperz.Signal.NotificationCenter, 'userSuccessfullyLoggedIn');
 		deferredResult.addErrback (MochiKit.Base.method(this, 'handleConnectionFallback'));
 
 		deferredResult.callback();
@@ -328,9 +328,9 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 		var preferences;
 		var oneTimePasswords;
 
 //console.log(">>> ***************** user.unpackServerData", someServerData);
-		this.setServerLockValue(someServerData['lock']);
+//		this.setServerLockValue(someServerData['lock']);
 
 		headerVersion = this.headerFormatVersion(someServerData['header']);
 	
 		switch (headerVersion) {
@@ -661,10 +661,10 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 			MochiKit.Base.method(this, 'invokeMethodNamedOnHeader', 'commitTransientState'),
 			MochiKit.Base.method(this, 'invokeMethodNamedOnRecords', 'commitTransientState'),
 
 			MochiKit.Base.method(this, 'transientState'),
-			MochiKit.Base.itemgetter('lock'),
-			MochiKit.Base.method(this, 'setServerLockValue'),
+//			MochiKit.Base.itemgetter('lock'),
+//			MochiKit.Base.method(this, 'setServerLockValue'),
 			MochiKit.Base.method(this, 'resetTransientState', true)
 		], {trace:false});
 	},
 
@@ -739,9 +739,9 @@ Clipperz.Base.extend(Clipperz.PM.DataModel.User, Object, {
 			
 			return aResult;
 		}, this), result);
 		deferredResult.addCallback(Clipperz.Async.setItem, result, 'version', Clipperz.PM.Crypto.encryptingFunctions.currentVersion);
-		deferredResult.addCallback(Clipperz.Async.setItem, result, 'lock', this.serverLockValue());
+//		deferredResult.addCallback(Clipperz.Async.setItem, result, 'lock', this.serverLockValue());
 		deferredResult.callback();
 
 		return deferredResult;
 	},