Skip to content

Commit

Permalink
Fixed title and wrongly capitalised filenames.
Browse files Browse the repository at this point in the history
  • Loading branch information
simonjohnthompson authored and shmish111 committed Oct 27, 2020
1 parent 36b69cc commit 1154a70
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion marlowe/doc/javascript-embedding.adoc
@@ -1,5 +1,5 @@
[#javascript-embedding]
== Marlowe in JavaScript
== Marlowe embedded in JavaScript

Marlowe is written as a Haskell data type, and thus it is straightforward to generate Marlowe smart contracts using Haskell. Nevertheless, we also provide a library written in TypeScript that can be used to generate Marlowe smart contracts from TypeScript or JavaScript in a similar way to how one would by using Haskell. If you are not familiar with TypeScript, you can also use the API as if it was written in JavaScript since TypeScript is a superset of JavaScript.

Expand Down
4 changes: 2 additions & 2 deletions marlowe/doc/playground-overview.adoc
Expand Up @@ -85,14 +85,14 @@ The editor supports auto-complete, error checking during editing, and informatio

It is this final value that is converted to pure Marlowe with the *Compile* button (in the top RH corner). If compilation is successful, the compiled code is shown in an overlay (which can be minimised):

image:JS-compiled.png[JS code compiled to Marlowe]
image:js-compiled.png[JS code compiled to Marlowe]

On successful compilation the result can be sent to the simulator using the *Send to Simulator*
button in the top RH corner of the page.

If the contract cannot successfully be converted to Marlowe, the errors are also shown in overlay:

image:JS-error.png[Errors in compiling JS code to Marlowe]
image:js-error.png[Errors in compiling JS code to Marlowe]

=== Developing contracts in Blockly

Expand Down

0 comments on commit 1154a70

Please sign in to comment.