clipperz/password-manager-mirror
1
0
Fork 0
mirror of http://git.whoc.org.uk/git/password-manager.git synced 2025-10-28 18:07:35 +01:00
Code Issues Releases Wiki Activity

Fixes to release developer preview of the /delta version

Browse Source 
/delta needs an updated backend to support its payment options.
/beta and /gamma have been updated to be compatible with the new backend.
This commit is contained in:
Giulio Cesare Solaroli
2014-10-09 13:55:45 +02:00
parent 093d5e7965
commit b3967dae52
30 changed files with 784 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/delta/html/index_template.html
View File

@@ -107,7 +107,7 @@ Clipperz_normalizedNewLine = '\x0d\x0a';
/*offline_data_placeholder*/
</script>
<!-- div class="testBlock">
<div class="testBlock">
<script type="text/javascript" src="./js/TestData/User.data.js" charset="utf-8"></script>
<script>
var dataStore = new Clipperz.PM.Proxy.Offline.DataStore({
@@ -122,7 +122,7 @@ Clipperz_normalizedNewLine = '\x0d\x0a';
// Live Reload hoock
document.write('<script src="http://' + (location.host || 'localhost').split(':')[0] + ':35729/livereload.js?snipver=1"></' + 'script>')
</script>
</div -->
</div>
</body>
</html>

5
frontend/delta/js/Clipperz/PM/DataModel/EncryptedRemoteObject.js
View File

@@ -342,6 +342,7 @@ Clipperz.PM.DataModel.EncryptedRemoteObject.prototype = MochiKit.Base.update(nul
var innerDeferredResult;
if (this._objectDataStore == null) {
//console.log("EncryptedRemoteObject._getObjectDataStore", this._reference);
this._objectDataStore = new Clipperz.KeyValueObjectStore(/*{'name':'EncryptedRemoteObject.objectDataStore [4]'}*/);
innerDeferredResult = new Clipperz.Async.Deferred("EncryptedRemoteObject._getObjectDataStore <inner deferred>", {trace:false});
@@ -396,9 +397,10 @@ Clipperz.PM.DataModel.EncryptedRemoteObject.prototype = MochiKit.Base.update(nul
var tempObj = this;
if (this.isBrandNew()) {
// deferredResult = MochiKit.Async.succeed(true);
//console.log("EncrypedRemoteObject.hasPendingChanges - isBrandNew");
deferredResult = this.hasPendingChangesWhenBrandNew();
} else if (this.hasInitiatedObjectDataStore()) {
//console.log("EncrypedRemoteObject.hasPendingChanges - hasInitiatedObjectDataStore == true");
deferredResult = new Clipperz.Async.Deferred("EncryptedRemoteObject.hasPendingChanges", {trace:false});
deferredResult.collectResults({
'decryptedData': [
@@ -416,6 +418,7 @@ Clipperz.PM.DataModel.EncryptedRemoteObject.prototype = MochiKit.Base.update(nul
});
deferredResult.callback();
} else {
//console.log("EncrypedRemoteObject.hasPendingChanges - hasInitiatedObjectDataStore == false");
deferredResult = MochiKit.Async.succeed(false);
}

4
frontend/delta/js/main.js
View File

@@ -80,7 +80,7 @@ function run () {
MochiKit.DOM.addLoadEvent(run);
/* * /
/* */
MochiKit.DOM.addLoadEvent(simulateLogin);
function simulateLogin () {
var getURLParameter = function (name) {
@@ -99,4 +99,4 @@ function simulateLogin () {
MochiKit.Signal.signal(Clipperz.Signal.NotificationCenter, 'doLogin', {username:getURLParameter('u'), passphrase:getURLParameter('p')});
}
}
/ * */
/* */