diff options
| author | Guillermo Ramos | 2015-02-05 16:50:43 +0100 |
|---|---|---|
| committer | Guillermo Ramos | 2015-02-05 16:50:43 +0100 |
| commit | 92c6f13bbe48a47f932ac94677cd61f4c97ab090 (patch) | |
| tree | 5dec06fa93671ef2766f3b8b613e45a8567e3311 /templates | |
| parent | 518ef6fff0d17440b7f19fdaed04061be5096848 (diff) | |
| download | turing-web-92c6f13bbe48a47f932ac94677cd61f4c97ab090.tar.gz | |
JSON-formatted commands
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/home.hamlet | 4 | ||||
| -rw-r--r-- | templates/home.julius | 15 |
2 files changed, 9 insertions, 10 deletions
diff --git a/templates/home.hamlet b/templates/home.hamlet index 4155dbb..9b429b5 100644 --- a/templates/home.hamlet +++ b/templates/home.hamlet @@ -4,7 +4,7 @@ <div class="col-sm-12 col-md-12"> <div class="row"> <div class="col-sm-12 col-md-12"> - <pre id="#{results}"> + <pre id="#{prTape}"> <div class="row"> <div class="col-sm-12 col-md-12"> <button id="#{butBeginning}" class="btn"> @@ -17,4 +17,4 @@ <span class="glyphicon glyphicon-step-forward"> <div class="row"> <div class="col-sm-12 col-md-12"> - <pre id="#{state}"> + <pre id="#{prTrans}"> diff --git a/templates/home.julius b/templates/home.julius index 0c33c09..e679e40 100644 --- a/templates/home.julius +++ b/templates/home.julius @@ -4,8 +4,8 @@ $(function() { bBackward : $("##{rawJS butBackward}"), bTogglePlay : $("##{rawJS butTogglePlay}"), bForward : $("##{rawJS butForward}"), - results : $("##{rawJS results}"), - state : $("##{rawJS state}") + prTape : $("##{rawJS prTape}"), + prTrans : $("##{rawJS prTrans}") }; var pollInterval = 10000; var playing = false; @@ -65,12 +65,11 @@ $(function() { alert("SOCKET CLOSED! D: (" + e.code + ")"); }; sock.onmessage = function (e) { - // var data = JSON.parse(e.data); - var data = e.data; - if (data[1] === "+") { - ui.state.html(data); - } else { - ui.results.html(data); + var data = JSON.parse(e.data); + if (data["type"] === "tape") { + ui.prTape.html(data["value"]); + } else if (data["type"] === "trans") { + ui.prTrans.html(data["value"]); } }; sock.onerror = function (e) { |