small simplification in parsing

This commit is contained in:
azivner 2017-08-22 20:19:46 -04:00
parent aec8083d0c
commit 15ff3df9df
2 changed files with 8 additions and 5 deletions

View File

@ -120,18 +120,20 @@ function html2notecase(contents, note) {
} }
} }
else { else {
let linkMatch = /^((https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|])/i.exec(curContent); let linkMatch = /^(https?|ftp|file):\/\/[-A-Z0-9+&@#\/%?=~_|!:,.;]*[-A-Z0-9+&@#\/%=~_|]/i.exec(curContent);
if (linkMatch !== null) { if (linkMatch !== null) {
note.links.push({ note.links.push({
note_id: note.detail.note_id, note_id: note.detail.note_id,
note_offset: index, note_offset: index,
target_url: linkMatch[1], target_url: linkMatch[0],
lnk_text: linkMatch[1] lnk_text: linkMatch[0]
}); });
found = true; console.log(linkMatch[0]);
index += linkMatch[1].length; console.log(linkMatch[0].length);
index += linkMatch[0].length;
} }
else { else {
index++; index++;

View File

@ -12,5 +12,6 @@ jQuery.hotkeys.options.filterContentEditable = true;
$(document).bind('keypress', 'alt+ctrl+h', function() { $(document).bind('keypress', 'alt+ctrl+h', function() {
const toggle = $(".hide-toggle"); const toggle = $(".hide-toggle");
// use visibility instead of display so that content isn't moved around and stays set in place
toggle.css('visibility', toggle.css('visibility') === 'hidden' ? 'visible' : 'hidden'); toggle.css('visibility', toggle.css('visibility') === 'hidden' ? 'visible' : 'hidden');
}); });