Commit b544658a authored by amandaghassaei's avatar amandaghassaei
Browse files

small fixes

parent bc71302d
...@@ -206,7 +206,6 @@ function initControls(globals){ ...@@ -206,7 +206,6 @@ function initControls(globals){
updateCanvasDimensions(); updateCanvasDimensions();
}); });
setLink("#createVideo", function(){ setLink("#createVideo", function(){
var hasWebP = false; var hasWebP = false;
(function() { (function() {
var img = new Image(); var img = new Image();
...@@ -214,14 +213,11 @@ function initControls(globals){ ...@@ -214,14 +213,11 @@ function initControls(globals){
hasWebP = !!(img.height > 0 && img.width > 0); hasWebP = !!(img.height > 0 && img.width > 0);
if (hasWebP){ if (hasWebP){
//timeLimit: s of video to limit //timeLimit: s of video to limit
globals.shouldScaleCanvas = true;
$("#screenCaptureModal .gif").hide(); $("#screenCaptureModal .gif").hide();
$("#screenCaptureModal .video").show(); $("#screenCaptureModal .video").show();
$("#screenCaptureModal").modal("show"); $("#screenCaptureModal").modal("show");
$("#screenRecordFilename").val(globals.filename); $("#screenRecordFilename").val(globals.filename);
globals.screenRecordFilename = globals.filename; globals.screenRecordFilename = globals.filename;
globals.threeView.onWindowResize();
updateCanvasDimensions();
} else { } else {
globals.warn("Video export not supported by this browser, please try again " + globals.warn("Video export not supported by this browser, please try again " +
"with the latest version of Google Chrome."); "with the latest version of Google Chrome.");
...@@ -240,6 +236,11 @@ function initControls(globals){ ...@@ -240,6 +236,11 @@ function initControls(globals){
globals.shouldScaleCanvas = false; globals.shouldScaleCanvas = false;
globals.threeView.onWindowResize(); globals.threeView.onWindowResize();
}); });
$("#screenCaptureModal").on('shown.bs.modal', function (){
globals.shouldScaleCanvas = true;//fixes problem of setting animation turning off shouldScaleCanvas
globals.threeView.onWindowResize();
updateCanvasDimensions();
});
setInput("#capturerFPS", globals.capturerFPS, function(val){ setInput("#capturerFPS", globals.capturerFPS, function(val){
globals.capturerFPS = val; globals.capturerFPS = val;
}, 0, 60); }, 0, 60);
......
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