From a5c48f2f780b9bb66db9493c0b797282e6b398ce Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Wed, 17 Apr 2019 13:35:20 +0300 Subject: [PATCH] [pe mobile] [sse mobile] fix bag moving in pages --- .../presentationeditor/mobile/app/controller/Settings.js | 9 ++++++--- apps/spreadsheeteditor/mobile/app/controller/Settings.js | 5 ++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js index be74cbd36..5bb4b7209 100644 --- a/apps/presentationeditor/mobile/app/controller/Settings.js +++ b/apps/presentationeditor/mobile/app/controller/Settings.js @@ -140,7 +140,8 @@ define([ } rootView = uiApp.addView('.settings-root-view', { - dynamicNavbar: true + dynamicNavbar: true, + domCache: true }); Common.NotificationCenter.trigger('settingscontainer:show'); @@ -160,12 +161,14 @@ define([ $('#settings-readermode input:checkbox').single('change', _.bind(me._onReaderMode, me)); $('#settings-spellcheck input:checkbox').single('change', _.bind(me._onSpellcheck, me)); $(modalView).find('.formats a').single('click', _.bind(me._onSaveFormat, me)); - $('#page-settings-setup-view #slide-size-block li').single('click', _.bind(me._onSlideSize, me)); + $('#page-settings-view #slide-size-block li').single('click', _.bind(me._onSlideSize, me)); $('#settings-print').single('click', _.bind(me._onPrint, me)); + Common.Utils.addScrollIfNeed('.page[data-page=settings-setup-view]', '.page[data-page=settings-setup-view] .page-content'); Common.Utils.addScrollIfNeed('.page[data-page=settings-download-view]', '.page[data-page=settings-download-view] .page-content'); Common.Utils.addScrollIfNeed('.page[data-page=settings-info-view]', '.page[data-page=settings-info-view] .page-content'); Common.Utils.addScrollIfNeed('.page[data-page=settings-about-view]', '.page[data-page=settings-about-view] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=color-schemes-view]', '.page[data-page=color-schemes-view] .page-content'); me.initSettings(pageId); }, @@ -202,7 +205,7 @@ define([ }, this); }, - onColorSchemaClick: function () { + onColorSchemaClick: function (event) { if (this.api) { var ind = $(event.currentTarget).children('input').val(); this.api.ChangeColorScheme(ind); diff --git a/apps/spreadsheeteditor/mobile/app/controller/Settings.js b/apps/spreadsheeteditor/mobile/app/controller/Settings.js index 058b99a28..309177f4f 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/controller/Settings.js @@ -134,7 +134,8 @@ define([ } rootView = uiApp.addView('.settings-root-view', { - dynamicNavbar: true + dynamicNavbar: true, + domCache: true }); Common.NotificationCenter.trigger('settingscontainer:show'); @@ -162,8 +163,10 @@ define([ me.setLicInfo(_licInfo); } else if ('#settings-application-view' == pageId) { me.initPageApplicationSettings(); + Common.Utils.addScrollIfNeed('.page[data-page=settings-application-view]', '.page[data-page=settings-application-view] .page-content'); } else if ('#color-schemes-view' == pageId) { me.initPageColorSchemes(); + Common.Utils.addScrollIfNeed('.page[data-page=color-schemes-view]', '.page[data-page=color-schemes-view] .page-content'); } },