Merge pull request algorithm-visualizer#204 from nadr0/auto-generate-tracers

64json · web-flow · commit 8ceb11eb931c · 2016-07-08T21:59:54.000+09:00
Auto generate tracers - fixing bugs
diff --git a/js/create/array2d.js b/js/create/array2d.js
@@ -35,7 +35,7 @@ const tableToInputFields = (numRows, numColumns) => {
     for(var i = 0; i < numRows; i++){
         for(var j = 0; j < numColumns; j++){
             var elem = document.createElement('input');
-            elem.type = 'Number';
+            elem.type = 'Text';
             elem.value = Math.floor(Math.random() * 10 + 1);
             elem.classList.add('mtbl-col','inputField');
             table.childNodes[i].childNodes[j].innerHTML = '';
@@ -56,22 +56,40 @@ const generateJS = (logger, tracer, tracerName) => {
     logger.print('Copy and paste this code in your data.js file!');
     logger.print('');
 
-    logger.print('let myTable = [');
+    if(numRows > 1) {
+        logger.print('let myTable = [');
+    }
 
-    var line = '';
+    var line = 'let myTable = [';
     var i;
     var j;
     var comma = ',';
+    var currVal;
+    var nors;
     for(i = 0; i < numRows; i++){
-        line = '[';
+        if(numRows > 1){
+            line = '[';
+        }
         for(j = 0; j < numColumns-1; j++){
-            line += table.childNodes[i].childNodes[j].childNodes[0].value + ',';
+            currVal = table.childNodes[i].childNodes[j].childNodes[0].value;
+            nors = Number(currVal);
+            if(isNaN(nors)){
+                currVal = "'" + currVal + "'";
+            }
+            line += currVal + ',';
         }
         if(i === numRows - 1){comma = '';}
-        line += table.childNodes[i].childNodes[j++].childNodes[0].value + ']' + comma;
+        currVal = table.childNodes[i].childNodes[j++].childNodes[0].value;
+        nors = Number(currVal);
+        if(isNaN(nors)){
+            currVal = "'" + currVal + "'";
+        }
+        line += currVal + ']' + comma;
         logger.print(line);
     }
-    logger.print(']');
+    if(numRows > 1){
+        logger.print(']');
+    }
 
 
     logger.print("let myTableTracer = new "+ tracer +" ('"+tracerName+"')");
diff --git a/js/create/index.js b/js/create/index.js
@@ -85,6 +85,7 @@ const init = () => {
         array2d.setup();
         array1d.setup();
         closeCreate();
+        util.clickTraceTab();
     }
 };
 
diff --git a/js/create/util.js b/js/create/util.js
@@ -39,8 +39,16 @@ const enabledHightlighting = () =>{
     }
 }
 
+const clickTraceTab = () => {
+    var btn = document.getElementById('btn_trace');
+    if(btn){
+        btn.click();
+    }
+}
+
 module.exports = {
     enabledHightlighting,
     positionModules,
-    clearModules
+    clearModules,
+    clickTraceTab
 };

Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,7 @@ const init = () => {`
`85`	`85`	`array2d.setup();`
`86`	`86`	`array1d.setup();`
`87`	`87`	`closeCreate();`
	`88`	`+ util.clickTraceTab();`
`88`	`89`	`}`
`89`	`90`	`};`
`90`	`91`