diff options
Diffstat (limited to 'core/js')
| -rw-r--r-- | core/js/js.js | 3 | ||||
| -rw-r--r-- | core/js/tests/specs/coreSpec.js | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/core/js/js.js b/core/js/js.js index c9427bf533d..a9180663405 100644 --- a/core/js/js.js +++ b/core/js/js.js @@ -1631,7 +1631,8 @@ function initCore() { navigationBarSlideGestureAllowed = false; if (navigationBarSlideGestureEnabled) { - snapper.disable(); + var endCurrentDrag = true; + snapper.disable(endCurrentDrag); navigationBarSlideGestureEnabled = false; navigationBarSlideGestureEnablePending = true; diff --git a/core/js/tests/specs/coreSpec.js b/core/js/tests/specs/coreSpec.js index d2bb2a504e9..b6c617303cf 100644 --- a/core/js/tests/specs/coreSpec.js +++ b/core/js/tests/specs/coreSpec.js @@ -1175,6 +1175,7 @@ describe('Core base tests', function() { expect(snapperStub.enable.calledOnce).toBe(true); expect(snapperStub.disable.calledOnce).toBe(true); + expect(snapperStub.disable.alwaysCalledWithExactly(true)).toBe(true); expect(snapperStub.close.called).toBe(false); }); it('is not disabled again when disallowing the gesture twice on a narrow screen', function() { @@ -1190,6 +1191,7 @@ describe('Core base tests', function() { expect(snapperStub.enable.calledOnce).toBe(true); expect(snapperStub.disable.calledOnce).toBe(true); + expect(snapperStub.disable.alwaysCalledWithExactly(true)).toBe(true); expect(snapperStub.close.called).toBe(false); OC.disallowNavigationBarSlideGesture(); @@ -1211,6 +1213,7 @@ describe('Core base tests', function() { expect(snapperStub.enable.calledOnce).toBe(true); expect(snapperStub.disable.calledOnce).toBe(true); + expect(snapperStub.disable.alwaysCalledWithExactly(true)).toBe(true); expect(snapperStub.close.called).toBe(false); OC.allowNavigationBarSlideGesture(); @@ -1232,6 +1235,7 @@ describe('Core base tests', function() { expect(snapperStub.enable.calledOnce).toBe(true); expect(snapperStub.disable.calledOnce).toBe(true); + expect(snapperStub.disable.alwaysCalledWithExactly(true)).toBe(true); expect(snapperStub.close.called).toBe(false); OC.allowNavigationBarSlideGesture(); @@ -1435,6 +1439,7 @@ describe('Core base tests', function() { expect(snapperStub.enable.calledOnce).toBe(true); expect(snapperStub.disable.calledTwice).toBe(true); + expect(snapperStub.disable.getCall(1).calledWithExactly(true)).toBe(true); }); it('is disabled when resizing to a wide screen', function() { viewport.set(480); |