Skip to content

Commit 71ed9fe

Browse files
ddmitovddmitov
committed
better index.html for the demo package
1 parent d4aa7c5 commit 71ed9fe

File tree

4 files changed

+94
-40
lines changed

4 files changed

+94
-40
lines changed

‎resources/app/index-windows.html‎

Lines changed: 48 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -55,42 +55,47 @@
5555
target.innerHTML = stdout;
5656
}
5757

58+
var open_file = {};
59+
open_file.scriptRelativePath = 'perl-scripts/open-files.pl';
60+
open_file.stdoutFunction = function (stdout) {
61+
displayTestResult('open-file', stdout);
62+
}
63+
5864
var open_files = {};
5965
open_files.scriptRelativePath = 'perl-scripts/open-files.pl';
6066
open_files.stdoutFunction = function (stdout) {
61-
displayTestResult(stdout);
67+
displayTestResult('open-files', stdout);
6268
}
6369

6470
var open_directory = {};
6571
open_directory.scriptRelativePath = 'perl-scripts/open-directory.pl';
6672
open_directory.stdoutFunction = function (stdout) {
67-
displayTestResult(stdout);
73+
displayTestResult('open-directory', stdout);
6874
}
6975

7076
var perl_info = {};
7177
perl_info.scriptRelativePath = 'perl-scripts/perl-info.pl';
7278
perl_info.stdoutFunction = function (stdout) {
73-
displayTestResult(stdout);
79+
displayTestResult('perl-info', stdout);
7480
}
7581

7682
var sqlite = {};
7783
sqlite.scriptRelativePath = 'perl-scripts/sqlite.pl';
7884
sqlite.stdoutFunction = function (stdout) {
79-
displayTestResult(stdout);
85+
displayTestResult('sqlite-test', stdout);
8086
}
8187

8288
// Settings objects for the filesystem dialogs:
8389
var select_file = {};
8490
select_file.type = 'single-file';
8591
select_file.receiverFunction = function (fileName) {
86-
open_files.inputData = fileName;
87-
peb.startScript('open_files.script');
92+
open_file.inputData = fileName;
93+
peb.startScript('open_file.script');
8894
}
8995

9096
var new_file_name = {};
9197
new_file_name.type = 'new-file-name';
9298
new_file_name.receiverFunction = function (fileName) {
93-
clearTargetElement();
9499
var pre = document.createElement("pre");
95100
pre.innerHTML = 'New file name: ' + fileName;
96101
document.getElementById('tests').appendChild(pre);
@@ -110,18 +115,31 @@
110115
peb.startScript('open_directory.script');
111116
}
112117

