fix: {.dialog||yesno.} was not working

This commit is contained in:
Massimo Melina 2020-06-23 20:14:24 +02:00
parent 26ddc2b126
commit 308561090f
3 changed files with 12 additions and 12 deletions

View File

@ -5551,7 +5551,7 @@ var
url:=chop(lastDelimiter('/', urlCmd)+1, 0, urlCmd); url:=chop(lastDelimiter('/', urlCmd)+1, 0, urlCmd);
// we know an urlCmd must begin with ~ // we know an urlCmd must begin with ~
// favicon is handled as an urlCmd: we provide HFS icon. // favicon is handled as an urlCmd: we provide HFS icon.
// an non-existent ~file will be detected a hundred lines below. // a non-existent ~file will be detected a hundred lines below.
if ansiStartsStr('~', urlCmd) or (urlCmd = 'favicon.ico') then if ansiStartsStr('~', urlCmd) or (urlCmd = 'favicon.ico') then
f:=findFileByURL(url); f:=findFileByURL(url);
end; end;

View File

@ -1228,20 +1228,20 @@ var
'information=64' 'information=64'
); );
var var
i, j, code: integer; code: integer;
decode: TStringDynArray; decode: TStringDynArray;
s: string; s, d: string;
buttons, icon: boolean; buttons, icon: boolean;
begin begin
decode:=split(' ',par(1)); decode:=split(' ',par(1));
code:=0; code:=0;
for i:=0 to length(decode)-1 do for d in decode do
for j:=1 to length(STR2CODE) do for s in STR2CODE do
begin if startsStr(d+'=', s) then
s:=STR2CODE[j]; begin
if ansiStartsStr(decode[i], s) then inc(code, strToIntDef(substr(s, 2+d.length), 0));
inc(code, strToIntDef(substr(s, 1+pos('=',s)), 0)); Break
end; end;
buttons:=code AND 15 > 0; buttons:=code AND 15 > 0;
icon:=code SHR 4 > 0; icon:=code SHR 4 > 0;
if not icon and buttons then if not icon and buttons then

View File

@ -34,7 +34,8 @@ document: single line diff templates (file path)
document: {.disconnection reason|if=XXX.} document: {.disconnection reason|if=XXX.}
document: %url% document: %url%
document: commands returning white space: add folder, save, set account, exec, mkdir, chdir, delete, rename, move copy, set document: commands returning white space: add folder, save, set account, exec, mkdir, chdir, delete, rename, move copy, set
document: dir, disk free, filetime, file changed, load tpl, sha256, for line document: base64, base64decode, dir, disk free, filetime, file changed, load tpl, sha256, for line
document: new event [login]
+ event to filter logging http://www.rejetto.com/forum/index.php/topic,9784.0.html + event to filter logging http://www.rejetto.com/forum/index.php/topic,9784.0.html
- wrong browser http://www.rejetto.com/forum/index.php/topic,9710.0.html - wrong browser http://www.rejetto.com/forum/index.php/topic,9710.0.html
solution: solution:
@ -52,7 +53,6 @@ document: dir, disk free, filetime, file changed, load tpl, sha256, for line
? in getPage() many %symbols% are translated in a way incompatible with {.section.} ? in getPage() many %symbols% are translated in a way incompatible with {.section.}
? Windows Script Interfaces ? Windows Script Interfaces
? {.image|src=file|width=x|dst=outfile.} ? {.image|src=file|width=x|dst=outfile.}
+ replace /~imgXX with ?mode=icon&id=XX
+ user input through {.dialog.} + user input through {.dialog.}
+ show missing files in VFS http://www.rejetto.com/forum/index.php/topic,8203.new.html + show missing files in VFS http://www.rejetto.com/forum/index.php/topic,8203.new.html
* {.cache.} should be able to work on a simple variable * {.cache.} should be able to work on a simple variable