GUAC-963: Scroll file transfer into view when menu is shown.

This commit is contained in:
Michael Jumper
2015-01-02 02:34:39 -08:00
parent 8c4a0e7854
commit 2423422340
4 changed files with 118 additions and 3 deletions

View File

@@ -385,11 +385,14 @@ angular.module('client').controller('clientController', ['$scope', '$routeParams
$scope.page.title = name;
});
// Show menu if new file transfers have started
// Show file transfer section of menu if new file transfers have started
$scope.$watch('client.uploads.length + client.downloads.length', function transfersChanged(count, oldCount) {
if (count > oldCount)
// Show menu and scroll file transfer into view
if (count > oldCount) {
$scope.menuShown = true;
$scope.fileTransferMarker.scrollIntoView();
}
});

View File

@@ -69,7 +69,7 @@
</div>
<!-- File transfers -->
<h3>{{'CLIENT.SECTION_HEADER_FILE_TRANSFERS' | translate}}</h3>
<h3 guac-marker="fileTransferMarker">{{'CLIENT.SECTION_HEADER_FILE_TRANSFERS' | translate}}</h3>
<div class="content" id="file-transfers">
<guac-file-transfer-manager client="client"></guac-file-transfer-manager>
</div>

View File

@@ -0,0 +1,62 @@
/*
* 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 stores a marker which refers to a specific element,
* allowing that element to be scrolled into view when desired.
*/
angular.module('element').directive('guacMarker', ['$injector', function guacMarker($injector) {
// Required types
var Marker = $injector.get('Marker');
// Required services
var $parse = $injector.get('$parse');
return {
restrict: 'A',
link: function linkGuacMarker($scope, $element, $attrs) {
/**
* The property in which a new Marker should be stored. The new
* Marker will refer to the element associated with this directive.
*
* @type Marker
*/
var guacMarker = $parse($attrs.guacMarker);
/**
* The element to associate with the new Marker.
*
* @type Element
*/
var element = $element[0];
// Assign new marker
guacMarker.assign($scope, new Marker(element));
}
};
}]);

View File

@@ -0,0 +1,50 @@
/*
* 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.
*/
/**
* Provides the Marker class definition.
*/
angular.module('element').factory('Marker', [function defineMarker() {
/**
* Creates a new Marker which allows its associated element to be scolled
* into view as desired.
*
* @constructor
* @param {Element} element
* The element to associate with this marker.
*/
var Marker = function Marker(element) {
/**
* Scrolls scrollable elements, or the window, as needed to bring the
* element associated with this marker into view.
*/
this.scrollIntoView = function scrollIntoView() {
element.scrollIntoView();
};
};
return Marker;
}]);