safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 05:31:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-958: Work around iOS 7 visibility issue (again) by using object instead of iframe. The resize sensor needs to be where it used to be in the DOM for proper operation.

Browse Source
This commit is contained in:
Michael Jumper
2015-01-29 17:38:47 -08:00
parent 5a95edfb71
commit 5f6f63c5f7
6 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
guacamole/src/main/webapp/app/client/directives/guacClient.js
View File

@@ -339,7 +339,7 @@ angular.module('client').directive('guacClient', [function guacClient() {
});
// 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
if (client && display) {

2
guacamole/src/main/webapp/app/client/directives/guacThumbnail.js
View File

@@ -164,7 +164,7 @@ angular.module('client').directive('guacThumbnail', [function guacThumbnail() {
});
// 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);
});

6
guacamole/src/main/webapp/app/client/templates/guacClient.html
View File

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

2
guacamole/src/main/webapp/app/client/templates/guacThumbnail.html
View File

@@ -22,7 +22,7 @@
-->
<!-- 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 -->
<div class="display">

2
guacamole/src/main/webapp/app/osk/directives/guacOsk.js
View File

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

2
guacamole/src/main/webapp/app/osk/templates/guacOsk.html
View File

@@ -22,6 +22,6 @@
-->
<!-- 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>