From a1a6acd74a894a496ac07a9496a95bf0eabeb835 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 27 Jun 2019 16:46:07 +0300 Subject: [PATCH 1/2] [DE mobile] Add Insert Footnote --- .../mobile/app/controller/add/AddOther.js | 208 +++++++++++++++++- .../mobile/app/template/AddOther.template | 66 ++++++ .../mobile/app/view/add/AddOther.js | 64 +++++- .../mobile/resources/css/app-ios.css | 5 + .../mobile/resources/css/app-material.css | 5 + .../mobile/resources/less/ios/_icons.less | 5 + .../resources/less/material/_icons.less | 5 + 7 files changed, 356 insertions(+), 2 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/add/AddOther.js b/apps/documenteditor/mobile/app/controller/add/AddOther.js index e979187e89..0a9ff4e86f 100644 --- a/apps/documenteditor/mobile/app/controller/add/AddOther.js +++ b/apps/documenteditor/mobile/app/controller/add/AddOther.js @@ -72,6 +72,8 @@ define([ 'page:show' : this.onPageShow } }); + this.toCustomFormat; + this.fromCustomFormat; }, setApi: function (api) { @@ -107,11 +109,120 @@ define([ $('#add-link-display input').val(_.isString(text) ? text : ''); }); } + } else if (pageId == '#addother-insert-footnote') { + me.initInsertFootnote(); } }, // Handlers + initInsertFootnote: function () { + var me = this, + dataFormatFootnote = [ + { text: '1, 2, 3,...', value: Asc.c_oAscNumberingFormat.Decimal }, + { text: 'a, b, c,...', value: Asc.c_oAscNumberingFormat.LowerLetter }, + { text: 'A, B, C,...', value: Asc.c_oAscNumberingFormat.UpperLetter }, + { text: 'i, ii, iii,...', value: Asc.c_oAscNumberingFormat.LowerRoman }, + { text: 'I, II, III,...', value: Asc.c_oAscNumberingFormat.UpperRoman } + ], + dataPosFootnote = [ + {value: Asc.c_oAscFootnotePos.PageBottom, displayValue: this.textBottomOfPage }, + {value: Asc.c_oAscFootnotePos.BeneathText, displayValue: this.textBelowText } + ], + props = me.api.asc_GetFootnoteProps(), + propsFormat = props.get_NumFormat(), + propsPos = props.get_Pos(); + + me.onFormatFootnoteChange(propsFormat); + + var view = me.getView('AddOther'); + view.renderNumFormat(dataFormatFootnote, propsFormat); + view.renderFootnotePos(dataPosFootnote, propsPos); + + $('#start-at-footnote .button').single('click', _.bind(me.onStartAt, me)); + $('.page[data-page=addother-insert-footnote] input:radio[name=doc-footnote-format]').single('change', _.bind(me.onFormatFootnoteChange, me)); + $('#footnote-insert').single('click', _.bind(this.onClickInsertFootnote, this)); + }, + + onClickInsertFootnote: function() { + var me = this, + format = $('input[name="doc-footnote-format"]:checked').data('value'), + start = $('#start-at-footnote .item-after label').text(), + position = $('input[name="doc-footnote-pos"]:checked').data('value'), + props = new Asc.CAscFootnotePr(); + var startTo10; + if (me.fromCustomFormat) { + startTo10 = parseInt(me.fromCustomFormat(start)); + } else { + startTo10 = me.api.asc_GetFootnoteProps().get_NumStart(); + } + props.put_Pos(position); + props.put_NumFormat(format); + props.put_NumStart(startTo10); + props.put_NumRestart(Asc.c_oAscFootnoteRestart.Continuous); + if (me.api) { + me.api.asc_SetFootnoteProps(props, false); + me.api.asc_AddFootnote(); + } + }, + + onFormatFootnoteChange: function(e) { + var me = this; + var value = e.currentTarget ? $(e.currentTarget).data('value') : e; + var startAt = $('#start-at-footnote .item-after label'), + currValue; + if(e.currentTarget) { + currValue = me.fromCustomFormat(startAt.text()); + } else { + currValue = me.api.asc_GetFootnoteProps().get_NumStart(); + } + switch (value) { + case Asc.c_oAscNumberingFormat.UpperRoman: // I, II, III, ... + me.toCustomFormat = me._10toRome; + me.fromCustomFormat = me._Rometo10; + break; + case Asc.c_oAscNumberingFormat.LowerRoman: // i, ii, iii, ... + me.toCustomFormat = function(value) { return me._10toRome(value).toLocaleLowerCase(); }; + me.fromCustomFormat = function(value) { return me._Rometo10(value.toLocaleUpperCase()); }; + break; + case Asc.c_oAscNumberingFormat.UpperLetter: // A, B, C, ... + me.toCustomFormat = me._10toS; + me.fromCustomFormat = me._Sto10; + break; + case Asc.c_oAscNumberingFormat.LowerLetter: // a, b, c, ... + me.toCustomFormat = function(value) { return me._10toS(value).toLocaleLowerCase(); }; + me.fromCustomFormat = function(value) { return me._Sto10(value.toLocaleUpperCase()); }; + break; + default: // 1, 2, 3, ... + me.toCustomFormat = function(value) { return value; }; + me.fromCustomFormat = function(value) { return value; }; + break; + } + var newValue = me.toCustomFormat(currValue); + startAt.text(newValue); + }, + + onStartAt: function(e) { + var $button = $(e.currentTarget), + value = $('#start-at-footnote .item-after label').text(), + intValue, + step = 1, + maxValue = 16383, + me = this; + if(me.fromCustomFormat) { + intValue = parseInt(me.fromCustomFormat(value)); + } else { + intValue = me.api.asc_GetFootnoteProps().get_NumStart(); + } + if ($button.hasClass('decrement')) { + intValue = Math.max(1, intValue - step); + } else { + intValue = Math.min(maxValue, intValue + step); + } + var newValue = me.toCustomFormat(intValue); + $('#start-at-footnote .item-after label').text(newValue); + }, + onInsertLink: function (e) { var me = this, url = $('#add-link-url input').val(), @@ -208,7 +319,102 @@ define([ DE.getController('AddContainer').hideModal(); }, - txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"' + _10toS: function(value) { + value = parseInt(value); + var n = Math.ceil(value / 26), + code = String.fromCharCode((value-1) % 26 + "A".charCodeAt(0)) , + result = ''; + + for (var i=0; i0) { + val = digits[n][1]; + div = value - val; + if (div>=0) { + result += digits[n][0]; + value = div; + } else + n++; + } + + return result; + }, + + _Rometo10: function(str) { + if ( !/[IVXLCDM]/.test(str) || str.length<1 ) return 1; + + var digits = { + 'I': 1, + 'V': 5, + 'X': 10, + 'L': 50, + 'C': 100, + 'D': 500, + 'M': 1000 + }; + + var n = str.length-1, + result = digits[str.charAt(n)], + prev = result; + + for (var i=n-1; i>=0; i-- ) { + var val = digits[str.charAt(i)]; + if (val10) return 1; + val *= -1; + } + + result += val; + } + + return result; + }, + + txtNotUrl: 'This field should be a URL in the format \"http://www.example.com\"', + textBottomOfPage: 'Bottom Of Page', + textBelowText: 'Below Text' } })(), DE.Controllers.AddOther || {})) diff --git a/apps/documenteditor/mobile/app/template/AddOther.template b/apps/documenteditor/mobile/app/template/AddOther.template index 36c324b5cc..76c91c506c 100644 --- a/apps/documenteditor/mobile/app/template/AddOther.template +++ b/apps/documenteditor/mobile/app/template/AddOther.template @@ -62,6 +62,18 @@ +
  • + +
    +
    + +
    +
    +
    <%= scope.textFootnote %>
    +
    +
    +     +
    • @@ -258,4 +270,58 @@ + + + +
    +
    +
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textInsertFootnote %>
    +
    +
    +
    +
    +
    <%= scope.textFormat %>
    +
    +
      +
    +
    +
    +
      +
    • +
      +
      +
      <%= scope.textStartFrom %>
      +
      + <% if (!android) { %><% } %> +

      + <% if (android) { %><% } else { %>-<% } %> + <% if (android) { %><% } %> + <% if (android) { %><% } else { %>+<% } %> +

      +
      +
      +
      +
      • +
    +
    +
    <%= scope.textLocation %>
    +
    +
      +
    +
    +
    + <% if (android) { %> + <%= scope.textInsertFootnote %> + <% } else { %> + + <% } %> +
    +
    +
    \ No newline at end of file diff --git a/apps/documenteditor/mobile/app/view/add/AddOther.js b/apps/documenteditor/mobile/app/view/add/AddOther.js index 0389eccb7c..c5c1afd41f 100644 --- a/apps/documenteditor/mobile/app/view/add/AddOther.js +++ b/apps/documenteditor/mobile/app/view/add/AddOther.js @@ -69,6 +69,7 @@ define([ $('#add-other-section').single('click', _.bind(me.showSectionBreak, me)); $('#add-other-link').single('click', _.bind(me.showLink, me)); $('#add-other-pagenumber').single('click', _.bind(me.showPagePosition, me)); + $('#add-other-footnote').single('click', _.bind(me.showPageFootnote, me)); me.initControls(); }, @@ -138,6 +139,62 @@ define([ this.showPage('#addother-pagenumber'); }, + showPageFootnote: function () { + this.showPage('#addother-insert-footnote'); + }, + + renderNumFormat: function (dataFormat, selectFormat) { + var $listFormat = $('#list-format-footnote ul'), + items = []; + + _.each(dataFormat, function (formatItem) { + var itemTemplate = [ + '
  • ', + '', + '
    • ' + ].join(''); + items.push(_.template(itemTemplate)({ + android: Framework7.prototype.device.android, + item: formatItem, + select: selectFormat + })); + }); + + $listFormat.html(items); + }, + + renderFootnotePos: function (dataPosition, selectPosition) { + var $listPos = $('#position-footnote ul'), + items = []; + + _.each(dataPosition, function (posItem) { + var itemTemplate = [ + '
  • ', + '', + '
    • ' + ].join(''); + items.push(_.template(itemTemplate)({ + android: Framework7.prototype.device.android, + item: posItem, + select: selectPosition + })); + }); + + $listPos.html(items); + }, + textPageBreak: 'Page Break', textSectionBreak: 'Section Break', textColumnBreak: 'Column Break', @@ -159,7 +216,12 @@ define([ textNextPage: 'Next Page', textContPage: 'Continuous Page', textEvenPage: 'Even Page', - textOddPage: 'Odd Page' + textOddPage: 'Odd Page', + textFootnote: 'Footnote', + textInsertFootnote: 'Insert Footnote', + textFormat: 'Format', + textStartFrom: 'Start At', + textLocation: 'Location' } diff --git a/apps/documenteditor/mobile/resources/css/app-ios.css b/apps/documenteditor/mobile/resources/css/app-ios.css index 3ab4a1d35d..e5fc9e44fd 100644 --- a/apps/documenteditor/mobile/resources/css/app-ios.css +++ b/apps/documenteditor/mobile/resources/css/app-ios.css @@ -6854,6 +6854,11 @@ i.icon.icon-app-settings { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7%2014H16C18.2091%2014%2020%2015.7909%2020%2018C20%2020.2091%2018.2091%2022%2016%2022H7C4.79086%2022%203%2020.2091%203%2018C3%2015.7909%204.79086%2014%207%2014ZM16%2013C18.7614%2013%2021%2015.2386%2021%2018C21%2020.7614%2018.7614%2023%2016%2023H7C4.23858%2023%202%2020.7614%202%2018C2%2015.2386%204.23858%2013%207%2013H16Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%2020C14.8954%2020%2014%2019.1046%2014%2018C14%2016.8954%2014.8954%2016%2016%2016C17.1046%2016%2018%2016.8954%2018%2018C18%2019.1046%2017.1046%2020%2016%2020ZM16%2021C14.3431%2021%2013%2019.6569%2013%2018C13%2016.3431%2014.3431%2015%2016%2015C17.6569%2015%2019%2016.3431%2019%2018C19%2019.6569%2017.6569%2021%2016%2021Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%203H7C4.79086%203%203%204.79086%203%207C3%209.20914%204.79086%2011%207%2011H16C18.2091%2011%2020%209.20914%2020%207C20%204.79086%2018.2091%203%2016%203ZM7%202C4.23858%202%202%204.23858%202%207C2%209.76142%204.23858%2012%207%2012H16C18.7614%2012%2021%209.76142%2021%207C21%204.23858%2018.7614%202%2016%202H7Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7%209C8.10457%209%209%208.10457%209%207C9%205.89543%208.10457%205%207%205C5.89543%205%205%205.89543%205%207C5%208.10457%205.89543%209%207%209ZM7%2010C8.65685%2010%2010%208.65685%2010%207C10%205.34315%208.65685%204%207%204C5.34315%204%204%205.34315%204%207C4%208.65685%205.34315%2010%207%2010Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-footnote { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%208.11133H20.9177V5.15361L20.9282%204.66765L20.9457%204.13624C20.7659%204.31571%2020.641%204.43341%2020.5709%204.48935L19.9825%204.96132L19.4606%204.31105L21.1103%203H22V8.11133Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M10.3363%2018.8514L8.98161%2015.3968H4.61996L3.28021%2018.8514H2L6.3021%207.94526H7.36646L11.6462%2018.8514H10.3363ZM8.58713%2014.2601L7.3218%2010.8947C7.15806%2010.4687%206.98935%209.94621%206.81567%209.32711C6.70651%209.80258%206.5502%2010.3251%206.34676%2010.8947L5.06655%2014.2601H8.58713Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M16.1425%2010.5752C17.2143%2010.5752%2018.0454%2010.9417%2018.6359%2011.6748C19.2313%2012.4028%2019.5291%2013.4355%2019.5291%2014.7728C19.5291%2016.11%2019.2288%2017.1501%2018.6284%2017.893C18.033%2018.631%2017.2043%2019%2016.1425%2019C15.6115%2019%2015.1252%2018.9034%2014.6836%2018.7103C14.2469%2018.5121%2013.8798%2018.21%2013.582%2017.8039H13.4927L13.2322%2018.8514H12.3465V7.29149H13.582V10.0997C13.582%2010.7288%2013.5622%2011.2934%2013.5225%2011.7936H13.582C14.1576%2010.9814%2015.0111%2010.5752%2016.1425%2010.5752ZM15.9638%2011.6079C15.1203%2011.6079%2014.5124%2011.8506%2014.1403%2012.336C13.7681%2012.8164%2013.582%2013.6286%2013.582%2014.7728C13.582%2015.9169%2013.7731%2016.7366%2014.1551%2017.2318C14.5372%2017.7222%2015.15%2017.9673%2015.9936%2017.9673C16.7528%2017.9673%2017.3185%2017.6925%2017.6906%2017.1427C18.0628%2016.588%2018.2488%2015.793%2018.2488%2014.7579C18.2488%2013.698%2018.0628%2012.908%2017.6906%2012.388C17.3185%2011.8679%2016.7429%2011.6079%2015.9638%2011.6079Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} .label-switch input[type="checkbox"]:checked + .checkbox { background: #446995; } diff --git a/apps/documenteditor/mobile/resources/css/app-material.css b/apps/documenteditor/mobile/resources/css/app-material.css index 60eb21871a..aaa58ba908 100644 --- a/apps/documenteditor/mobile/resources/css/app-material.css +++ b/apps/documenteditor/mobile/resources/css/app-material.css @@ -6334,6 +6334,11 @@ i.icon.icon-app-settings { height: 24px; background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7%2014H16C18.2091%2014%2020%2015.7909%2020%2018C20%2020.2091%2018.2091%2022%2016%2022H7C4.79086%2022%203%2020.2091%203%2018C3%2015.7909%204.79086%2014%207%2014ZM16%2013C18.7614%2013%2021%2015.2386%2021%2018C21%2020.7614%2018.7614%2023%2016%2023H7C4.23858%2023%202%2020.7614%202%2018C2%2015.2386%204.23858%2013%207%2013H16Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%2020C14.8954%2020%2014%2019.1046%2014%2018C14%2016.8954%2014.8954%2016%2016%2016C17.1046%2016%2018%2016.8954%2018%2018C18%2019.1046%2017.1046%2020%2016%2020ZM16%2021C14.3431%2021%2013%2019.6569%2013%2018C13%2016.3431%2014.3431%2015%2016%2015C17.6569%2015%2019%2016.3431%2019%2018C19%2019.6569%2017.6569%2021%2016%2021Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M16%203H7C4.79086%203%203%204.79086%203%207C3%209.20914%204.79086%2011%207%2011H16C18.2091%2011%2020%209.20914%2020%207C20%204.79086%2018.2091%203%2016%203ZM7%202C4.23858%202%202%204.23858%202%207C2%209.76142%204.23858%2012%207%2012H16C18.7614%2012%2021%209.76142%2021%207C21%204.23858%2018.7614%202%2016%202H7Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20fill-rule%3D%22evenodd%22%20clip-rule%3D%22evenodd%22%20d%3D%22M7%209C8.10457%209%209%208.10457%209%207C9%205.89543%208.10457%205%207%205C5.89543%205%205%205.89543%205%207C5%208.10457%205.89543%209%207%209ZM7%2010C8.65685%2010%2010%208.65685%2010%207C10%205.34315%208.65685%204%207%204C5.34315%204%204%205.34315%204%207C4%208.65685%205.34315%2010%207%2010Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); } +i.icon.icon-footnote { + width: 24px; + height: 24px; + background-image: url("data:image/svg+xml;charset=utf-8,%3Csvg%20width%3D%2224%22%20height%3D%2224%22%20viewBox%3D%220%200%2024%2024%22%20fill%3D%22none%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%3E%3Cpath%20d%3D%22M22%208.11133H20.9177V5.15361L20.9282%204.66765L20.9457%204.13624C20.7659%204.31571%2020.641%204.43341%2020.5709%204.48935L19.9825%204.96132L19.4606%204.31105L21.1103%203H22V8.11133Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M10.3363%2018.8514L8.98161%2015.3968H4.61996L3.28021%2018.8514H2L6.3021%207.94526H7.36646L11.6462%2018.8514H10.3363ZM8.58713%2014.2601L7.3218%2010.8947C7.15806%2010.4687%206.98935%209.94621%206.81567%209.32711C6.70651%209.80258%206.5502%2010.3251%206.34676%2010.8947L5.06655%2014.2601H8.58713Z%22%20fill%3D%22%23446995%22%2F%3E%3Cpath%20d%3D%22M16.1425%2010.5752C17.2143%2010.5752%2018.0454%2010.9417%2018.6359%2011.6748C19.2313%2012.4028%2019.5291%2013.4355%2019.5291%2014.7728C19.5291%2016.11%2019.2288%2017.1501%2018.6284%2017.893C18.033%2018.631%2017.2043%2019%2016.1425%2019C15.6115%2019%2015.1252%2018.9034%2014.6836%2018.7103C14.2469%2018.5121%2013.8798%2018.21%2013.582%2017.8039H13.4927L13.2322%2018.8514H12.3465V7.29149H13.582V10.0997C13.582%2010.7288%2013.5622%2011.2934%2013.5225%2011.7936H13.582C14.1576%2010.9814%2015.0111%2010.5752%2016.1425%2010.5752ZM15.9638%2011.6079C15.1203%2011.6079%2014.5124%2011.8506%2014.1403%2012.336C13.7681%2012.8164%2013.582%2013.6286%2013.582%2014.7728C13.582%2015.9169%2013.7731%2016.7366%2014.1551%2017.2318C14.5372%2017.7222%2015.15%2017.9673%2015.9936%2017.9673C16.7528%2017.9673%2017.3185%2017.6925%2017.6906%2017.1427C18.0628%2016.588%2018.2488%2015.793%2018.2488%2014.7579C18.2488%2013.698%2018.0628%2012.908%2017.6906%2012.388C17.3185%2011.8679%2016.7429%2011.6079%2015.9638%2011.6079Z%22%20fill%3D%22%23446995%22%2F%3E%3C%2Fsvg%3E"); +} .navbar i.icon.icon-undo { width: 22px; height: 22px; diff --git a/apps/documenteditor/mobile/resources/less/ios/_icons.less b/apps/documenteditor/mobile/resources/less/ios/_icons.less index 8973f03d2b..507610a608 100644 --- a/apps/documenteditor/mobile/resources/less/ios/_icons.less +++ b/apps/documenteditor/mobile/resources/less/ios/_icons.less @@ -451,4 +451,9 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-footnote { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } \ No newline at end of file diff --git a/apps/documenteditor/mobile/resources/less/material/_icons.less b/apps/documenteditor/mobile/resources/less/material/_icons.less index 6a26e59feb..b4db3fbfa5 100644 --- a/apps/documenteditor/mobile/resources/less/material/_icons.less +++ b/apps/documenteditor/mobile/resources/less/material/_icons.less @@ -378,6 +378,11 @@ i.icon { height: 24px; .encoded-svg-background(''); } + &.icon-footnote { + width: 24px; + height: 24px; + .encoded-svg-background(''); + } } // Overwrite color for toolbar From 810e7d0198c0fe1b358e20add3090b11b55a6398 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Fri, 28 Jun 2019 13:15:24 +0300 Subject: [PATCH 2/2] [DE mobile] Add close into Insert Footnote, Add translation --- apps/documenteditor/mobile/app/controller/add/AddOther.js | 1 + apps/documenteditor/mobile/locale/en.json | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/apps/documenteditor/mobile/app/controller/add/AddOther.js b/apps/documenteditor/mobile/app/controller/add/AddOther.js index 0a9ff4e86f..04ba5b122f 100644 --- a/apps/documenteditor/mobile/app/controller/add/AddOther.js +++ b/apps/documenteditor/mobile/app/controller/add/AddOther.js @@ -163,6 +163,7 @@ define([ if (me.api) { me.api.asc_SetFootnoteProps(props, false); me.api.asc_AddFootnote(); + DE.getController('AddContainer').hideModal(); } }, diff --git a/apps/documenteditor/mobile/locale/en.json b/apps/documenteditor/mobile/locale/en.json index adc775d362..0823b2b2a4 100644 --- a/apps/documenteditor/mobile/locale/en.json +++ b/apps/documenteditor/mobile/locale/en.json @@ -10,6 +10,8 @@ "DE.Controllers.AddImage.textEmptyImgUrl": "You need to specify image URL.", "DE.Controllers.AddImage.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format", "DE.Controllers.AddOther.txtNotUrl": "This field should be a URL in the 'http://www.example.com' format", + "DE.Controllers.AddOther.textBottomOfPage": "Bottom Of Page", + "DE.Controllers.AddOther.textBelowText": "Below Text", "DE.Controllers.AddTable.textCancel": "Cancel", "DE.Controllers.AddTable.textColumns": "Columns", "DE.Controllers.AddTable.textRows": "Rows", @@ -271,6 +273,11 @@ "DE.Views.AddOther.textRightTop": "Right Top", "DE.Views.AddOther.textSectionBreak": "Section Break", "DE.Views.AddOther.textTip": "Screen Tip", + "DE.Views.AddOther.textFootnote": "Footnote", + "DE.Views.AddOther.textInsertFootnote": "Insert Footnote", + "DE.Views.AddOther.textFormat": "Format", + "DE.Views.AddOther.textStartFrom": "Start At", + "DE.Views.AddOther.textLocation": "Location", "DE.Views.EditChart.textAlign": "Align", "DE.Views.EditChart.textBack": "Back", "DE.Views.EditChart.textBackward": "Move Backward",