unifying get short text + keep new lines

4 files changed, 14 insertions, 11 deletions

diff --git a/server/note/NoteUtils.js b/server/note/NoteUtils.js
index 77601b8..9461f8d 100644
--- a/server/note/NoteUtils.js
+++ b/server/note/NoteUtils.js
@@ -1,6 +1,7 @@
 var SettingsHelper = require("../settings_helper").SettingsHelper;
 var settingsHelper = new SettingsHelper();
 var RecentDBManager = require('../recent/local_recent_db_manager').LocalRecentDBManager;
+var textVersion = require("textversionjs");
 
 var NoteUtils = function () {
 
@@ -21,6 +22,11 @@ NoteUtils.moveNote = function (notePath, callback) {
 
 }
 
+NoteUtils.getShortText = function (html) {
+    var text = textVersion(html).replace(/\n/g, "<br />");
+    return text.substr(0, text.length > 200 ? 200 : text.length)
+}
+
 NoteUtils.renameNote = function (notePath, newPath, callback) {
     console.log("renameNote " + newPath)
     var fs = require('fs');
diff --git a/server/note/folder-note-opener.js b/server/note/folder-note-opener.js
index 16a7c5a..60fd917 100644
--- a/server/note/folder-note-opener.js
+++ b/server/note/folder-note-opener.js
@@ -1,5 +1,5 @@
 var fs = require('fs-extra');
-var textVersion = require("textversionjs");
+var NoteUtils = require("./NoteUtils").NoteUtils;
 const path = require('path')
 
 var getParentFolderFromPath = require("../../utils/file_utils").FileUtils.getParentFolderFromPath
@@ -14,7 +14,7 @@ FolderNoteOpener.prototype.getMainTextMetadataAndPreviews = function (callback)
     this.getFullHTML(function (data) {
         opener.getMetadataString(function (metadata) {
             opener.getMediaList(function (previews, media) {
-                callback(textVersion(data), metadata != undefined ? JSON.parse(metadata) : undefined, previews, media)
+                callback(NoteUtils.getShortText(data), metadata != undefined ? JSON.parse(metadata) : undefined, previews, media)
             })
         })
     });
@@ -107,4 +107,4 @@ FolderNoteOpener.prototype.saveFrom = function (fromPath, modifiedFiles, deleted
 }
 
 
-exports.FolderNoteOpener = FolderNoteOpener
\ No newline at end of file
+exports.FolderNoteOpener = FolderNoteOpener
diff --git a/server/note/zip-note-opener.js b/server/note/zip-note-opener.js
index aaf3fee..71b57b3 100644
--- a/server/note/zip-note-opener.js
+++ b/server/note/zip-note-opener.js
@@ -2,7 +2,7 @@ var JSZip = require('jszip');
 var mkdirp = require('mkdirp');
 var fs = require('fs-extra');
 const intoStream = require('into-stream');
-var textVersion = require("textversionjs");
+var NoteUtils = require("./NoteUtils").NoteUtils;
 
 var getParentFolderFromPath = require("../../utils/file_utils").FileUtils.getParentFolderFromPath
 var ZipNoteOpener = function (note) {
@@ -17,7 +17,7 @@ ZipNoteOpener.prototype.getMainTextMetadataAndPreviews = function (callback) {
         if (zip != undefined) {
             opener.getMetadataString(zip, function (metadata) {
                 opener.getMediaList(zip, function (previews, media) {
-                    callback(textVersion(data), metadata != undefined ? JSON.parse(metadata) : undefined, previews, media)
+                    callback(NoteUtils.getShortText(data), metadata != undefined ? JSON.parse(metadata) : undefined, previews, media)
 
                 })
             })
@@ -267,4 +267,4 @@ Compressor.prototype.start = function () {
 
 
 }
-exports.ZipNoteOpener = ZipNoteOpener
\ No newline at end of file
+exports.ZipNoteOpener = ZipNoteOpener
diff --git a/server/server.js b/server/server.js
index 02de9da..24eea72 100644
--- a/server/server.js
+++ b/server/server.js
@@ -12,7 +12,6 @@ var currentSearch = undefined;
 var Note = require("../browsers/note").Note;
 var fs = require('fs');
 const path = require('path')
-var textVersion = require("textversionjs");
 var currentcache = {}
 var media = []
 var openedNotePath = undefined
@@ -502,8 +501,7 @@ var saveTextToNote = function (path, html, metadata, callback) {
                 return console.logDebug(err);
             }
             console.logDebug("compress")
-            var text = textVersion(html)
-            currentcache.shorttext = text.substr(0, text.length > 200 ? 200 : text.length)
+            currentcache.shorttext = NoteUtils.getShortText(html)
             currentcache.metadata = JSON.parse(metadata)
             saveFilesInNote(['index.html', 'metadata.json'], path, callback)
 
@@ -585,8 +583,7 @@ var openNote = function (path, callback) {
                         throw err;
                     }
                     result["html"] = data
-                    var text = textVersion(data)
-                    currentcache.shorttext = text.substr(0, text.length > 200 ? 200 : text.length)
+                    currentcache.shorttext = NoteUtils.getShortText(data)
                     fs.readFile(tmppath + 'metadata.json', 'utf8', function read(err, metadata) {
                         if (err) {
                             throw err;