diff --git a/apps/common/mobile/utils/utils.js b/apps/common/mobile/utils/utils.js index 7d0c92e24..d0ea75a52 100644 --- a/apps/common/mobile/utils/utils.js +++ b/apps/common/mobile/utils/utils.js @@ -114,15 +114,17 @@ define([ Common.Utils.addScrollIfNeed = function (targetSelector, containerSelector) { if (Common.SharedSettings.get('sailfish')) { - var $targetEl = $(targetSelector); - var $containerEl = $(containerSelector); - - if ($targetEl.length == 0 || $containerEl == 0) { - return; - } + _.delay(function(){ + var $targetEl = $(targetSelector); + var $containerEl = $(containerSelector); + + if ($targetEl.length == 0 || $containerEl == 0) { + return; + } - $containerEl.css('height', 'auto'); - new IScroll(targetSelector); + $containerEl.css('height', 'auto'); + new IScroll(targetSelector); + }, 500); } } }); diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js index de0668a49..54e3727f8 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js @@ -147,14 +147,19 @@ define([ me.initStylePage(); } else if ('#edit-chart-border-color-view' == pageId) { me.initBorderColorPage(); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-border-color]', '.page[data-page=edit-chart-border-color] .page-content'); } else if ('#edit-chart-layout' == pageId) { me.initLayoutPage(); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-layout]', '.page[data-page=edit-chart-layout] .page-content'); } else if ('#edit-chart-vertical-axis' == pageId) { me.initVertAxisPage(); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-vertical-axis]', '.page[data-page=edit-chart-vertical-axis] .page-content'); } else if ('#edit-chart-horizontal-axis' == pageId) { me.initHorAxisPage(); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-horizontal-axis]', '.page[data-page=edit-chart-horizontal-axis] .page-content'); } else if ('#edit-chart-reorder' == pageId) { me.initReorderPage(); + Common.Utils.addScrollIfNeed('.page[data-page=edit-chart-reorder]', '.page[data-page=edit-chart-reorder] .page-content'); } else { me.initRootPage(); } diff --git a/apps/spreadsheeteditor/mobile/app/view/Settings.js b/apps/spreadsheeteditor/mobile/app/view/Settings.js index 22d373df6..4e25b43e1 100644 --- a/apps/spreadsheeteditor/mobile/app/view/Settings.js +++ b/apps/spreadsheeteditor/mobile/app/view/Settings.js @@ -80,6 +80,7 @@ define([ $('#settings-help').single('click', _.bind(me.showHelp, me)); $('#settings-about').single('click', _.bind(me.showAbout, me)); + Common.Utils.addScrollIfNeed('.view[data-page=settings-root-view] .pages', '.view[data-page=settings-root-view] .page'); me.initControls(); }, @@ -170,10 +171,13 @@ define([ $('#settings-document-title').html(document.title ? document.title : this.unknownText); $('#settings-document-autor').html(info.author ? info.author : this.unknownText); $('#settings-document-date').html(info.created ? info.created : this.unknownText); + + Common.Utils.addScrollIfNeed('.page[data-page=settings-info-view]', '.page[data-page=settings-info-view] .page-content'); }, showDownload: function () { this.showPage('#settings-download-view'); + Common.Utils.addScrollIfNeed('.page[data-page=settings-download-view]', '.page[data-page=settings-download-view] .page-content'); }, showHistory: function () { @@ -186,6 +190,7 @@ define([ showAbout: function () { this.showPage('#settings-about-view'); + Common.Utils.addScrollIfNeed('.page[data-page=settings-about-view]', '.page[data-page=settings-about-view] .page-content'); }, loadDocument: function(data) { diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddChart.js b/apps/spreadsheeteditor/mobile/app/view/add/AddChart.js index b017721d2..792effe51 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddChart.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddChart.js @@ -93,6 +93,7 @@ define([ $('.chart-types .thumb').single('click', this.onTypeClick.bind(this)); + Common.Utils.addScrollIfNeed('#add-chart .pages', '#add-chart .page'); me.initControls(); }, diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js index 80986c686..d4777f34d 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddFunction.js @@ -89,6 +89,7 @@ define([ .on('click', '.function > a', this.onFunctionClick.bind(this)); $('.groups a.group').single('click', this.onGroupClick.bind(this)); + Common.Utils.addScrollIfNeed('#add-formula .pages', '#add-formula .page'); me.initControls(); }, @@ -181,10 +182,12 @@ define([ groupname : this.groups[group], functions : items }); + Common.Utils.addScrollIfNeed('.view.add-root-view .page-on-center', '.view.add-root-view .page-on-center .page-content'); }, openFunctionInfo: function (type) { _openView.call(this, 'info', this.functions[type]); + Common.Utils.addScrollIfNeed('.view.add-root-view .page-on-center', '.view.add-root-view .page-on-center .page-content'); }, textGroups: 'CATEGORIES', diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js b/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js index c451da8a9..0158fca99 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddLink.js @@ -89,6 +89,8 @@ define([ cfgLink.internal = { sheet: {index: index, caption: caption}}; // me.fireEvent('link:changesheet', [me, $(e.currentTarget).val()]); }).val(cfgLink.internal.sheet.index); + + Common.Utils.addScrollIfNeed('.page[data-page=add-link]', '.page[data-page=add-link] .page-content'); } @@ -105,6 +107,7 @@ define([ initEvents: function () { var me = this; + me.initControls(); }, diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddShape.js b/apps/spreadsheeteditor/mobile/app/view/add/AddShape.js index e5808e9c0..eb35bd057 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddShape.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddShape.js @@ -63,6 +63,7 @@ define([ }, initEvents: function () { + Common.Utils.addScrollIfNeed('#add-shape .pages', '#add-shape .page'); this.initControls(); }, diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js index 20bd1f724..9cd75d3a9 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js @@ -78,6 +78,7 @@ define([ $('#text-color').single('click', _.bind(me.showTextColor, me)); $('#fill-color').single('click', _.bind(me.showFillColor, me)); + Common.Utils.addScrollIfNeed('#edit-cell .pages', '#edit-cell .page'); me.initControls(); }, @@ -161,6 +162,10 @@ define([ return selector + ' a.item-link[data-page]'; }).join(', '); + Common.Utils.addScrollIfNeed('.page[data-page=edit-border-style]', '.page[data-page=edit-border-style] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-cell-format]', '.page[data-page=edit-cell-format] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-text-format]', '.page[data-page=edit-text-format] .page-content'); + $(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this)); }, @@ -224,6 +229,8 @@ define([ }, 100)); } }); + + Common.Utils.addScrollIfNeed('.page[data-page=edit-text-font-page]', '.page[data-page=edit-text-font-page] .page-content'); }, showTextColor: function () { @@ -232,7 +239,8 @@ define([ this.paletteTextColor = new Common.UI.ThemeColorPalette({ el: $('.page[data-page=edit-text-color] .page-content') }); - + + Common.Utils.addScrollIfNeed('.page[data-page=edit-text-color]', '.page[data-page=edit-text-color] .page-content'); this.fireEvent('page:show', [this, '#edit-text-color']); }, @@ -244,6 +252,7 @@ define([ transparent: true }); + Common.Utils.addScrollIfNeed('.page[data-page=edit-fill-color]', '.page[data-page=edit-fill-color] .page-content'); this.fireEvent('page:show', [this, '#edit-fill-color']); }, diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js index 44394ccda..cd302606d 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditChart.js @@ -101,6 +101,8 @@ define([ me.updateItemHandlers(); me.initControls(); + + Common.Utils.addScrollIfNeed('#edit-chart .pages', '#edit-chart .page'); }, // Render layout diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js index df45697ce..a26fe36dd 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js @@ -69,6 +69,7 @@ define([ initEvents: function () { var me = this; + Common.Utils.addScrollIfNeed('#edit-link .pages', '#edit-link .page'); me.initControls(); }, diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js index 2252f356f..2912ca048 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditShape.js @@ -70,6 +70,7 @@ define([ $('.edit-shape-style .categories a').single('click', _.bind(me.showStyleCategory, me)); + Common.Utils.addScrollIfNeed('#edit-shape .pages', '#edit-shape .page'); me.updateItemHandlers(); me.initControls(); }, @@ -118,6 +119,7 @@ define([ return selector + ' a.item-link[data-page]'; }).join(', '); + Common.Utils.addScrollIfNeed('.page[data-page=edit-shape-border-color-view]', '.page[data-page=edit-shape-border-color-view] .page-content'); $(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this)); }, @@ -162,6 +164,10 @@ define([ if (!this.isShapeCanFill) this.showStyleCategory(); } + + Common.Utils.addScrollIfNeed('.page[data-page=edit-shape-style]', '.page[data-page=edit-shape-style] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-shape-replace]', '.page[data-page=edit-shape-replace] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-shape-reorder]', '.page[data-page=edit-shape-reorder] .page-content'); }, textStyle: 'Style', diff --git a/apps/spreadsheeteditor/mobile/index.html b/apps/spreadsheeteditor/mobile/index.html index 6d1a098e7..e0f6c16c2 100644 --- a/apps/spreadsheeteditor/mobile/index.html +++ b/apps/spreadsheeteditor/mobile/index.html @@ -257,6 +257,7 @@ Object.defineProperty(navigator, 'userAgent', { get: function () { return ua; } }); + document.write('