summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorpommicket <leonardomtenenbaum@gmail.com>2016-08-29 23:07:21 -0400
committerpommicket <leonardomtenenbaum@gmail.com>2016-08-29 23:07:21 -0400
commit7c8ffd449ab7365cbe6e135f1a0a0de122d00e9e (patch)
tree27b827f5e6c70636c1cca70c4c19e6ade8bcf9ea /js
parentd2e73d6a7b74bd0d0fb409110ae2fc522d4f83e6 (diff)
Changed navbar
Diffstat (limited to 'js')
-rw-r--r--js/AutoVideos.js13
1 files changed, 6 insertions, 7 deletions
diff --git a/js/AutoVideos.js b/js/AutoVideos.js
index bd3a744..08a47fc 100644
--- a/js/AutoVideos.js
+++ b/js/AutoVideos.js
@@ -10,7 +10,6 @@ var numberweights = {"Constant":1};
var numberweight;
var singleweight;
var eqlength;
-var functionp = document.getElementById('Function');
var notify;
for(var i = 0; i < single.length; i++)
@@ -224,7 +223,7 @@ function create()
' y = Math.floor((i/4) / xsize);'+
' r = Math.abs(Math.round((' + requation + ') % 255));'+
' g = Math.abs(Math.round((' + gequation + ') % 255));'+
- ' b = Math.abs(Math.round((' + bequation + ') % 255));'+
+ ' b = Math.abs(Math.round((' + bequation + ') % 255));'+
' data[i] = r;'+
' data[i+1] = g;'+
' data[i+2] = b;'+
@@ -239,21 +238,21 @@ function create()
var url = webkitURL.createObjectURL(output);
video.src = url;
- ctx.drawImage(video, 0, 0);
+ $("#Canvas").hide();
+
d = new Date();
var end = d.getTime();
- var timeparagraph = document.getElementById('Time');
var timetaken = Math.round((end-start)/1000);
if (timetaken == 1)
{
- timeparagraph.innerHTML = 'The time it took was 1 second.';
+ $("#Time").html('The time it took was 1 second.');
}
else
{
- timeparagraph.innerHTML = 'The time it took was ' + timetaken + ' seconds.';
+ $("#Time").html('The time it took was ' + timetaken + ' seconds.');
}
- functionp.innerHTML = '$Functions: \\newline\\newline Red: $' + rmvmath(requation) + '$\\newline\\newline Green: $' + rmvmath(gequation) + '$\\newline\\newline Blue: $' + rmvmath(bequation) + '$';
+ $("#Function").html('$Functions: \\newline\\newline Red: $' + rmvmath(requation) + '$\\newline\\newline Green: $' + rmvmath(gequation) + '$\\newline\\newline Blue: $' + rmvmath(bequation) + '$');
LatexIT.render('*',false);
if(notify)