mirror of
https://github.com/gyurix1968/guacamole-client.git
synced 2025-09-07 13:41:21 +00:00
GUAC-955: Add guacViewport directive which maintains content within the visible portion of the browser window, even if the browser magically scrolls itself.
This commit is contained in:
Michael Jumper
@@ -0,0 +1,87 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2014 Glyptodon LLC
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A directive which provides a fullscreen environment for its content.
|
||||||
|
*/
|
||||||
|
angular.module('client').directive('guacViewport', [function guacViewport() {
|
||||||
|
|
||||||
|
return {
|
||||||
|
// Element only
|
||||||
|
restrict: 'E',
|
||||||
|
scope: false,
|
||||||
|
transclude: true,
|
||||||
|
templateUrl: 'app/client/templates/guacViewport.html',
|
||||||
|
controller: ['$window', '$document', '$element',
|
||||||
|
function guacViewportController($window, $document, $element) {
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The fullscreen container element.
|
||||||
|
*
|
||||||
|
* @type Element
|
||||||
|
*/
|
||||||
|
var element = $element.find('.viewport')[0];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The main document object.
|
||||||
|
*
|
||||||
|
* @type Document
|
||||||
|
*/
|
||||||
|
var document = $document[0];
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The current adjusted height of the viewport element, if any.
|
||||||
|
*
|
||||||
|
* @type Number
|
||||||
|
*/
|
||||||
|
var currentAdjustedHeight = null;
|
||||||
|
|
||||||
|
// Fit container within visible region when window scrolls
|
||||||
|
$window.onscroll = function fitScrollArea() {
|
||||||
|
|
||||||
|
// Pull scroll properties
|
||||||
|
var scrollLeft = document.body.scrollLeft;
|
||||||
|
var scrollTop = document.body.scrollTop;
|
||||||
|
var scrollWidth = document.body.scrollWidth;
|
||||||
|
var scrollHeight = document.body.scrollHeight;
|
||||||
|
|
||||||
|
// Calculate new height
|
||||||
|
var adjustedHeight = $window.innerHeight - scrollTop;
|
||||||
|
|
||||||
|
// Only update if not in response to our own call to scrollTo()
|
||||||
|
if (scrollLeft !== scrollWidth && scrollTop !== scrollHeight
|
||||||
|
&& currentAdjustedHeight !== adjustedHeight) {
|
||||||
|
|
||||||
|
// Adjust element to fit exactly within visible area
|
||||||
|
element.style.height = adjustedHeight + 'px';
|
||||||
|
currentAdjustedHeight = adjustedHeight;
|
||||||
|
|
||||||
|
// Scroll to bottom
|
||||||
|
$window.scrollTo(scrollWidth, scrollHeight);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
}]
|
||||||
|
};
|
||||||
|
}]);
|
||||||
@@ -39,7 +39,7 @@ body.client {
|
|||||||
|
|
||||||
.client-view {
|
.client-view {
|
||||||
display: table;
|
display: table;
|
||||||
position: fixed;
|
position: absolute;
|
||||||
top: 0;
|
top: 0;
|
||||||
left: 0;
|
left: 0;
|
||||||
width: 100%;
|
width: 100%;
|
||||||
|
|||||||
30
guacamole/src/main/webapp/app/client/styles/viewport.css
Normal file
30
guacamole/src/main/webapp/app/client/styles/viewport.css
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2013 Glyptodon LLC
|
||||||
|
*
|
||||||
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
* of this software and associated documentation files (the "Software"), to deal
|
||||||
|
* in the Software without restriction, including without limitation the rights
|
||||||
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
* copies of the Software, and to permit persons to whom the Software is
|
||||||
|
* furnished to do so, subject to the following conditions:
|
||||||
|
*
|
||||||
|
* The above copyright notice and this permission notice shall be included in
|
||||||
|
* all copies or substantial portions of the Software.
|
||||||
|
*
|
||||||
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
* THE SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
.viewport {
|
||||||
|
position: fixed;
|
||||||
|
bottom: 0;
|
||||||
|
left: 0;
|
||||||
|
width: 100%;
|
||||||
|
height: 100%;
|
||||||
|
overflow: hidden;
|
||||||
|
}
|
||||||
@@ -21,35 +21,38 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<!-- Client view -->
|
<!-- Client view -->
|
||||||
<div class="client-view">
|
<guac-viewport>
|
||||||
|
<div class="client-view">
|
||||||
|
|
||||||
<!-- Central portion of view -->
|
<!-- Central portion of view -->
|
||||||
<div class="client-body" guac-touch-drag="clientDrag" guac-touch-pinch="clientPinch">
|
<div class="client-body" guac-touch-drag="clientDrag" guac-touch-pinch="clientPinch">
|
||||||
|
|
||||||
<!-- Client -->
|
<!-- Client -->
|
||||||
<guac-client
|
<guac-client
|
||||||
client-properties="clientProperties"
|
client-properties="clientProperties"
|
||||||
id="id"
|
id="id"
|
||||||
connection-parameters="connectionParameters"/></guac-client>
|
connection-parameters="connectionParameters"/></guac-client>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<!-- Bottom portion of view -->
|
<!-- Bottom portion of view -->
|
||||||
<div class="client-bottom">
|
<div class="client-bottom">
|
||||||
|
|
||||||
|
<!-- Text input -->
|
||||||
|
<div class="text-input-container" ng-show="showTextInput">
|
||||||
|
<guac-text-input needs-focus="showTextInput"></guac-text-input>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- Text input -->
|
|
||||||
<div class="text-input-container" ng-show="showTextInput">
|
|
||||||
<guac-text-input needs-focus="showTextInput"></guac-text-input>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
</div>
|
<!-- On-screen keyboard -->
|
||||||
|
<div class="keyboard-container" ng-class="{shown: showOSK}">
|
||||||
|
<guac-osk layout="'CLIENT.URL_OSK_LAYOUT' | translate"/>
|
||||||
|
</div>
|
||||||
|
|
||||||
<!-- On-screen keyboard -->
|
</guac-viewport>
|
||||||
<div class="keyboard-container" ng-class="{shown: showOSK}">
|
|
||||||
<guac-osk layout="'CLIENT.URL_OSK_LAYOUT' | translate"/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- Menu -->
|
<!-- Menu -->
|
||||||
<div ng-class="{open: menuShown}" id="menu" guac-touch-drag="menuDrag">
|
<div ng-class="{open: menuShown}" id="menu" guac-touch-drag="menuDrag">
|
||||||
|
|||||||
@@ -0,0 +1,23 @@
|
|||||||
|
<div class="viewport" ng-transclude>
|
||||||
|
<!--
|
||||||
|
Copyright (C) 2014 Glyptodon LLC
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in
|
||||||
|
all copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
||||||
|
THE SOFTWARE.
|
||||||
|
-->
|
||||||
|
</div>
|
||||||
Reference in New Issue
Block a user