diff --git a/apps/presentationeditor/mobile/app/controller/Settings.js b/apps/presentationeditor/mobile/app/controller/Settings.js index 53ba46997..222c16a6d 100644 --- a/apps/presentationeditor/mobile/app/controller/Settings.js +++ b/apps/presentationeditor/mobile/app/controller/Settings.js @@ -161,6 +161,10 @@ define([ $('#page-settings-setup-view li').single('click', _.bind(me._onSlideSize, me)); $('#settings-print').single('click', _.bind(me._onPrint, me)); + 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'); + me.initSettings(pageId); }, diff --git a/apps/presentationeditor/mobile/app/view/Settings.js b/apps/presentationeditor/mobile/app/view/Settings.js index 5f2d32da8..26fd692fc 100644 --- a/apps/presentationeditor/mobile/app/view/Settings.js +++ b/apps/presentationeditor/mobile/app/view/Settings.js @@ -81,6 +81,7 @@ define([ $('#settings-about').single('click', _.bind(me.showAbout, me)); $('#settings-presentation-setup').single('click', _.bind(me.showSetup, me)); + Common.Utils.addScrollIfNeed('.view[data-page=settings-root-view] .pages', '.view[data-page=settings-root-view] .page'); me.initControls(); }, diff --git a/apps/presentationeditor/mobile/app/view/add/AddShape.js b/apps/presentationeditor/mobile/app/view/add/AddShape.js index 55ec28ebb..5e815d183 100644 --- a/apps/presentationeditor/mobile/app/view/add/AddShape.js +++ b/apps/presentationeditor/mobile/app/view/add/AddShape.js @@ -66,6 +66,7 @@ define([ }, initEvents: function () { + Common.Utils.addScrollIfNeed('#add-shape .pages', '#add-shape .page'); this.initControls(); }, diff --git a/apps/presentationeditor/mobile/app/view/add/AddSlide.js b/apps/presentationeditor/mobile/app/view/add/AddSlide.js index 07e308c80..7dd090a69 100644 --- a/apps/presentationeditor/mobile/app/view/add/AddSlide.js +++ b/apps/presentationeditor/mobile/app/view/add/AddSlide.js @@ -66,6 +66,8 @@ define([ initEvents: function () { var me = this; + + Common.Utils.addScrollIfNeed('#add-slide .pages', '#add-slide .page'); me.initControls(); }, diff --git a/apps/presentationeditor/mobile/app/view/add/AddTable.js b/apps/presentationeditor/mobile/app/view/add/AddTable.js index 6e30f1d5f..c59f40a0f 100644 --- a/apps/presentationeditor/mobile/app/view/add/AddTable.js +++ b/apps/presentationeditor/mobile/app/view/add/AddTable.js @@ -66,6 +66,7 @@ define([ initEvents: function () { var me = this; + Common.Utils.addScrollIfNeed('#add-table .pages', '#add-table .page'); me.initControls(); }, diff --git a/apps/presentationeditor/mobile/app/view/edit/EditChart.js b/apps/presentationeditor/mobile/app/view/edit/EditChart.js index c274d2884..33b227291 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditChart.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditChart.js @@ -105,6 +105,7 @@ define([ $('.edit-chart-style .categories a').single('click', _.bind(me.showStyleCategory, me)); $('#chart-align').single('click', _.bind(me.showAlign, me)); + Common.Utils.addScrollIfNeed('#edit-chart .pages', '#edit-chart .page'); me.initControls(); me.renderStyles(); }, @@ -170,11 +171,18 @@ define([ this.initEvents(); } + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-border-color]', '.page[data-page=edit-chart-border-color] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-style] .tabs', '#tab-chart-type'); }, showStyleCategory: function (e) { // remove android specific style $('.page[data-page=edit-chart-style] .list-block.inputs-list').removeClass('inputs-list'); + + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-style] .tabs', '#tab-chart-type'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-style] .tabs', '#tab-chart-style'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-style] .tabs', '#tab-chart-fill'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-style] .tabs', '#tab-chart-border'); }, renderStyles: function() { @@ -225,6 +233,7 @@ define([ showReorder: function () { this.showPage('#edit-chart-reorder'); + Common.Utils.addScrollIfNeed('.page.chart-reorder', '.page.chart-reorder .page-content'); }, showBorderColor: function () { @@ -240,6 +249,7 @@ define([ showAlign: function () { this.showPage('#edit-chart-align'); + Common.Utils.addScrollIfNeed('.page.chart-align', '.page.chart-align .page-content'); }, textStyle: 'Style', diff --git a/apps/presentationeditor/mobile/app/view/edit/EditImage.js b/apps/presentationeditor/mobile/app/view/edit/EditImage.js index a4b3d87db..7807807ca 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditImage.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditImage.js @@ -72,6 +72,7 @@ define([ $('#edit-image-url').single('click', _.bind(me.showEditUrl, me)); $('#image-align').single('click', _.bind(me.showAlign, me)); + Common.Utils.addScrollIfNeed('#edit-image .pages', '#edit-image .page'); me.initControls(); }, @@ -125,6 +126,7 @@ define([ this.initEvents(); } + Common.Utils.addScrollIfNeed('.page.edit-image-url-link', '.page.edit-image-url-link .page-content'); }, showReplace: function () { @@ -133,6 +135,7 @@ define([ showReorder: function () { this.showPage('#edit-image-reorder-view'); + Common.Utils.addScrollIfNeed('.page.image-reorder', '.page.image-reorder .page-content'); }, showEditUrl: function () { @@ -149,6 +152,7 @@ define([ showAlign: function () { this.showPage('#edit-image-align'); + Common.Utils.addScrollIfNeed('.page.image-align', '.page.image-align .page-content'); }, textReplace: 'Replace', diff --git a/apps/presentationeditor/mobile/app/view/edit/EditLink.js b/apps/presentationeditor/mobile/app/view/edit/EditLink.js index 4554d64cc..cc66353ec 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditLink.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditLink.js @@ -69,6 +69,8 @@ define([ $('#edit-link-number').single('click', _.bind(me.showPageNumber, me)); $('#edit-link-type').single('click', _.bind(me.showLinkType, me)); + + Common.Utils.addScrollIfNeed('#edit-link .pages', '#edit-link .page'); }, // Render layout @@ -109,6 +111,8 @@ define([ this.fireEvent('page:show', [this, templateId]); } + + Common.Utils.addScrollIfNeed('.page[data-page=editlink-slidenumber]', '.page[data-page=editlink-slidenumber] .page-content'); }, showLinkType: function () { diff --git a/apps/presentationeditor/mobile/app/view/edit/EditShape.js b/apps/presentationeditor/mobile/app/view/edit/EditShape.js index 05dbdbacd..b34f11112 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditShape.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditShape.js @@ -76,6 +76,7 @@ define([ $('.edit-shape-style .categories a').single('click', _.bind(me.showStyleCategory, me)); + Common.Utils.addScrollIfNeed('#edit-shape .pages', '#edit-shape .page'); me.initControls(); }, @@ -154,19 +155,23 @@ define([ transparent: true }); + Common.Utils.addScrollIfNeed('.page[data-page=edit-shape-style]', '.page[data-page=edit-shape-style] .page-content'); this.fireEvent('page:show', [this, selector]); }, showReplace: function () { this.showPage('#edit-shape-replace'); + Common.Utils.addScrollIfNeed('.page.shape-replace', '.page.shape-replace .page-content'); }, showReorder: function () { this.showPage('#edit-shape-reorder'); + Common.Utils.addScrollIfNeed('.page.shape-reorder', '.page.shape-reorder .page-content'); }, showAlign: function () { this.showPage('#edit-shape-align'); + Common.Utils.addScrollIfNeed('.page.shape-align', '.page.shape-align .page-content'); }, showBorderColor: function () { diff --git a/apps/presentationeditor/mobile/app/view/edit/EditSlide.js b/apps/presentationeditor/mobile/app/view/edit/EditSlide.js index 6ee21f57d..ed2d90c24 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditSlide.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditSlide.js @@ -110,6 +110,7 @@ define([ $('#edit-slide-effect').single('click', _.bind(me.showEffect, me)); $('#edit-slide-effect-type').single('click', _.bind(me.showEffectType, me)); + Common.Utils.addScrollIfNeed('#edit-slide .pages', '#edit-slide .page'); me.initControls(); }, @@ -165,6 +166,10 @@ define([ this.initEvents(); } + + Common.Utils.addScrollIfNeed('.page[data-page=editslide-effect]', '.page[data-page=editslide-effect] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=editslide-effect-type]', '.page[data-page=editslide-effect-type] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-slide-style]', '.page[data-page=edit-slide-style] .page-content'); }, showStyle: function () { @@ -183,6 +188,7 @@ define([ this.renderLayouts(); + Common.Utils.addScrollIfNeed('.view.edit-root-view .page-on-center', '.view.edit-root-view .page-on-center .page-content'); this.fireEvent('page:show', [this, '#edit-slide-layout']); }, @@ -195,6 +201,8 @@ define([ // remove android specific style $('.page[data-page=edit-slide-transition] .list-block.inputs-list').removeClass('inputs-list'); + + Common.Utils.addScrollIfNeed('.page[data-page=edit-slide-transition]', '.page[data-page=edit-slide-transition] .page-content'); }, showEffect: function () { diff --git a/apps/presentationeditor/mobile/app/view/edit/EditTable.js b/apps/presentationeditor/mobile/app/view/edit/EditTable.js index 676eb41c9..6ab8913c7 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditTable.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditTable.js @@ -76,6 +76,7 @@ define([ $('#table-reorder').single('click', _.bind(me.showReorder, me)); $('#table-align').single('click', _.bind(me.showAlign, me)); + Common.Utils.addScrollIfNeed('#edit-table .pages', '#edit-table .page'); me.initControls(); me.renderStyles(); }, @@ -158,6 +159,11 @@ define([ if ($(e.currentTarget).data('type') == 'fill') { this.fireEvent('page:show', [this, '#edit-table-style']); } + + // Common.Utils.addScrollIfNeed('.page[data-page=edit-table-style] .tabs', '#tab-table-style'); + Common.Utils.addScrollIfNeed('#tab-table-style', '#tab-table-style .list-block'); + Common.Utils.addScrollIfNeed('#tab-table-fill', '#tab-table-fill .list-block'); + Common.Utils.addScrollIfNeed('#tab-table-border', '#tab-table-border .list-block'); }, showPage: function (templateId, suspendEvent) { @@ -181,6 +187,9 @@ define([ this.initEvents(); } + + Common.Utils.addScrollIfNeed('#tab-table-style', '#tab-table-style .list-block'); + Common.Utils.addScrollIfNeed('.page.table-reorder', '.page.table-reorder .page-content'); }, showTableStyle: function () { @@ -210,10 +219,12 @@ define([ showReorder: function () { this.showPage('#edit-table-reorder'); + Common.Utils.addScrollIfNeed('.page.table-reorder', '.page.table-reorder .page-content'); }, showAlign: function () { this.showPage('#edit-table-align'); + Common.Utils.addScrollIfNeed('.page.table-align', '.page.table-align .page-content'); }, textRemoveTable: 'Remove Table', diff --git a/apps/presentationeditor/mobile/app/view/edit/EditText.js b/apps/presentationeditor/mobile/app/view/edit/EditText.js index 61ab71b4b..b142eae7e 100644 --- a/apps/presentationeditor/mobile/app/view/edit/EditText.js +++ b/apps/presentationeditor/mobile/app/view/edit/EditText.js @@ -109,6 +109,8 @@ define([ me.initControls(); PE.getController('EditText').initSettings(); + + Common.Utils.addScrollIfNeed('#edit-text .pages', '#edit-text .page'); }, // Render layout @@ -189,6 +191,8 @@ define([ }, 100)); } }); + + Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-page]', '.page[data-page=edit-text-font-page] .page-content'); }, showFontColor: function () { @@ -198,15 +202,18 @@ define([ el: $('.page[data-page=edit-text-font-color] .page-content') }); + Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-color]', '.page[data-page=edit-text-font-color] .page-content'); this.fireEvent('page:show', [this, '#edit-text-color']); }, showAdditional: function () { this.showPage('#edit-text-additional'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-text-additional]', '.page[data-page=edit-text-additional] .page-content'); }, showLineSpacing: function () { this.showPage('#edit-text-linespacing'); + Common.Utils.addScrollIfNeed('#page-text-linespacing', '#page-text-linespacing .page-content'); }, showBullets: function () {