Skip to content

Commit 0f9a758

Browse files
hcchengithubhcchengithub
committed
Merge branch 'develop'
2 parents af266a3 + 2514a8b commit 0f9a758

40 files changed

+10048
-231
lines changed

‎.gitignore

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,11 @@ js/flot/*
22
js/box2dweb/*
33
js/chipmunk.js/*
44
js/jquery*
5-
private/
5+
private/*
66
project-k/
7-
*.mp3
87
*.wav
98
jeforth.hta.lnk
109
_selftest_.xls
1110
selftest.log
11+
SyncToy_8e280aa0-b06a-4021-8991-ed5a5f7e4d6e.dat
12+
SyncToy_1268b118-db7c-4ec4-b927-69cc9c40877a.dat

‎3ce/admin.bat

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎3ce/background.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@
55
var jeforth_project_k_virtual_machine_object = new jeForth(); // A permanent name.
66
var bvm = jeforth_project_k_virtual_machine_object; // (B)ackground page VM, a shorter name that identifies itself also.
77
(function(vm){
8-
vm.minor_version = 204; // for 3ce background page, major version is from jeforth.js kernel.
8+
vm.minor_version = jeforth3we_minor_version;
99
var version = parseFloat(vm.major_version+"."+vm.minor_version);
1010
vm.appname = "jeforth.3ce.background"; // 不要動， jeforth.3we kernel 用來分辨不同 application。
1111
vm.host = window; // DOM window is the root for 3HTM. global 掛那裡的根據。
1212
vm.path = ["dummy", "doc", "f", "3htm/f", "3htm/canvas", "3htm", "3ce", "playground"];
1313
vm.screenbuffer = ""; // type() to screenbuffer before I/O ready; self-test needs it too.
1414
vm.selftest_visible = true; // Dummy, background page does not have a display.
15-
debugger;
1615
// vm.type() is the master typing or printing function.
1716
// The type() called in code ... end-code is defined in the kernel jeforth.js.
1817
// type to vm.screenbuffer, although background page has no display.

‎3ce/ce.f

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@ function ce3_host_onmessage (message, sender, sendResponse) {
247247
<ce> typeof(jeForth)</ceV> char function != if
248248
tabid {} js: tos().file="js/jquery-1.11.2.js" inject drop
249249
then
250+
tabid {} js: tos().file="js/version.js" inject drop
250251
tabid {} js: tos().file="project-k/jeforth.js" inject drop
251252

252253
\ Inject the main program of jeforrth.3ce (jeforth.3htm.js equivalent)
@@ -258,7 +259,8 @@ function ce3_host_onmessage (message, sender, sendResponse) {
258259
// We need to help it a little as the following example:
259260

260261
(function(){
261-
vm.minor_version = 204; // 3ce target page minor version. major version is from jeforth.js kernel.
262+
// vm.minor_version = 204; // 3ce target page minor version. major version is from jeforth.js kernel.204; // 3ce target page minor version. major version is from jeforth.js kernel.
263+
vm.minor_version = jeforth3we_minor_version;
262264
var version = vm.version = parseFloat(vm.major_version+"."+vm.minor_version);
263265
vm.appname = "jeforth.3ce"; // 不要動， jeforth.3we kernel 用來分辨不同 application。
264266
vm.host = window; // DOM window is the root for 3HTM. global 掛那裡的根據。

‎3ce/jeforth.3ce.background.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<title>jeforth.3ce background page</title>
55
<script src="js/jquery-1.11.2.js"></script>
66
<Script src="project-k/jeforth.js"></Script>
7+
<script src="js/version.js"></script>
78
<Script src="3ce/background.js"></Script>
89
</head>
910
<body>

‎3ce/jeforth.3ce.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
</style>
1919
<script src="js/jquery-1.11.2.js"></script>
2020
<script src="project-k/jeforth.js"></script>
21+
<script src="js/version.js"></script>
2122
<script src="3ce/jeforth.3ce.js"></script>
2223
</head>
2324
<body id=body>

‎3ce/jeforth.3ce.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
var jeforth_project_k_virtual_machine_object = new jeForth(); // A permanent name.
1010
var kvm = jeforth_project_k_virtual_machine_object; // "kvm" may not be so permanent.
1111
(function(){
12-
kvm.minor_version = 204; // minor version specified by each application (like here), major version is from jeforth.js kernel.
12+
kvm.minor_version = jeforth3we_minor_version;
1313
var version = parseFloat(kvm.major_version+"."+kvm.minor_version);
1414
kvm.appname = "jeforth.3ce"; // 不要動， jeforth.3we kernel 用來分辨不同 application。
1515
kvm.host = window; // DOM window is the root for global 掛那裡的根據。

‎3hta/admin.bat

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎3htm/f/ls.f

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -732,7 +732,7 @@ function Handler(w) {
732732
733733
js> storage.get("autoexec") [if] [else]
734734
<text> <unindent>
735-
js: outputbox.style.fontSize="1.5em"
735+
\ js: outputbox.style.fontSize="1.5em"
736736
cr .( Launch the briefing ) cr
737737
<o> <iframe src="http://note.youdao.com/share/?id=79f8bd1b7d0a6174ff52e700dbadd1b2&type=note"
738738
name="An introduction to jeforth.3ce" align="center" width="96%" height="1000px"

‎3htm/f/platform.f

Lines changed: 22 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -454,30 +454,21 @@
454454
<td><b>Descriptions</b> (watch video)</td>
455455
</tr>
456456
<tr>
457-
<td>Introduction</td>
458-
<td>jeforth.3we is an implementation of the Forth programming
459-
language written in JavaScript and runs on HTA, HTM, Node.js, and Node-webkit.
460-
Watch <a href="http://www.camdemy.com/media/19253">video</a>.</td>
461-
</tr>
462-
<tr>
463-
<td>How to</td>
464-
<td><a href="http://www.camdemy.com/media/19254">Run the HTML version online</a>. Click <a href="http://figtaiwan.org/project/jeforth/jeforth.3we-master/index.html">here</a> to run.</td>
457+
<td>Hotkey F2</td>
458+
<td><a href="http://www.camdemy.com/media/19258">Toggle input box EditMode</a></td>
465459
</tr>
466460
<tr>
467-
<td>How to</td>
468-
<td><a href="http://www.camdemy.com/media/19255">Run the HTML version on local computer</a></td>
461+
<td>Hotkey Shift-F2</td>
462+
<td>Toggle output box EditMode</td>
469463
</tr>
470464
<tr>
471-
<td>How to</td>
472-
<td><a href="http://www.camdemy.com/media/19256">Run the HTA version</a></td>
465+
<td>Hotkey Ctrl-F2</td>
466+
<td>Click anywhere and press Ctrl-F2 to get the clicked HTML node to
467+
the "current element", so we can manipulate it. Refer to "ce" command.</td>
473468
</tr>
474469
<tr>
475-
<td>How to</td>
476-
<td><a href="http://www.camdemy.com/media/19257">Run Node.js and Node-Webkit version</a></td>
477-
</tr>
478-
<tr>
479-
<td>Hotkey F2</td>
480-
<td><a href="http://www.camdemy.com/media/19258">Toggle input box EditMode</a></td>
470+
<td>Hotkey Alt-F2</td>
471+
<td>Click anywhere and press Alt-F2 to edit the clicked HTML node.</td>
481472
</tr>
482473
<tr>
483474
<td>Hotkey F4</td>
@@ -500,15 +491,15 @@
500491
<td><a href="http://www.camdemy.com/media/19263">Forth word auto-complete</a></td>
501492
</tr>
502493
<tr>
503-
<td>Hotkey Enter</td>
504-
<td><a href="http://www.camdemy.com/media/19264">Jump into the input box</a></td>
494+
<td>Hotkey Ctrl-Enter</td>
495+
<td>Execute the command line in the input box even when the input box is not focused.
496+
So we can click on a HTML node or element, then press ctrl-enter to execute the command
497+
line that manipulates the HTML object.
498+
</td>
505499
</tr>
506500
<tr>
507501
<td>Hotkey Ctrl-Up/Ctrl-Down</td>
508-
<td><a href="http://www.camdemy.com/media/19265">Recall command history</a>
509-
Up/Down key (w/o Ctrl) pops up the command history if inputbox is empty.
510-
Use Ctrl-M or Shift-Enter when you want a 'Carriage Return' in inputbox.
511-
</td>
502+
<td>Recall used command lines</td>
512503
</tr>
513504
<tr>
514505
<td>Hotkey Alt-Up/Alt-Down</td>
@@ -520,14 +511,11 @@
520511
</tr>
521512
<tr>
522513
<td>Hotkey Ctrl-Break</td>
523-
<td><a href="http://www.camdemy.com/media/19268">Stop all parallel running tasks</a></td>
514+
<td><a href="http://www.camdemy.com/media/19268">Break the Forth interpreter</a></td>
524515
</tr>
525516
<tr>
526517
<td>Hotkey BackSpace</td>
527-
<td><a href="http://www.camdemy.com/media/19269">Erase the outputbox</a>
528-
bottom-up, Alt-BackSpace top-down. But they don't erase elements.
529-
Ctrl-BackSpace to erase elements. Add Shift key makes it faster.
530-
</td>
518+
<td><a href="http://www.camdemy.com/media/19269">Erase outputbox text when inputbox is empty</a></td>
531519
</tr>
532520
<tr>
533521
<td>help [*|pattern [-t|-T|-n|-N]]</td>
@@ -543,8 +531,11 @@
543531
<tr>
544532
<td>More information</td>
545533
<td>
546-
1. <a href="http://www.camdemy.com/folder/8691">Video presentation web site</a> <br>
547-
2. <a href="https://github.com/hcchengithub/jeforth.3we/wiki">jeforth.3we GitHub Wiki.</a>
534+
1. <a href="http://www.camdemy.com/folder/8691">Video presentation web site</a><br>
535+
536+
2. <a href="https://github.com/hcchengithub/jeforth.3we/wiki">jeforth.3we GitHub Wiki</a><br>
537+
3. <a href="https://guides.github.com/activities/hello-world/">GitHub version control and collaboration</a>
538+
548539
</td>
549540
</tr>
550541
</table>

‎3htm/js/jeforth.3htm.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var jeforth_project_k_virtual_machine_object = new jeForth(); // A permanent name.
22
var kvm = jeforth_project_k_virtual_machine_object; // "kvm" may not be so permanent.
33
(function(){
4-
kvm.minor_version = 204; // minor version specified by each application (like here), major version is from jeforth.js kernel.
4+
kvm.minor_version = jeforth3we_minor_version; // from js/version.js
55
var version = parseFloat(kvm.major_version+"."+kvm.minor_version);
66
kvm.appname = "jeforth.3htm"; // 不要動， jeforth.3we kernel 用來分辨不同 application。
77
kvm.host = window; // DOM window is the root for 3HTM. global 掛那裡的根據。

‎3nd/cfg.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set NODEJSHOME=C:\Program Files\nodejs
2+
set NODE_PATH=%NODEJSHOME%\node_modules
3+
set NODE_PATH=%NODE_PATH%;%NODE_PATH%\npm\node_modules

‎3nw/cfg.bat

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
set NODEJSHOME=C:\Program Files\nodejs
2+
set NODE_PATH=%NODEJSHOME%\node_modules
3+
set NODE_PATH=%NODE_PATH%;%NODE_PATH%\npm\node_modules

‎3nw/localstorage.json

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)