diff --git a/client/assets/js/main.js b/client/assets/js/main.js index e19e237..73ffaf2 100644 --- a/client/assets/js/main.js +++ b/client/assets/js/main.js @@ -34,6 +34,10 @@ var createWebSocketConnection = function() { } var navigationClickHandler = function(e) { + if ($(this).attr('href') === '#') { + return + } + $('.pane').hide(); var target = $(this).attr('href'); @@ -205,12 +209,12 @@ var liveClickHandler = function(e) { doScreenshot(); } -var screenshotImgClickHandler = function(e) { - var img = $screenshotImg.get(0); - var isFullscreen = parseInt($screenshotImg.attr('data-fullscreen')); +var fullscreenHandler = function(e) { + var element = $(e.target.getAttribute('data-target')); + var isFullscreen = parseInt($(e.target).attr('data-fullscreen')); if (isFullscreen) { - $screenshotImg.attr('data-fullscreen', '0'); + element.attr('data-fullscreen', '0'); if (document.exitFullscreen) { document.exitFullscreen(); @@ -220,14 +224,14 @@ var screenshotImgClickHandler = function(e) { document.mozCancelFullScreen(); } } else { - $screenshotImg.attr('data-fullscreen', '1'); + $(e.target).attr('data-fullscreen', '1'); - if (img.requestFullscreen) { - img.requestFullscreen(); - } else if (img.webkitRequestFullscreen) { - img.webkitRequestFullscreen(); - } else if (img.mozRequestFullScreen) { - img.mozRequestFullScreen(); + if (element.get(0).requestFullscreen) { + element.get(0).requestFullscreen(); + } else if (element.get(0).webkitRequestFullscreen) { + element.get(0).webkitRequestFullscreen(); + } else if (element.get(0).mozRequestFullScreen) { + element.get(0).mozRequestFullScreen(); } } } @@ -268,7 +272,7 @@ var addListeners = function() { $('#live').click(liveClickHandler); - $screenshotImg.click(screenshotImgClickHandler) + $('.btn-fullscreen').click(fullscreenHandler) } var bootstrap = function() { diff --git a/client/index.html b/client/index.html index 673e4af..cac003e 100644 --- a/client/index.html +++ b/client/index.html @@ -28,6 +28,9 @@