From 0713553906bee57c289d13f61b192da4eceac143 Mon Sep 17 00:00:00 2001 From: Xavid Date: Fri, 19 Jun 2015 14:02:18 -0400 Subject: [PATCH 1/2] Allow a pad to only end with a single newline, rather than requiring two. --- src/node/handler/PadMessageHandler.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/node/handler/PadMessageHandler.js b/src/node/handler/PadMessageHandler.js index 9a0d1ee7..0172400b 100644 --- a/src/node/handler/PadMessageHandler.js +++ b/src/node/handler/PadMessageHandler.js @@ -773,8 +773,9 @@ function handleUserChanges(data, cb) } // Make sure the pad always ends with an empty line. - if (pad.text().lastIndexOf("\n\n") != pad.text().length-2) { - var nlChangeset = Changeset.makeSplice(pad.text(), pad.text().length-1, 0, "\n"); + if (pad.text().lastIndexOf("\n") != pad.text().length-1) { + var nlChangeset = Changeset.makeSplice(pad.text(), pad.text().length-1, + 0, "\n"); pad.appendRevision(nlChangeset); } From 778e1e4641b54f581b96202ffef244079fade194 Mon Sep 17 00:00:00 2001 From: Xavid Date: Fri, 19 Jun 2015 14:03:22 -0400 Subject: [PATCH 2/2] Allow a return keypress in a list on the last line of a pad to create a new line. --- src/static/js/ace2_inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/ace2_inner.js b/src/static/js/ace2_inner.js index 57907820..10dd0e4c 100644 --- a/src/static/js/ace2_inner.js +++ b/src/static/js/ace2_inner.js @@ -3384,7 +3384,7 @@ function Ace2Inner(){ renumberList(lineNum + 1);//trigger renumbering of list that may be right after } } - else if (lineNum + 1 < rep.lines.length()) + else if (lineNum + 1 <= rep.lines.length()) { performDocumentReplaceSelection('\n'); setLineListType(lineNum + 1, type+level);