mike-jumper opened a new pull request, #858:
URL: https://github.com/apache/guacamole-client/pull/858
This change reapplies the same commits from #815 against `staging/1.5.2`.
**NOTE:** This will result in merge conflicts when `staging/1.5.2` is merged
back to `master` due to the non-bugfix changes on `master` from #798. The
single conflict is on `indexController.js` and should be fairly trivial to
resolve:
```
<<<<<<< HEAD
/**
* The number of milliseconds that should elapse between client-side
* session checks. This DOES NOT impact whether a session expires at all;
* such checks will always be server-side. This only affects how quickly
* the client-side view can recognize that a user's session has expired
* absent any action taken by the user.
*
* @type {!number}
*/
const SESSION_VALIDITY_RECHECK_INTERVAL = 15000;
// Required types
const Error = $injector.get('Error');
const ManagedClientState = $injector.get('ManagedClientState');
=======
// Required types
const Error = $injector.get('Error');
>>>>>>> test-merge-1.5.2
```
As these changes only require the addition of `Error`, something already
present on `master`, it's sufficient to just accept the `HEAD` version:
```js
/**
* The number of milliseconds that should elapse between client-side
* session checks. This DOES NOT impact whether a session expires at all;
* such checks will always be server-side. This only affects how quickly
* the client-side view can recognize that a user's session has expired
* absent any action taken by the user.
*
* @type {!number}
*/
const SESSION_VALIDITY_RECHECK_INTERVAL = 15000;
// Required types
const Error = $injector.get('Error');
const ManagedClientState = $injector.get('ManagedClientState');
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
