From bcc48214ea4037ce442c29e937c98be5adc6f4a6 Mon Sep 17 00:00:00 2001 From: Jordan Hollinger Date: Sat, 7 Jul 2012 13:23:33 -0400 Subject: [PATCH 1/3] Bugfix to getLastEdited API method, issue #845 --- src/node/db/API.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/node/db/API.js b/src/node/db/API.js index 661b78595..68a57d7d0 100644 --- a/src/node/db/API.js +++ b/src/node/db/API.js @@ -298,7 +298,10 @@ exports.getLastEdited = function(padID, callback) getPadSafe(padID, true, function(err, pad) { if(ERR(err, callback)) return; - callback(null, {lastEdited: pad.getLastEdited()}); + pad.getLastEdit(function(err, value) { + if(ERR(err, callback)) return; + callback(null, {lastEdited: value}); + }); }); } From a435a771839564ba468ab36c73af28847865bac5 Mon Sep 17 00:00:00 2001 From: Jordan Wiens Date: Sun, 15 Jul 2012 00:37:34 -0400 Subject: [PATCH 2/3] Adding basic numbered list support to dokuwiki export --- src/node/utils/ExportDokuWiki.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/node/utils/ExportDokuWiki.js b/src/node/utils/ExportDokuWiki.js index bcb211081..8398c45d0 100644 --- a/src/node/utils/ExportDokuWiki.js +++ b/src/node/utils/ExportDokuWiki.js @@ -252,7 +252,12 @@ function getDokuWikiFromAtext(pad, atext) if (line.listLevel && lineContent) { - pieces.push(new Array(line.listLevel + 1).join(' ') + '* '); + if (line.listTypeName == "number") + { + pieces.push(new Array(line.listLevel + 1).join(' ') + ' - '); + } else { + pieces.push(new Array(line.listLevel + 1).join(' ') + '* '); + } } pieces.push(lineContent); } From 7852bf99fd9aae7043309a714b2ad6687ba5e241 Mon Sep 17 00:00:00 2001 From: Jordan Wiens Date: Sun, 15 Jul 2012 00:43:35 -0400 Subject: [PATCH 3/3] vim eated spaces and pooped tabs --- src/node/utils/ExportDokuWiki.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/node/utils/ExportDokuWiki.js b/src/node/utils/ExportDokuWiki.js index 8398c45d0..d2f71236b 100644 --- a/src/node/utils/ExportDokuWiki.js +++ b/src/node/utils/ExportDokuWiki.js @@ -252,12 +252,12 @@ function getDokuWikiFromAtext(pad, atext) if (line.listLevel && lineContent) { - if (line.listTypeName == "number") - { - pieces.push(new Array(line.listLevel + 1).join(' ') + ' - '); - } else { - pieces.push(new Array(line.listLevel + 1).join(' ') + '* '); - } + if (line.listTypeName == "number") + { + pieces.push(new Array(line.listLevel + 1).join(' ') + ' - '); + } else { + pieces.push(new Array(line.listLevel + 1).join(' ') + '* '); + } } pieces.push(lineContent); }