summaryrefslogtreecommitdiff
path: root/frontend
Unidiff
Diffstat (limited to 'frontend') (more/less context) (ignore whitespace changes)
-rw-r--r--frontend/beta/js/Clipperz/PM/DataModel/Record.js9
-rw-r--r--frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js2
2 files changed, 5 insertions, 6 deletions
diff --git a/frontend/beta/js/Clipperz/PM/DataModel/Record.js b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
index d6ebb39..f89f79c 100644
--- a/frontend/beta/js/Clipperz/PM/DataModel/Record.js
+++ b/frontend/beta/js/Clipperz/PM/DataModel/Record.js
@@ -258,71 +258,70 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
258 result['data'] = someDecryptedValues; 258 result['data'] = someDecryptedValues;
259 259
260 return result; 260 return result;
261 }, anEncryptedData); 261 }, anEncryptedData);
262 deferredResult.addCallback(MochiKit.Base.method(this, 'setDecryptedData')); 262 deferredResult.addCallback(MochiKit.Base.method(this, 'setDecryptedData'));
263 deferredResult.callback(); 263 deferredResult.callback();
264 264
265 result = deferredResult; 265 result = deferredResult;
266 } else { 266 } else {
267 result = MochiKit.Async.succeed(this.decryptedData()); 267 result = MochiKit.Async.succeed(this.decryptedData());
268 } 268 }
269//MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.decryptData"); 269//MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.decryptData");
270 270
271 return result; 271 return result;
272 }, 272 },
273 273
274 //------------------------------------------------------------------------- 274 //-------------------------------------------------------------------------
275 275
276 'processData': function(someValues) { 276 'processData': function(someValues) {
277//MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData"); 277//MochiKit.Logging.logDebug(">>> [" + (new Date()).valueOf() + "] Record.processData");
278//MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues)); 278//MochiKit.Logging.logDebug("--- Record.processData: " + Clipperz.Base.serializeJSON(someValues));
279 if (this.shouldProcessData()) { 279 if (this.shouldProcessData()) {
280 var currentVersionParameters; 280 var currentVersionParameters;
281 281
282console.log("Record.processData", someValues);
283 this.processDataToExtractLegacyValues(someValues['data']); 282 this.processDataToExtractLegacyValues(someValues['data']);
284 283
285 if (typeof(someValues['data']['notes']) != 'undefined') { 284 if (typeof(someValues['data']['notes']) != 'undefined') {
286 this.setNotes(someValues['data']['notes']); 285 this.setNotes(someValues['data']['notes']);
287 } 286 }
288 287
289 if (someValues['data']['currentVersionKey'] != null) { 288 if (someValues['data']['currentVersionKey'] != null) {
290 this.setCurrentVersionKey(someValues['data']['currentVersionKey']); 289 this.setCurrentVersionKey(someValues['data']['currentVersionKey']);
291 } else { 290 } else {
292 this.setCurrentVersionKey(this.key()); 291 this.setCurrentVersionKey(this.key());
293 } 292 }
294 293
295 // community edition doesn't currently pass version 294 // community edition doesn't currently pass version information
296 // information
297 if (someValues['versions'] == null) { 295 if (someValues['versions'] == null) {
298 currentVersionParameters = someValues['currentVersion']; 296 currentVersionParameters = someValues['currentVersion'];
299 } else { 297 } else {
300 currentVersionParameters = someValues['versions'][someValues['currentVersion']]; 298 currentVersionParameters = someValues['versions'][someValues['currentVersion']];
301 } 299 }
302 300
303console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey()); 301 //- currentVersionParameters = someValues['currentVersion'];
304console.log("Record.processData - currentVersionParameters", currentVersionParameters); 302 // currentVersionParameters = someValues['versions'][someValues['currentVersion']];
303
305 currentVersionParameters['key'] = this.currentVersionKey(); 304 currentVersionParameters['key'] = this.currentVersionKey();
306 this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters)); 305 this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
307 306
308 if (someValues['data']['directLogins'] != null) { 307 if (someValues['data']['directLogins'] != null) {
309 vardirectLoginReference; 308 vardirectLoginReference;
310 309
311 for (directLoginReference in someValues['data']['directLogins']) { 310 for (directLoginReference in someValues['data']['directLogins']) {
312 var directLogin; 311 var directLogin;
313 var directLoginParameters; 312 var directLoginParameters;
314 313
315 directLoginParameters = someValues['data']['directLogins'][directLoginReference]; 314 directLoginParameters = someValues['data']['directLogins'][directLoginReference];
316 directLoginParameters.record = this; 315 directLoginParameters.record = this;
317 directLoginParameters.reference = directLoginReference; 316 directLoginParameters.reference = directLoginReference;
318 317
319 directLogin = new Clipperz.PM.DataModel.DirectLogin(directLoginParameters); 318 directLogin = new Clipperz.PM.DataModel.DirectLogin(directLoginParameters);
320 this.addDirectLogin(directLogin, true); 319 this.addDirectLogin(directLogin, true);
321 } 320 }
322 } 321 }
323 this.setShouldProcessData(false); 322 this.setShouldProcessData(false);
324 } 323 }
325 324
326 Clipperz.NotificationCenter.notify(this, 'recordDataReady'); 325 Clipperz.NotificationCenter.notify(this, 'recordDataReady');
327//MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.processData"); 326//MochiKit.Logging.logDebug("<<< [" + (new Date()).valueOf() + "] Record.processData");
328//MochiKit.Logging.logDebug("<<< Record.processData"); 327//MochiKit.Logging.logDebug("<<< Record.processData");
diff --git a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
index 299ebc7..ab1bb0f 100644
--- a/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
+++ b/frontend/beta/js/Clipperz/PM/Strings/Strings_en-US.js
@@ -487,49 +487,49 @@ Clipperz.PM.Strings.Languages['en-us'] = {
487 <h3>How to add a “direct login” link to an existing card</h3>\ 487 <h3>How to add a “direct login” link to an existing card</h3>\
488 <ol>\ 488 <ol>\
489 <li><p>Same as above.</p></li>\ 489 <li><p>Same as above.</p></li>\
490 <li><p>Same as above.</p></li>\ 490 <li><p>Same as above.</p></li>\
491 <li><p>Same as above.</p></li>\ 491 <li><p>Same as above.</p></li>\
492 <li><p>Enter your Clipperz account and select the card containing the credentials for the web service you just visited and click the <b>Edit</b> button.</p></li>\ 492 <li><p>Enter your Clipperz account and select the card containing the credentials for the web service you just visited and click the <b>Edit</b> button.</p></li>\
493 <li><p>Paste the content of the clipboard to the large text area in the “Direct logins” section. (ctrl-V)</p></li>\ 493 <li><p>Paste the content of the clipboard to the large text area in the “Direct logins” section. (ctrl-V)</p></li>\
494 <li><p>Press the <b>Add direct login</b> button, review the details and then click <b>Save</b>.</p></li>\ 494 <li><p>Press the <b>Add direct login</b> button, review the details and then click <b>Save</b>.</p></li>\
495 </ol>\ 495 </ol>\
496 \ 496 \
497 <p></p>\ 497 <p></p>\
498 <p>Further information about the bookmarklet are <a href=\"http://www.clipperz.com/support/user_guide/bookmarklet\" target=\"_blank\">available here</a>.</p>", 498 <p>Further information about the bookmarklet are <a href=\"http://www.clipperz.com/support/user_guide/bookmarklet\" target=\"_blank\">available here</a>.</p>",
499 499
500 //Tools panel - Compact - instructions 500 //Tools panel - Compact - instructions
501 'compactTabDescription': "\ 501 'compactTabDescription': "\
502 <!-- FIX CSS DONE! -->\ 502 <!-- FIX CSS DONE! -->\
503 <p>Clipperz Compact is a special version of Clipperz designed to be opened in the Firefox sidebar.</p>\ 503 <p>Clipperz Compact is a special version of Clipperz designed to be opened in the Firefox sidebar.</p>\
504 <p>Its purpose is to keep your collection of “direct logins” always at hand. Read more <a href=\"http://www.clipperz.com/support/user_guide/clipperz_compact\", target=\"blank\">here</a></p>\ 504 <p>Its purpose is to keep your collection of “direct logins” always at hand. Read more <a href=\"http://www.clipperz.com/support/user_guide/clipperz_compact\", target=\"blank\">here</a></p>\
505 \ 505 \
506 <h3>How to launch Clipperz Compact in the sidebar</h3>\ 506 <h3>How to launch Clipperz Compact in the sidebar</h3>\
507 <ol>\ 507 <ol>\
508 <li><p>Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.</p></li>\ 508 <li><p>Get Firefox! Sidebars are only available in Firefox and you need to switch to Firefox in order to enjoy the convenience of Clipperz Compact.</p></li>\
509 <li>\ 509 <li>\
510 <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\ 510 <p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\
511 <div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\ 511 <div id=\"compactLinkBox\"><a href=\"./index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
512 </li>\ 512 </li>\
513 <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\ 513 <li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
514 </ol>\ 514 </ol>\
515 \ 515 \
516 <h5>Added bonus: Clipperz Compact works also in Opera’s panel.</h5>", 516 <h5>Added bonus: Clipperz Compact works also in Opera’s panel.</h5>",
517 517
518 //Tools panel - HTTP authentication - instructions 518 //Tools panel - HTTP authentication - instructions
519 'httpAuthTabDescription': "\ 519 'httpAuthTabDescription': "\
520 <!-- FIX CSS DONE! -->\ 520 <!-- FIX CSS DONE! -->\
521 <p>HTTP authentication is a method designed to allow a web browser to provide credentials – in the form of a username and password – including them in a website address (HTTP or HTTPS URL).</p>\ 521 <p>HTTP authentication is a method designed to allow a web browser to provide credentials – in the form of a username and password – including them in a website address (HTTP or HTTPS URL).</p>\
522 <p>Nowadays it is rarely used, but it can still be found on small, private websites. You can tell that a website is protected by HTTP authentication when the browser displays a pop-up window to enter username and password.</p>\ 522 <p>Nowadays it is rarely used, but it can still be found on small, private websites. You can tell that a website is protected by HTTP authentication when the browser displays a pop-up window to enter username and password.</p>\
523 <p>Unfortunately the Clipperz bookmarklet does not work on websites that use HTTP authentication. However you can still create a “direct login”.</p>\ 523 <p>Unfortunately the Clipperz bookmarklet does not work on websites that use HTTP authentication. However you can still create a “direct login”.</p>\
524 \ 524 \
525 <h3>How to create a “direct login” for a website that uses HTTP authentication</h3>\ 525 <h3>How to create a “direct login” for a website that uses HTTP authentication</h3>\
526 <ol>\ 526 <ol>\
527 <li><p>Store website URL, username and password in a new card.</p></li>\ 527 <li><p>Store website URL, username and password in a new card.</p></li>\
528 <li><p>Copy the configuration below and paste it to the large text area in the “Direct logins” section of the new card.</p></li>\ 528 <li><p>Copy the configuration below and paste it to the large text area in the “Direct logins” section of the new card.</p></li>\
529 <li><p>Press the <b>Add direct login</b> button, bind URL, username and password fields and then click <b>Save</b>.</p></li>\ 529 <li><p>Press the <b>Add direct login</b> button, bind URL, username and password fields and then click <b>Save</b>.</p></li>\
530 </ol>\ 530 </ol>\
531 \ 531 \
532 <h5><a href=\"http://support.microsoft.com/kb/834489\" target=\"_blank\">Warning: Internet Explorer does not support HTTP authentication.</a></h5>", 532 <h5><a href=\"http://support.microsoft.com/kb/834489\" target=\"_blank\">Warning: Internet Explorer does not support HTTP authentication.</a></h5>",
533 533
534// Direct logins block 534// Direct logins block
535 'mainPanelDirectLoginBlockLabel': "Direct logins", 535 'mainPanelDirectLoginBlockLabel': "Direct logins",