From 09819f93ab0e1c8524dbed6afce6c73e87b4eaa3 Mon Sep 17 00:00:00 2001 From: Matthew Petroff Date: Tue, 24 Apr 2012 18:38:46 -0400 Subject: [PATCH] Bugfixes. --- src/js/pannellum.js | 2 +- utils/build.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/js/pannellum.js b/src/js/pannellum.js index ea3af8b..4070ce2 100644 --- a/src/js/pannellum.js +++ b/src/js/pannellum.js @@ -302,7 +302,7 @@ function getURLParameter(name) { function toggleFullWindow() { if(scene) { - if(fullWindowActive == false) { + if(!fullWindowActive && !popoutmode) { try { var page = document.getElementById('page'); if (page.requestFullscreen) { diff --git a/utils/build.py b/utils/build.py index 495f618..254c57a 100644 --- a/utils/build.py +++ b/utils/build.py @@ -5,9 +5,9 @@ import tempfile import sys JS = [ -'js/pannellum.js', 'js/Three.js', -'js/RequestAnimationFrame.js' +'js/RequestAnimationFrame.js', +'js/pannellum.js' ] CSS = [