From 596683d63e12bd4300543ff5a2a7ab4c253e6317 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 23 Jan 2020 09:31:23 +0300 Subject: [PATCH] [SSE mobile] Fix bug 37715 --- .../app/controller/edit/EditHyperlink.js | 137 +++++++++++------- .../app/template/EditHyperlink.template | 67 ++++++++- .../mobile/app/view/edit/EditHyperlink.js | 46 ++++++ 3 files changed, 190 insertions(+), 60 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js index b879b7aa5..c0d74b8c5 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditHyperlink.js @@ -61,6 +61,12 @@ define([ initialize: function () { Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this)); + + this.addListeners({ + 'EditHyperlink': { + 'page:show' : this.onPageShow + } + }); }, setApi: function (api) { @@ -84,80 +90,105 @@ define([ me.initSettings(); }, + onPageShow: function (view, pageId) { + var me = this; - initSettings: function () { - var me = this, - cellInfo = me.api.asc_getCellInfo(), - linkInfo = cellInfo.asc_getHyperlink(), - sheetCount = me.api.asc_getWorksheetsCount(), - isLock = cellInfo.asc_getFlags().asc_getLockText(), - i = -1, - sheets = []; + me.initSettings(pageId); + }, - while (++i < sheetCount) { - if (!me.api.asc_isWorksheetHidden(i)) { - sheets.push(Common.Utils.String.format('', me.api.asc_getWorksheetName(i), me.api.asc_getWorksheetName(i))); + initSettings: function (pageId) { + var me = this; + + if ('#edit-link-type-view' == pageId) { + var $radioLinkType = $('.page[data-page=edit-link-type-view]').find('input:radio[name=link-type]'); + $radioLinkType.val([me.linkType]); + $radioLinkType.single('change', _.bind(me.onTypeChange, me)); + } else if ('#edit-link-sheet-view' == pageId) { + var sheetCount = me.api.asc_getWorksheetsCount(), + i = -1, + template = ''; + while (++i < sheetCount) { + if (!me.api.asc_isWorksheetHidden(i)) { + template += '
  • ' + + '' + + '
    • '; + } } + $('.page[data-page="edit-link-sheet-view"] .page-content .list-block ul').html(_.template([template].join(''))); + var $radioLinkSheet = $('.page[data-page=edit-link-sheet-view]').find('input:radio[name=link-sheet]'); + $radioLinkSheet.val([me.linkSheet]); + $radioLinkSheet.single('change', _.bind(function (e) { + me.linkSheet = $(e.currentTarget).prop('value'); + $('#edit-link-sheet .item-after').text(me.linkSheet); + }, me)); + } else { + + var cellInfo = me.api.asc_getCellInfo(), + linkInfo = cellInfo.asc_getHyperlink(), + isLock = cellInfo.asc_getFlags().asc_getLockText(); + + me.linkType = linkInfo.asc_getType(); + $('#edit-link-type .item-after').text((me.linkType == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink); + + $('#edit-link-sheet, #edit-link-range').css('display', (linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); + $('#edit-link-link').css('display', (linkInfo.asc_getType() != Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); + + me.currentSheet = me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()); + me.linkSheet = (linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? linkInfo.asc_getSheet() : me.currentSheet; + $('#edit-link-sheet .item-after').text(me.linkSheet); + + $('#edit-link-range input').val(linkInfo.asc_getRange()); + + $('#edit-link-link input').val(linkInfo.asc_getHyperlinkUrl() ? linkInfo.asc_getHyperlinkUrl().replace(new RegExp(" ", 'g'), "%20") : ''); + + $('#edit-link-display input').val(isLock ? me.textDefault : linkInfo.asc_getText()); + $('#edit-link-display input').toggleClass('disabled', isLock); + + $('#edit-link-tip input').val(linkInfo.asc_getTooltip()); + + var focusInput = ((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? $('#edit-link-range input') : $('#edit-link-link input')); + $('#edit-link-edit').toggleClass('disabled', _.isEmpty(focusInput.val())); + + $('#edit-link-link input, #edit-link-range input').single('input', _.bind(function (e) { + $('#edit-link-edit').toggleClass('disabled', _.isEmpty($(e.currentTarget).val())); + }, me)); + + $('#edit-link-edit').single('click', _.bind(me.onEdit, me)); + $('#edit-link-remove').single('click', _.bind(me.onRemove, me)); + } - - $('#edit-link-sheet select').html(sheets.join('')); - - $('#edit-link-type select').val(linkInfo.asc_getType()); - $('#edit-link-type .item-after').text((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? me.textInternalLink : me.textExternalLink); - - $('#edit-link-sheet, #edit-link-range').css('display', (linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); - $('#edit-link-link').css('display', (linkInfo.asc_getType() != Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); - - var currentSheet = me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()); - $('#edit-link-sheet select').val((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? linkInfo.asc_getSheet(): currentSheet); - $('#edit-link-sheet .item-after').text((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? linkInfo.asc_getSheet(): currentSheet); - - $('#edit-link-range input').val(linkInfo.asc_getRange()); - - $('#edit-link-link input').val(linkInfo.asc_getHyperlinkUrl() ? linkInfo.asc_getHyperlinkUrl().replace(new RegExp(" ",'g'), "%20") : ''); - - $('#edit-link-display input').val(isLock ? me.textDefault : linkInfo.asc_getText()); - $('#edit-link-display input').toggleClass('disabled', isLock); - - $('#edit-link-tip input').val(linkInfo.asc_getTooltip()); - - var focusInput = ((linkInfo.asc_getType() == Asc.c_oAscHyperlinkType.RangeLink) ? $('#edit-link-range input') : $('#edit-link-link input')); - $('#edit-link-edit').toggleClass('disabled', _.isEmpty(focusInput.val())); - - $('#edit-link-link input, #edit-link-range input').single('input', _.bind(function(e) { - $('#edit-link-edit').toggleClass('disabled', _.isEmpty($(e.currentTarget).val())); - }, me)); - - $('#edit-link-edit').single('click', _.bind(me.onEdit, me)); - $('#edit-link-remove').single('click', _.bind(me.onRemove, me)); - - $('#edit-link-type select').single('change', _.bind(me.onTypeChange, me)); }, // Handlers onTypeChange: function (e) { - var val = parseInt($(e.currentTarget).val()); + var val = parseInt($(e.currentTarget).prop('value')); + this.linkType = val; $('#edit-link-sheet, #edit-link-range').css('display', (val == Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); $('#edit-link-link').css('display', (val != Asc.c_oAscHyperlinkType.RangeLink) ? 'block' : 'none'); - var requireInput = (val == Asc.c_oAscHyperlinkType.RangeLink) ? $('#edit-link-range input') : $('#edit-link-link input'); - - $('#edit-link-edit').toggleClass('disabled', _.isEmpty(requireInput.val())); + $('#edit-link-type .item-after').text((this.linkType == Asc.c_oAscHyperlinkType.RangeLink) ? this.textInternalLink : this.textExternalLink); }, onEdit: function () { var me = this, linkProps = new Asc.asc_CHyperlink(), defaultDisplay = "", - $type = $('#edit-link-type select'), - $sheet = $('#edit-link-sheet select'), + sheet = this.linkSheet, $range = $('#edit-link-range input'), $link = $('#edit-link-link input'), $display = $('#edit-link-display input'), $tip = $('#edit-link-tip input'), - type = parseInt($type.val()); + type = parseInt(this.linkType); linkProps.asc_setType(type); @@ -173,9 +204,9 @@ define([ return; } - linkProps.asc_setSheet($sheet.val()); + linkProps.asc_setSheet(sheet); linkProps.asc_setRange(range); - defaultDisplay = $sheet.val() + '!' + range; + defaultDisplay = sheet + '!' + range; } else { var url = $link.val().replace(/^\s+|\s+$/g,''); diff --git a/apps/spreadsheeteditor/mobile/app/template/EditHyperlink.template b/apps/spreadsheeteditor/mobile/app/template/EditHyperlink.template index 9cda07cd1..abb81e830 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditHyperlink.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditHyperlink.template @@ -3,11 +3,7 @@
    <% } %>
    + + + + + \ No newline at end of file diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js index a26fe36dd..f03ec773e 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditHyperlink.js @@ -64,11 +64,14 @@ define([ _editCellController = SSE.getController('EditHyperlink'); Common.NotificationCenter.on('editcontainer:show', _.bind(this.initEvents, this)); + this.on('page:show', _.bind(this.updateItemHandlers, this)); }, initEvents: function () { var me = this; + me.updateItemHandlers(); + Common.Utils.addScrollIfNeed('#edit-link .pages', '#edit-link .page'); me.initControls(); }, @@ -98,6 +101,49 @@ define([ // }, + showPage: function (templateId, suspendEvent) { + var rootView = SSE.getController('EditContainer').rootView; + + if (rootView && this.layout) { + var $content = this.layout.find(templateId); + + // Android fix for navigation + if (Framework7.prototype.device.android) { + $content.find('.page').append($content.find('.navbar')); + } + + rootView.router.load({ + content: $content.html() + }); + + if (suspendEvent !== true) { + this.fireEvent('page:show', [this, templateId]); + } + } + }, + + onItemClick: function (e) { + var $target = $(e.currentTarget), + page = $target.data('page'); + + if (page && page.length > 0 ) { + this.showPage(page); + } + }, + + updateItemHandlers: function () { + var selectorsDynamicPage = [ + '#edit-link' + ].map(function (selector) { + return selector + ' a.item-link[data-page]'; + }).join(', '); + + Common.Utils.addScrollIfNeed('.page[data-page=edit-link-type]', '.page[data-page=edit-border-style] .page-content'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-link-sheet]', '.page[data-page=edit-cell-format] .page-content'); + + $(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this)); + }, + textBack: 'Back', textExternalLink: 'External Link', textInternalLink: 'Internal Data Range',