Merge branch 'gotoline'

This commit is contained in:
quenousimporte 2023-09-06 21:29:50 +02:00
commit dd5389ca87
1 changed files with 26 additions and 5 deletions

31
main.js
View File

@ -1087,23 +1087,40 @@ function remotecallfailed(error)
} }
} }
function gotoline(line)
{
var i = 0;
var pos = 0;
while (i < line && pos > -1)
{
pos = currentnote.content.indexOf("\n", pos + 1);
i++;
}
if (pos > -1)
{
setpos(pos + 1);
}
}
function loadstorage() function loadstorage()
{ {
var item = window.localStorage.getItem(currentvault); var item = window.localStorage.getItem(currentvault);
localdata = item ? JSON.parse(item) : []; localdata = item ? JSON.parse(item) : [];
var urlparam = (new URLSearchParams(window.location.search)).get("n"); var params = new URLSearchParams(window.location.search);
var title = params.get("n");
var line = params.get("l");
if (currentnote) if (currentnote)
{ {
currentnote = getnote(currentnote.title); currentnote = getnote(currentnote.title);
} }
else if (urlparam) else if (title)
{ {
currentnote = getnote(urlparam); currentnote = getnote(title);
if (!currentnote) if (!currentnote)
{ {
currentnote = {title: urlparam, content: ""}; currentnote = {title: title, content: ""};
localdata.unshift(currentnote); localdata.unshift(currentnote);
} }
} }
@ -1111,6 +1128,10 @@ function loadstorage()
if (currentnote) if (currentnote)
{ {
bindfile(currentnote); bindfile(currentnote);
if (line)
{
gotoline(line);
}
} }
else else
{ {
@ -1646,7 +1667,7 @@ function showgrepresult(grepresult)
grepcontent.push("[[" + file + "]]"); grepcontent.push("[[" + file + "]]");
for (var l in grepresult[file]) for (var l in grepresult[file])
{ {
grepcontent.push("[" + l + "] " + grepresult[file][l]); grepcontent.push("[<a href=?n=" + encodeURIComponent(file) + "&l=" + l + ">" + l + "</a>] " + grepresult[file][l]);
} }
grepcontent.push(""); grepcontent.push("");
} }