summaryrefslogtreecommitdiffstats
path: root/webapp
diff options
context:
space:
mode:
Diffstat (limited to 'webapp')
-rw-r--r--webapp/components/needs_team.jsx12
-rw-r--r--webapp/package.json1
2 files changed, 13 insertions, 0 deletions
diff --git a/webapp/components/needs_team.jsx b/webapp/components/needs_team.jsx
index 1c7bc307d..f7244018d 100644
--- a/webapp/components/needs_team.jsx
+++ b/webapp/components/needs_team.jsx
@@ -39,6 +39,9 @@ import InviteMemberModal from 'components/invite_member_modal.jsx';
import LeaveTeamModal from 'components/leave_team_modal.jsx';
import SelectTeamModal from 'components/admin_console/select_team_modal.jsx';
+import iNoBounce from 'inobounce';
+import * as UserAgent from 'utils/user_agent.jsx';
+
export default class NeedsTeam extends React.Component {
constructor(params) {
super(params);
@@ -103,6 +106,11 @@ export default class NeedsTeam extends React.Component {
});
Utils.applyTheme(this.state.theme);
+
+ if (UserAgent.isIosSafari()) {
+ // Use iNoBounce to prevent scrolling past the boundaries of the page
+ iNoBounce.enable();
+ }
}
componentDidUpdate(prevProps, prevState) {
@@ -116,6 +124,10 @@ export default class NeedsTeam extends React.Component {
PreferenceStore.removeChangeListener(this.onPreferencesChanged);
$(window).off('focus');
$(window).off('blur');
+
+ if (UserAgent.isIosSafari()) {
+ iNoBounce.disable();
+ }
}
render() {
diff --git a/webapp/package.json b/webapp/package.json
index 085375e5c..3a38661d1 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -12,6 +12,7 @@
"flux": "2.1.1",
"font-awesome": "4.6.3",
"highlight.js": "9.7.0",
+ "inobounce": "0.1.3",
"intl": "1.2.5",
"jasny-bootstrap": "3.1.3",
"jquery": "3.1.1",