From ae9a264e327a9e48daf69a981a10697bd548c47d Mon Sep 17 00:00:00 2001 From: JuliaSvinareva Date: Thu, 28 May 2020 19:40:24 +0300 Subject: [PATCH] [sse mobile] Add text orientation into edit cell --- .../mobile/app/controller/edit/EditCell.js | 47 ++++++++ .../mobile/app/template/EditCell.template | 107 ++++++++++++++++++ .../mobile/app/view/edit/EditCell.js | 10 +- apps/spreadsheeteditor/mobile/locale/en.json | 7 ++ 4 files changed, 170 insertions(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js index 27d213da6..94c848f72 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js @@ -132,6 +132,8 @@ define([ me.initBorderColorPage(); } else if ('#edit-text-format' == pageId) { me.initTextFormat(); + } else if ('#edit-text-orientation' == pageId) { + me.initTextOrientation(); } else if ('#edit-border-style' == pageId) { me.initBorderStyle(); } else if (!_.isUndefined(pageId) && pageId.indexOf('#edit-cell-format') > -1) { @@ -339,6 +341,8 @@ define([ return; } + me.initTextOrientation(); + me.initTextFormat(); }, @@ -504,6 +508,49 @@ define([ return clr; }, + initTextOrientation: function() { + if (_.isUndefined(this._cellInfo)) return; + + var me = this, + $pageTextOrientation = $('.page[data-page=edit-text-orientation]'), + orientationStr = 'horizontal', + xfs = this._cellInfo.asc_getXfs(); + + var textAngle = xfs.asc_getAngle(); + + switch(textAngle) { + case 45: orientationStr = 'anglecount'; break; + case -45: orientationStr = 'angleclock'; break; + case 255: orientationStr = 'vertical'; break; + case 90: orientationStr = 'rotateup'; break; + case -90: orientationStr = 'rotatedown'; break; + case 0: orientationStr = 'horizontal'; break; + } + + $('#text-orientation .item-media i').removeClass().addClass(Common.Utils.String.format('icon icon-text-orientation-{0}', orientationStr)); + + if ($pageTextOrientation.length > 0) { + var $radioOrientation = $pageTextOrientation.find('input:radio[name=text-orientation]'); + $radioOrientation.val([orientationStr]); + $radioOrientation.single('change', _.bind(me.onTextOrientationChange, me)); + } + }, + + onTextOrientationChange: function(e) { + var $target = $(e.currentTarget), + value = $target.prop('value'); + var angle = 0; + switch (value) { + case 'anglecount': angle = 45; break; + case 'angleclock': angle = -45; break; + case 'vertical': angle = 255; break; + case 'rotateup': angle = 90; break; + case 'rotatedown': angle = -90; break; + } + if (this.api) + this.api.asc_setCellAngle(angle); + }, + textFonts: 'Fonts', textAuto: 'Auto', textPt: 'pt' diff --git a/apps/spreadsheeteditor/mobile/app/template/EditCell.template b/apps/spreadsheeteditor/mobile/app/template/EditCell.template index 765b5be16..f07e2bf3a 100644 --- a/apps/spreadsheeteditor/mobile/app/template/EditCell.template +++ b/apps/spreadsheeteditor/mobile/app/template/EditCell.template @@ -55,6 +55,16 @@ +
  • + +
    + <% if (!android) { %>
    <% } %> +
    +
    <%= scope.textTextOrientation %>
    +
    +
    +     +
  • @@ -303,6 +313,103 @@
    + +
    +
    +
    +
    <% if (!android) { %><%= scope.textBack %><% } %>
    +
    <%= scope.textTextOrientation %>
    +
    <% if (phone) { %><% } %>
    +
    +
    +
    +
    +
    +
      +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    • + +
      • +
    +
    +
    +
    +
    +
    diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js index 4d31ef663..27b035370 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditCell.js @@ -166,6 +166,7 @@ define([ 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'); + Common.Utils.addScrollIfNeed('.page[data-page=edit-text-orientation]', '.page[data-page=edit-text-orientation] .page-content'); $(selectorsDynamicPage).single('click', _.bind(this.onItemClick, this)); }, @@ -422,7 +423,14 @@ define([ textCharacterItalic: 'I', textCharacterUnderline: 'U', textAddCustomColor: 'Add Custom Color', - textCustomColor: 'Custom Color' + textCustomColor: 'Custom Color', + textTextOrientation: 'Text Orientation', + textHorizontalText: 'Horizontal Text', + textAngleCounterclockwise: 'Angle Counterclockwise', + textAngleClockwise: 'Angle Clockwise', + textVerticalText: 'Vertical Text', + textRotateTextUp: 'Rotate Text Up', + textRotateTextDown: 'Rotate Text Down' } })(), SSE.Views.EditCell || {})) }); diff --git a/apps/spreadsheeteditor/mobile/locale/en.json b/apps/spreadsheeteditor/mobile/locale/en.json index 81a4904f7..a74141ba4 100644 --- a/apps/spreadsheeteditor/mobile/locale/en.json +++ b/apps/spreadsheeteditor/mobile/locale/en.json @@ -428,6 +428,13 @@ "SSE.Views.EditCell.textTopBorder": "Top Border", "SSE.Views.EditCell.textWrapText": "Wrap Text", "SSE.Views.EditCell.textYen": "Yen", + "SSE.Views.EditCell.textTextOrientation": "Text Orientation", + "SSE.Views.EditCell.textHorizontalText": "Horizontal Text", + "SSE.Views.EditCell.textAngleCounterclockwise": "Angle Counterclockwise", + "SSE.Views.EditCell.textAngleClockwise": "Angle Clockwise", + "SSE.Views.EditCell.textVerticalText": "Vertical Text", + "SSE.Views.EditCell.textRotateTextUp": "Rotate Text Up", + "SSE.Views.EditCell.textRotateTextDown": "Rotate Text Down", "SSE.Views.EditChart.textAddCustomColor": "Add Custom Color", "SSE.Views.EditChart.textAuto": "Auto", "SSE.Views.EditChart.textAxisCrosses": "Axis Crosses",