mirror of
				https://github.com/gyurix1968/guacamole-client.git
				synced 2025-10-31 00:53:21 +00:00 
			
		
		
		
	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:
		| @@ -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) { | ||||
|   | ||||
| @@ -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); | ||||
|             }); | ||||
|  | ||||
|   | ||||
| @@ -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> | ||||
| @@ -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"> | ||||
|   | ||||
| @@ -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); | ||||
|  | ||||
|                 } | ||||
|  | ||||
|   | ||||
| @@ -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> | ||||
|   | ||||
		Reference in New Issue
	
	Block a user