javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-22 21:48:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(app): setScrollDisabled() is a private method

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-12-01 13:31:58 +01:00
parent 54d1e5e499
commit 7b2a6d523e
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/components/app/app.ts
View File

@ -93,6 +93,7 @@ export class App {
} }
/** /**
* @private
* Sets if the app is currently enabled or not, meaning if it's * Sets if the app is currently enabled or not, meaning if it's
* available to accept new user commands. For example, this is set to `false` * available to accept new user commands. For example, this is set to `false`
* while views transition, a modal slides up, an action-sheet * while views transition, a modal slides up, an action-sheet
@ -119,11 +120,12 @@ export class App {
} }
/** /**
* @private
* Toggles whether an application can be scrolled * Toggles whether an application can be scrolled
* @param {boolean} disableScroll when set to `false`, the application's * @param {boolean} disableScroll when set to `false`, the application's
* scrolling is enabled. When set to `true`, scrolling is disabled. * scrolling is enabled. When set to `true`, scrolling is disabled.
*/ */
setScrollDisabled(disableScroll: boolean) { _setDisableScroll(disableScroll: boolean) {
if (this._disableScrollAssist) { if (this._disableScrollAssist) {
this._appRoot._disableScroll(disableScroll); this._appRoot._disableScroll(disableScroll);
} }

4
src/gestures/gesture-controller.ts
View File

@ -150,7 +150,7 @@ export class GestureController {
this.disabledScroll.add(id); this.disabledScroll.add(id);
if (this._app && isEnabled && this.isScrollDisabled()) { if (this._app && isEnabled && this.isScrollDisabled()) {
console.debug('GestureController: Disabling scrolling'); console.debug('GestureController: Disabling scrolling');
this._app.setScrollDisabled(true); this._app._setDisableScroll(true);
} }
} }
@ -159,7 +159,7 @@ export class GestureController {
this.disabledScroll.delete(id); this.disabledScroll.delete(id);
if (this._app && isDisabled && !this.isScrollDisabled()) { if (this._app && isDisabled && !this.isScrollDisabled()) {
console.debug('GestureController: Enabling scrolling'); console.debug('GestureController: Enabling scrolling');
this._app.setScrollDisabled(false); this._app._setDisableScroll(false);
} }
} }