Merge pull request #74 from glyptodon/mobile-issues

GUAC-958: Yet another attempt at a workaround for the iOS 7 visibility issue.
This commit is contained in:
James Muehlner
2015-01-29 20:03:36 -08:00
6 changed files with 8 additions and 8 deletions

View File

@@ -339,7 +339,7 @@ angular.module('client').directive('guacClient', [function guacClient() {
}); });
// If the element is resized, attempt to resize client // If the element is resized, attempt to resize client
resizeSensor.contentWindow.addEventListener('resize', function mainElementResized() { resizeSensor.contentDocument.defaultView.addEventListener('resize', function mainElementResized() {
// Send new display size, if changed // Send new display size, if changed
if (client && display) { if (client && display) {

View File

@@ -164,7 +164,7 @@ angular.module('client').directive('guacThumbnail', [function guacThumbnail() {
}); });
// If the element is resized, attempt to resize client // If the element is resized, attempt to resize client
resizeSensor.contentWindow.addEventListener('resize', function mainElementResized() { resizeSensor.contentDocument.defaultView.addEventListener('resize', function mainElementResized() {
$scope.$apply(updateDisplayScale); $scope.$apply(updateDisplayScale);
}); });

View File

@@ -24,9 +24,6 @@
<!-- Display --> <!-- Display -->
<div class="displayOuter"> <div class="displayOuter">
<!-- Resize sensor -->
<iframe class="resize-sensor" src="app/client/templates/blank.html"></iframe>
<div class="displayMiddle"> <div class="displayMiddle">
<div class="display software-cursor"> <div class="display software-cursor">
</div> </div>
@@ -34,4 +31,7 @@
</div> </div>
<!-- Resize sensor -->
<object type="text/html" class="resize-sensor" data="app/client/templates/blank.html"></object>
</div> </div>

View File

@@ -22,7 +22,7 @@
--> -->
<!-- Resize sensor --> <!-- Resize sensor -->
<iframe class="resize-sensor" src="app/client/templates/blank.html"></iframe> <object type="text/html" class="resize-sensor" data="app/client/templates/blank.html"></object>
<!-- Display --> <!-- Display -->
<div class="display"> <div class="display">

View File

@@ -106,7 +106,7 @@ angular.module('osk').directive('guacOsk', [function guacOsk() {
}; };
// Resize keyboard whenever element changes size // Resize keyboard whenever element changes size
resizeSensor.contentWindow.addEventListener('resize', resizeListener); resizeSensor.contentDocument.defaultView.addEventListener('resize', resizeListener);
} }

View File

@@ -22,6 +22,6 @@
--> -->
<!-- Resize sensor --> <!-- Resize sensor -->
<iframe class="resize-sensor" src="app/osk/templates/blank.html"></iframe> <object type="text/html" class="resize-sensor" data="app/osk/templates/blank.html"></object>
</div> </div>