113-
function clearTargetElement() {
118+
function startPerlInfo() {
119+
peb.startScript('perl_info.script');
120+
}
121+
122+
function startSqlite() {
123+
peb.startScript('sqlite.script');
124+
}
125+
126+
function clearTestData() {
114127
var container = document.getElementById('tests');
115128
while (container.firstChild) {
116129
container.removeChild(container.firstChild);
117130
}
118131
}
119132

120-
function displayTestResult(stdout) {
121-
clearTargetElement();
122-
var pre = document.createElement("pre");
123-
pre.innerHTML = stdout;
124-
document.getElementById('tests').appendChild(pre);
133+
function displayTestResult(id, stdout) {
134+
var existingElement = document.getElementById(id);
135+
if (existingElement === null) {
136+
var newElement = document.createElement("pre");
137+
newElement.id = id;
138+
newElement.innerHTML = stdout;
139+
document.getElementById('tests').appendChild(newElement);
140+
} else {
141+
existingElement.innerHTML = existingElement.innerHTML + stdout;
142+
}
125143
}
126144
</script>
127145

@@ -197,11 +215,15 @@
197215
</li>
198216

199217
<li>
200-
<a href="perl_info.script">Perl Basic Information</a>
218+
<a href="javascript:startPerlInfo();">Perl Basic Information</a>
201219
</li>
202220

203221
<li>
204-
<a href="sqlite.script">SQLite Test</a>
222+
<a href="javascript:startSqlite();">SQLite Test</a>
223+
</li>
224+
225+
<li>
226+
<a href="javascript:clearTestData();">Clear Test Data</a>
205227
</li>
206228

207229
<li>
@@ -244,6 +266,10 @@ <h2>Perl Executing Browser</h2>
244266
</div>
245267
</div>
246268

269+
<div class="row">
270+
&nbsp;
271+
</div>
272+
247273
<div class="row">
248274
<div class="col-xs-12 form-group">
249275
<form action="perl_input.script" id="perl-input">
@@ -264,12 +290,16 @@ <h2>Perl Executing Browser</h2>
264290
</form>
265291
</div>
266292

267-
<div id="user-data-perl-output" class="output"></div>
293+
<div id="user-data-perl-output" class="output">Last user input: none</div>
294+
</div>
295+
296+
<div class="row">
297+
&nbsp;
268298
</div>
269299

270300
<div class="row">
271-
<div id="clock-one-output" class="output"></div>
272-
<div id="clock-two-output" class="output"></div>
301+
<div id="clock-one-output" class="output">&nbsp;</div>
302+
<div id="clock-two-output" class="output">&nbsp;</div>
273303
</div>
274304
</div>
275305
</body>

‎resources/app/index.html‎

Lines changed: 38 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -47,42 +47,47 @@
4747
target.innerHTML = stdout;
4848
}
4949

50+
var open_file = {};
51+
open_file.scriptRelativePath = 'perl-scripts/open-files.pl';
52+
open_file.stdoutFunction = function (stdout) {
53+
displayTestResult('open-file', stdout);
54+
}
55+
5056
var open_files = {};
5157
open_files.scriptRelativePath = 'perl-scripts/open-files.pl';
5258
open_files.stdoutFunction = function (stdout) {
53-
displayTestResult(stdout);
59+
displayTestResult('open-files', stdout);
5460
}
5561

5662
var open_directory = {};
5763
open_directory.scriptRelativePath = 'perl-scripts/open-directory.pl';
5864
open_directory.stdoutFunction = function (stdout) {
59-
displayTestResult(stdout);
65+
displayTestResult('open-directory', stdout);
6066
}
6167

6268
var perl_info = {};
6369
perl_info.scriptRelativePath = 'perl-scripts/perl-info.pl';
6470
perl_info.stdoutFunction = function (stdout) {
65-
displayTestResult(stdout);
71+
displayTestResult('perl-info', stdout);
6672
}
6773

6874
var sqlite = {};
6975
sqlite.scriptRelativePath = 'perl-scripts/sqlite.pl';
7076
sqlite.stdoutFunction = function (stdout) {
71-
displayTestResult(stdout);
77+
displayTestResult('sqlite-test', stdout);
7278
}
7379

7480
// Settings objects for the filesystem dialogs:
7581
var select_file = {};
7682
select_file.type = 'single-file';
7783
select_file.receiverFunction = function (fileName) {
78-
open_files.inputData = fileName;
79-
peb.startScript('open_files.script');
84+
open_file.inputData = fileName;
85+
peb.startScript('open_file.script');
8086
}
8187

8288
var new_file_name = {};
8389
new_file_name.type = 'new-file-name';
8490
new_file_name.receiverFunction = function (fileName) {
85-
clearTargetElement();
8691
var pre = document.createElement("pre");
8792
pre.innerHTML = 'New file name: ' + fileName;
8893
document.getElementById('tests').appendChild(pre);
@@ -102,21 +107,30 @@
102107
peb.startScript('open_directory.script');
103108
}
104109

105-
function clearTargetElement(target) {
106-
var container = document.getElementById(target);
110+
function startPerlInfo() {
111+
peb.startScript('perl_info.script');
112+
}
113+
114+
function startSqlite() {
115+
peb.startScript('sqlite.script');
116+
}
117+
118+
function clearTestData() {
119+
var container = document.getElementById('tests');
107120
while (container.firstChild) {
108121
container.removeChild(container.firstChild);
109122
}
110123
}
111124

112-
function displayTestResult(target, stdout) {
113-
if (document.getElementById(target)) {
114-
var element = document.getElementById(target);
115-
element.innerHTML = element.innerHTML + stdout;
125+
function displayTestResult(id, stdout) {
126+
var existingElement = document.getElementById(id);
127+
if (existingElement === null) {
128+
var newElement = document.createElement("pre");
129+
newElement.id = id;
130+
newElement.innerHTML = stdout;
131+
document.getElementById('tests').appendChild(newElement);
116132
} else {
117-
var pre = document.createElement("pre");
118-
pre.innerHTML = stdout;
119-
document.getElementById('tests').appendChild(pre);
133+
existingElement.innerHTML = existingElement.innerHTML + stdout;
120134
}
121135
}
122136
</script>
@@ -193,11 +207,15 @@
193207
</li>
194208

195209
<li>
196-
<a href="perl_info.script">Perl Basic Information</a>
210+
<a href="javascript:startPerlInfo();">Perl Basic Information</a>
211+
</li>
212+
213+
<li>
214+
<a href="javascript:startSqlite();">SQLite Test</a>
197215
</li>
198216

199217
<li>
200-
<a href="sqlite.script">SQLite Test</a>
218+
<a href="javascript:clearTestData();">Clear Test Data</a>
201219
</li>
202220

203221
<li>
@@ -264,7 +282,7 @@ <h3>Interactive Script Demo</h3>
264282
</form>
265283
</div>
266284

267-
<div id="instance-one-output" class="interactive-output"></div>
285+
<div id="instance-one-output" class="interactive-output">&nbsp;</div>
268286
</div>
269287

270288
<div class="row">
@@ -289,7 +307,7 @@ <h3>Interactive Script Demo</h3>
289307
</form>
290308
</div>
291309

292-
<div id="instance-two-output" class="interactive-output"></div>
310+
<div id="instance-two-output" class="interactive-output">&nbsp;</div>
293311
</div>
294312
</div>
295313
</body>

‎resources/app/perl-scripts/interactive.pl‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
$output_string = "Seconds from the Unix epoch: ".time;
8383
} else {
8484
$output_string =
85-
"Seconds from the Unix epoch: ".time."<br>Last input: ".$input_text;
85+
"Seconds from the Unix epoch: ".time."<br>Last user input: ".$input_text;
8686
}
8787

8888
print $output_string or shutdown_procedure();
@@ -96,7 +96,7 @@
9696
$output_string = "Local date and time: ".$formatted_time;
9797
} else {
9898
$output_string =
99-
"Local date and time: ".$formatted_time."<br>Last input: ".$input_text;
99+
"Local date and time: ".$formatted_time."<br>Last user input: ".$input_text;
100100
}
101101

102102
print $output_string or shutdown_procedure();

‎resources/app/perl-scripts/open-directory.pl‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,23 @@
1515
print "$file<br>";
1616
}
1717

18+
my $number_of_files = scalar @files;
19+
print "$number_of_files files<br>";
20+
1821
sub traverse {
1922
my ($entry) = @_;
2023

2124
return if not -d $entry;
2225
opendir (my $directory_handle, $entry) or die $!;
2326
while (my $subentry = readdir $directory_handle) {
2427
next if $subentry eq '.' or $subentry eq '..';
28+
2529
my $full_path = $entry."/".$subentry;
30+
2631
if (-f $full_path) {
2732
push @files, $full_path;
2833
}
34+
2935
traverse ("$entry/$subentry");
3036
}
3137
close $directory_handle;

0 commit comments

Comments
 (0)