mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2448 from nextcloud/errorreload-login 

only reload on errors when logged in
This commit is contained in:
Robin Appelman 2016-12-02 14:37:12 +01:00 committed by GitHub
parent 1b5ff9f5c7 e055fbd4da
commit bc597b1843
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/js/js.js
View File

@ -776,7 +776,7 @@ var OCP = {},
return;
}
if (_.contains([302, 303, 307, 401], xhr.status)) {
if (_.contains([302, 303, 307, 401], xhr.status) && OC.currentUser) {
// sometimes "beforeunload" happens later, so need to defer the reload a bit
setTimeout(function() {
if (!self._userIsNavigatingAway && !self._reloadCalled) {

4
core/js/tests/specs/coreSpec.js
View File

@ -969,8 +969,11 @@ describe('Core base tests', function() {
var reloadStub, ajaxErrorStub, clock;
var notificationStub;
var waitTimeMs = 6000;
var oldCurrentUser;
beforeEach(function() {
oldCurrentUser = OC.currentUser;
OC.currentUser = 'dummy';
clock = sinon.useFakeTimers();
reloadStub = sinon.stub(OC, 'reload');
notificationStub = sinon.stub(OC.Notification, 'show');
@ -980,6 +983,7 @@ describe('Core base tests', function() {
window.initCore();
});
afterEach(function() {
OC.currentUser = oldCurrentUser;
reloadStub.restore();
notificationStub.restore();
clock.restore();