Skip to content

E
edx-platform
Commit 85a29648 by Ernie Park
Options

fix enter on submit for calculator, needs styling

parent 2663408a
Showing with 5 additions and 2 deletions
main.html
...@@ -69,9 +69,11 @@ ...@@ -69,9 +69,11 @@
</div> </div>
<div id="calculator_div" class="leanModal_box"> <div id="calculator_div" class="leanModal_box">
<form id="calculator">
<input type="text" id="calculator_input"> <input type="text" id="calculator_input">
<input id="calculator_button" type=button value="=&gt;"> <input id="calculator_button" type="submit" value="=&gt;">
<input type="text" id="calculator_output" readonly> <input type="text" id="calculator_output" readonly>
</form>
<table> <tr><td align="right">Suffixes</td><td>&nbsp;:&nbsp;</td><td align="left"> %kMGTcmunp</td></tr> <table> <tr><td align="right">Suffixes</td><td>&nbsp;:&nbsp;</td><td align="left"> %kMGTcmunp</td></tr>
<tr><td align="right">Operations</td><td>&nbsp;:&nbsp;</td><td align="left"> ^ * / + - ()</td></tr> <tr><td align="right">Operations</td><td>&nbsp;:&nbsp;</td><td align="left"> ^ * / + - ()</td></tr>
...@@ -103,7 +105,8 @@ $(function() { ...@@ -103,7 +105,8 @@ $(function() {
// Calculator // Calculator
$(function() { $(function() {
$("#calculator_button").click(function(){ $("form#calculator").submit(function(e){
e.preventDefault();
$.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")}, $.getJSON("/calculate", {"equation":$("#calculator_input").attr("value")},
function(data){ function(data){
$("#calculator_output").attr("value",data.result); $("#calculator_output").attr("value",data.result);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment