summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show 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
-rw-r--r--scripts/builder/repository.py4
3 files changed, 8 insertions, 7 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
@@ -270,47 +270,46 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
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;
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
@@ -499,25 +499,25 @@ Clipperz.PM.Strings.Languages['en-us'] = {
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>\
diff --git a/scripts/builder/repository.py b/scripts/builder/repository.py
index 7ac2324..7a44e47 100644
--- a/scripts/builder/repository.py
+++ b/scripts/builder/repository.py
@@ -4,25 +4,24 @@
4 4
5def repositoryWithPath (path): 5def repositoryWithPath (path):
6 try: 6 try:
7 from mercurial import ui, hg 7 from mercurial import ui, hg
8 8
9 repo = hg.repository(ui.ui(), path) 9 repo = hg.repository(ui.ui(), path)
10 result = HgRepository(repo, path) 10 result = HgRepository(repo, path)
11 except: 11 except:
12 try: 12 try:
13 from git import Repo 13 from git import Repo
14 repo = Repo(path) 14 repo = Repo(path)
15 result = GitRepository(repo, path) 15 result = GitRepository(repo, path)
16
17 except ImportError, exception: 16 except ImportError, exception:
18 print "Failed to import git, please install http://gitorious.org/git-python" 17 print "Failed to import git, please install http://gitorious.org/git-python"
19 raise exception 18 raise exception
20 except: 19 except:
21 result = SnapshotRepository('', path) 20 result = SnapshotRepository('', path)
22 21
23 22
24 return result 23 return result
25 24
26 25
27#=================================================================== 26#===================================================================
28 27
@@ -80,18 +79,21 @@ class HgRepository(Repository):
80 79
81 def revision (self): 80 def revision (self):
82 return 'hg:' + str(self.repository['tip']) 81 return 'hg:' + str(self.repository['tip'])
83 82
84 83
85 def areTherePendingChanges (self): 84 def areTherePendingChanges (self):
86 # TODO: FIXME: repository.status() does not report 'unknown(?)' files. :( 85 # TODO: FIXME: repository.status() does not report 'unknown(?)' files. :(
87 return not all(map(lambda fileList: len(fileList) == 0, self.repository.status())) 86 return not all(map(lambda fileList: len(fileList) == 0, self.repository.status()))
88 87
89 88
90#=================================================================== 89#===================================================================
91 90
91
92class SnapshotRepository(Repository): 92class SnapshotRepository(Repository):
93
93 def revision (self): 94 def revision (self):
94 return 'SNAPSHOT' 95 return 'SNAPSHOT'
95 96
97
96 def areTherePendingChanges (self): 98 def areTherePendingChanges (self):
97 return False 99 return False