Reorder modes for functional style.

jorendorff · Sep 24, 2013 · d95b485 · d95b485
1 parent c0cb144
commit d95b485
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 13 deletions.
diff --git a/calculator.html b/calculator.html
@@ -60,11 +60,11 @@ <h1>Compilers 101 Toy Calculator</h1>
       <p class="srclink"><a href="docs/calculator-parser.html">parser source</a>
         | <a href="docs/calculator-backends.html">back-end source</a></p>
       <ul id="options">
-        <li><label><input type="radio" name="mode" value="calc" checked>calculator mode</label>
-        <li><label><input type="radio" name="mode" value="fraction">fraction mode</label>
+        <li><label><input type="radio" name="mode" value="json" checked>JSON mode</label>
         <li><label><input type="radio" name="mode" value="blocks">Scratch mode</label>
-        <li><label><input type="radio" name="mode" value="json">JSON mode</label>
         <li><label><input type="radio" name="mode" value="mathml">MathML mode</label>
+        <li><label><input type="radio" name="mode" value="calc">calculator mode</label>
+        <li><label><input type="radio" name="mode" value="fraction">fraction mode</label>
         <li><label><input type="radio" name="mode" value="graph">graph mode</label>
         <li><label><input type="radio" name="mode" value="complex">complex mode</label>
       </ul>

diff --git a/ui.js b/ui.js
@@ -344,26 +344,26 @@ function go() {
     try {
         var result = parseModes[mode](question);
         switch (mode) {
-        case 'calc':
-            Shell.printAnswer(result);
-            break;
-
-        case 'fraction':
-            Shell.printAnswer(result);
+        case 'json':
+            Shell.printAnswer(JSON.stringify(result, undefined, "    "));
             break;
 
         case 'blocks':
             writeNode("normalOutput", result);
             break;
 
-        case 'json':
-            Shell.printAnswer(JSON.stringify(result, undefined, "    "));
-            break;
-
         case 'mathml':
             writeNode("normalOutput", result.element);
             break;
 
+        case 'calc':
+            Shell.printAnswer(result);
+            break;
+
+        case 'fraction':
+            Shell.printAnswer(result);
+            break;
+
         case 'graph':
             showPlot(result);
             break;