Merge branch 'master' into patch-2

This commit is contained in:
Kevin Froman 2017-03-27 23:39:40 -05:00 committed by GitHub
commit 8d0e1b582c

View File

@ -156,6 +156,7 @@ $('#go').click(function(){
} }
} }
// convert result to binary // convert result to binary
output = textToBin(input); output = textToBin(input);
$('#output').val(replaceAll(replaceAll(output.toString(), "1", one), "0", zero)); $('#output').val(replaceAll(replaceAll(output.toString(), "1", one), "0", zero));
} }
@ -173,7 +174,7 @@ $('#go').click(function(){
return false; return false;
} }
} }
$('#output').val(output.toString()); $('#output').val(atob(output.toString()));
} }
$('#outputModal').modal(); $('#outputModal').modal();
}); });