summaryrefslogtreecommitdiff
path: root/frontend/beta/js/Clipperz
authorClipperz <info@clipperz.com>2013-01-09 11:45:31 (UTC)
committer Clipperz <info@clipperz.com>2013-01-09 11:45:31 (UTC)
commit9741a93a9f5c76827135b43c03b20c0a48f12604 (patch) (side-by-side diff)
tree1a8fff379a033d873c9e1c7faff755fb6bb7b118 /frontend/beta/js/Clipperz
parent8ef30d00eb96004c39540019336c0ec99dae01cb (diff)
downloadclipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.zip
clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.gz
clipperz-9741a93a9f5c76827135b43c03b20c0a48f12604.tar.bz2
Merge latest changes with public repository
Diffstat (limited to 'frontend/beta/js/Clipperz') (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
@@ -279,7 +279,6 @@ Clipperz.PM.DataModel.Record.prototype = MochiKit.Base.update(null, {
if (this.shouldProcessData()) {
var currentVersionParameters;
-console.log("Record.processData", someValues);
this.processDataToExtractLegacyValues(someValues['data']);
if (typeof(someValues['data']['notes']) != 'undefined') {
@@ -292,16 +291,16 @@ console.log("Record.processData", someValues);
this.setCurrentVersionKey(this.key());
}
-// community edition doesn't currently pass version
-// information
+// community edition doesn't currently pass version information
if (someValues['versions'] == null) {
currentVersionParameters = someValues['currentVersion'];
} else {
currentVersionParameters = someValues['versions'][someValues['currentVersion']];
}
-console.log("Record.processData - this.currentVersionKey()", this.currentVersionKey());
-console.log("Record.processData - currentVersionParameters", currentVersionParameters);
+//- currentVersionParameters = someValues['currentVersion'];
+// currentVersionParameters = someValues['versions'][someValues['currentVersion']];
+
currentVersionParameters['key'] = this.currentVersionKey();
this.setCurrentVersion(new Clipperz.PM.DataModel.RecordVersion(this, currentVersionParameters));
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
@@ -508,7 +508,7 @@ Clipperz.PM.Strings.Languages['en-us'] = {
<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>\
<li>\
<p>Add the following URL to Firefox bookmarks, or even better, drag it to the bookmark bar.</p>\
- <div id=\"compactLinkBox\"><a href=\"index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
+ <div id=\"compactLinkBox\"><a href=\"./index.html?compact\" target=\"_search\">Clipperz Compact</a></div>\
</li>\
<li><p>Change the properties of the bookmark so that “load this bookmark in the sidebar” is checked.</p></li>\
</ol>\