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-963: Simplify guacUpload directive - $eval() only at link time.

Browse Source
This commit is contained in:
Michael Jumper
2015-01-02 20:26:52 -08:00
parent a899a1a02f
commit bce2270952
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
guacamole/src/main/webapp/app/element/directives/guacUpload.js
View File

@@ -33,13 +33,13 @@ angular.module('element').directive('guacUpload', ['$document', function guacUpl
link: function linkGuacUpload($scope, $element, $attrs) { link: function linkGuacUpload($scope, $element, $attrs) {
/** /**
* Angular expression which evaluates to the function to call * The function to call whenever files are chosen. The callback is
* whenever files are chosen. The callback is provided a single * provided a single parameter: the FileList containing all chosen
* parameter: the FileList containing all chosen files. * files.
* *
* @type String * @type Function
*/ */
var guacUpload = $attrs.guacUpload; var guacUpload = $scope.$eval($attrs.guacUpload);
/** /**
* The element which will register the drag gesture. * The element which will register the drag gesture.
@@ -73,11 +73,9 @@ angular.module('element').directive('guacUpload', ['$document', function guacUpl
input.addEventListener('change', function filesSelected() { input.addEventListener('change', function filesSelected() {
$scope.$apply(function setSelectedFiles() { $scope.$apply(function setSelectedFiles() {
var callback = $scope.$eval(guacUpload);
// Only set chosen files selection is not canceled // Only set chosen files selection is not canceled
if (callback && input.files.length > 0) if (guacUpload && input.files.length > 0)
callback(input.files); guacUpload(input.files);
// Reset selection // Reset selection
form.reset(); form.reset();