From edac20cc815c6ced322aba08a1d6d61813647e25 Mon Sep 17 00:00:00 2001 From: Maxim Kadushkin Date: Tue, 20 Dec 2016 18:21:35 +0300 Subject: [PATCH] [SSE mobile] repaired Add Hyperlink page --- .../mobile/app/controller/add/AddOther.js | 111 ++++++++++++---- .../mobile/app/template/AddOther.template | 40 +++++- .../mobile/app/view/add/AddOther.js | 124 ++++++++++++++++-- 3 files changed, 233 insertions(+), 42 deletions(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js index caaed4ac5..0ae1073ca 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/controller/add/AddOther.js @@ -68,6 +68,8 @@ define([ 'page:show' : this.onPageShow , 'link:insert': this.onInsertLink , 'image:insert': this.onInsertImage + , 'link:changetype': this.onChangeLinkType + , 'link:changesheet': this.onChangeLinkSheet } }); }, @@ -85,55 +87,109 @@ define([ }, initEvents: function () { + var me = this; + var wc = me.api.asc_getWorksheetsCount(), items = null; + if (wc > 0) { + items = []; + while ( !(--wc < 0) ) { + if ( !this.api.asc_isWorksheetHidden(wc) ) { + items.unshift({ + value: wc, + caption: me.api.asc_getWorksheetName(wc) + }); + } + } + } + + this.optsLink = { + type: 'ext', + sheets: items + }; + + _.defer(function () { + me.getView('AddOther') + .acceptWorksheets( items ) + .setActiveWorksheet( me.api.asc_getActiveWorksheetIndex(), + me.api.asc_getWorksheetName(me.api.asc_getActiveWorksheetIndex()) ); + }); }, onPageShow: function (view, pageId) { var me = this; if (pageId == '#addother-link') { - if ($('#addother-link-view')) { - _.defer(function () { - var props = me.api.asc_getCellInfo().asc_getHyperlink(); + var cell = me.api.asc_getCellInfo(), + celltype = cell.asc_getFlags().asc_getSelectionType(); + var allowinternal = (celltype!==Asc.c_oAscSelectionType.RangeImage && celltype!==Asc.c_oAscSelectionType.RangeShape && + celltype!==Asc.c_oAscSelectionType.RangeShapeText && celltype!==Asc.c_oAscSelectionType.RangeChart && + celltype!==Asc.c_oAscSelectionType.RangeChartText); - // var text = props.asc_getText(); - // $('#add-link-display input').val(_.isString(text) ? text : ''); - }); - } + view.optionDisplayText(cell.asc_getFlags().asc_getLockText() ? 'locked' : cell.asc_getText()); + view.optionAllowInternal(allowinternal); + allowinternal && view.optionLinkType( this.optsLink.type ); + } else + if (pageId == '#addother-change-linktype') { + view.optionLinkType( this.optsLink.type ); } }, // Handlers onInsertLink: function (args) { - return; + var link = new Asc.asc_CHyperlink(); - var me = this, - url = args.url, - urltype = me.api.asc_getUrlType($.trim(url)), - isEmail = (urltype == 2); + if ( args.type == 'ext' ) { + var url = args.url, + urltype = this.api.asc_getUrlType($.trim(url)), + isEmail = (urltype == 2); - if (urltype < 1) { - uiApp.alert(me.txtNotUrl); - return; + if (urltype < 1) { + uiApp.alert(this.txtNotUrl); + return; + } + + url = url.replace(/^\s+|\s+$/g,''); + + if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) ) + url = (isEmail ? 'mailto:' : 'http://' ) + url; + + url = url.replace(new RegExp("%20",'g')," "); + + link.asc_setType(Asc.c_oAscHyperlinkType.WebLink); + link.asc_setHyperlinkUrl(url); + display = url; + } else { + if ( !/^[A-Z]+[1-9]\d*:[A-Z]+[1-9]\d*$/.test(args.url) || + !/^[A-Z]+[1-9]\d*$/.test(args.url) ) + { + uiApp.alert(this.textInvalidRange); + return; + } + + link.asc_setType(Asc.c_oAscHyperlinkType.RangeLink); + link.asc_setSheet(args.sheet); + link.asc_setRange(args.url); + + var display = args.sheet + '!' + args.url; } - url = url.replace(/^\s+|\s+$/g,''); + link.asc_setText(args.text == null ? null : !!args.text ? args.text : display); + link.asc_setTooltip(args.tooltip); - if (! /(((^https?)|(^ftp)):\/\/)|(^mailto:)/i.test(url) ) - url = (isEmail ? 'mailto:' : 'http://' ) + url; - - url = url.replace(new RegExp("%20",'g')," "); - - var props = new Asc.CHyperlink(); - props.asc_setHyperlinkUrl(url); - props.asc_setText(_.isEmpty(args.text) ? url : args.text); - props.asc_setTooltip(args.tooltip); - - me.api.asc_insertHyperlink(props); + this.api.asc_insertHyperlink(link); SSE.getController('AddContainer').hideModal(); }, + onChangeLinkType: function (view, type) { + this.optsLink.type = type; + + view.optionLinkType( this.optsLink.type, 'caption' ); + }, + + onChangeLinkSheet: function (view, index) { + }, + onInsertImage: function (args) { SSE.getController('AddContainer').hideModal(); @@ -158,6 +214,7 @@ define([ } }, + textInvalidRange: 'ERROR! Invalid cells range', textEmptyImgUrl : 'You need to specify image URL.', txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"' } diff --git a/apps/spreadsheeteditor/mobile/app/template/AddOther.template b/apps/spreadsheeteditor/mobile/app/template/AddOther.template index 7db329b2a..f7f18e9ba 100644 --- a/apps/spreadsheeteditor/mobile/app/template/AddOther.template +++ b/apps/spreadsheeteditor/mobile/app/template/AddOther.template @@ -54,12 +54,46 @@
@@ -79,7 +113,7 @@
<%= scope.textTip %>
- +
diff --git a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js index 3681e28b7..65c2b8613 100644 --- a/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js +++ b/apps/spreadsheeteditor/mobile/app/view/add/AddOther.js @@ -64,9 +64,10 @@ define([ var $page = $('#add-other'); $page.find('#add-other-insimage').single('click', _.bind(me.showInsertImage, me)); - $page.find('#add-other-link').single('click', _.bind(me.showLink, me)); + $page.find('#add-other-link').single('click', _.bind(me.showInsertLink, me)); $page.find('#add-other-sort').single('click', _.bind(me.showSortPage, me)); + this.link = {type:'ext', internal:{}}; me.initControls(); }, @@ -123,18 +124,30 @@ define([ }.bind(this)); }, - showLink: function () { + showInsertLink: function () { this.showPage('#addother-link'); - $('.page[data-page=addother-link] input[type=url]').single('input', _.bind(function(e) { - $('#add-link-insert').toggleClass('disabled', _.isEmpty($('#add-link-url input').val())); - }, this)); + var me = this; + var $view = $('.settings'); + $('.page[data-page=addother-link]').find('input[type=url], input.range') + .single('input', function(e) { + $view.find('#add-link-insert').toggleClass('disabled', _.isEmpty($(e.target).val())); + }); _.delay(function () { - $('.page[data-page=addother-link] input[type=url]').focus(); + $view.find('.page[data-page=addother-link] input[type=url]').focus(); }, 1000); - $('#add-link-insert').single('click', _.buffered(this.clickInsertLink, 100, this)); + $view.find('#add-link-insert').single('click', _.buffered(this.clickInsertLink, 100, this)); + $view.find('#add-link-type select').single('change', function (e) { + me.fireEvent('link:changetype', [me, $(e.currentTarget).val()]); + }); + $view.find('#add-link-sheet select').single('change', function (e) { + var index = $(e.currentTarget).val(), + caption = $(e.currentTarget[e.currentTarget.selectedIndex]).text(); + me.link.internal = { sheet: {index: index, caption: caption}}; + me.fireEvent('link:changesheet', [me, $(e.currentTarget).val()]); + }).val(me.link.internal.sheet.index); }, showSortPage: function (e) { @@ -142,11 +155,17 @@ define([ }, clickInsertLink: function (e) { - var url = $('#add-link-url input').val(), - display = $('#add-link-display input').val(), - tip = $('#add-link-tip input').val(); + var $view = $('.settings'); + var type = this.link.type; + var $text = $view.find('#add-link-display input'); - this.fireEvent('link:insert', [{url:url, text:display, tooltip:tip}]); + this.fireEvent('link:insert', [{ + type : type, + sheet : type == 'ext' ? undefined : this.link.internal.sheet.index, + url : $view.find(type == 'ext' ? '#add-link-url input' : '#add-link-range input').val(), + text : $text.is(':disabled') ? null : $text.val(), + tooltip : $view.find('#add-link-tip input').val() + }]); }, showImageFromUrl: function () { @@ -168,6 +187,82 @@ define([ _.delay(function () { $input.focus(); }, 1000); }, + optionLinkType: function (type, opts) { + this.link.type = type; + + var $view = $('.settings'); + + if ( !(opts == 'caption') ) { + $view.find('#add-link-type select').val(type); + $view.find('#add-link-type .item-after').html( + type == 'int' ? this.textInternalLink : this.textExternalLink ); + } + + var $btnInsertLink = $view.find('#add-link-insert'); + if ( type == 'int' ) { + $view.find('#add-link-url').hide(); + + $view.find('#add-link-sheet').show() + .find('.item-after').html(this.link.internal.sheet.caption); + + $view.find('#add-link-range').show(); + $btnInsertLink.toggleClass('disabled', _.isEmpty($view.find('#add-link-range input').val())); + } else { + $view.find('#add-link-url').show(); + $view.find('#add-link-sheet').hide(); + $view.find('#add-link-range').hide(); + + $btnInsertLink.toggleClass('disabled', _.isEmpty($view.find('#add-link-url input').val())); + } + }, + + optionAllowInternal: function(allow) { + var $view = $('.settings'); + + if ( allow ) + $view.find('#add-link-type').show(); + else { + this.optionLinkType('ext'); + $view.find('#add-link-type').hide(); + } + }, + + optionDisplayText: function (text) { + var $view = $('.settings'); + var disabled = text == 'locked'; + + disabled && (text = ' '); + $view.find('#add-link-display input').prop('disabled', disabled).val(text); + $view.find('#add-link-display .label').toggleClass('disabled', disabled); + }, + + acceptWorksheets: function (sheets) { + this.worksheets = sheets; + + var tpl = '<% _.each(worksheets, function(item){ %>' + + '' + + '<% }) %>'; + + this.layout.find('#add-link-sheet select').html( + _.template(tpl, { + worksheets: sheets + }) + ); + + return this; + }, + + setActiveWorksheet: function (index, caption) { + this.link.internal = { sheet: {index: index, caption: caption}}; + + var $view = $('.settings'); + // $view.find('#add-link-sheet .item-after').html(this.link.internal.sheet.caption); + $view.find('#add-link-sheet select').val(index); + $view.find('#add-link-sheet .item-after').text(caption); + + return this; + }, + textInsertImage: 'Insert Image', textSort: 'Sort and Filter', textLink: 'Link', @@ -181,7 +276,12 @@ define([ textLinkSettings: 'Link Settings', textAddress: 'Address', textImageURL: 'Image URL', - textFilter: 'Filter' + textFilter: 'Filter', + textLinkType: 'Link Type', + textExternalLink: 'External Link', + textInternalLink: 'Internal Data Range', + textSheet: 'Sheet', + textRange: 'Range' } })(), SSE.Views.AddOther || {})) }); \ No newline at end of file