From 166fb23a8cae25a95e59ad453d69d600a079db2c Mon Sep 17 00:00:00 2001 From: "Julia.Radzhabova" Date: Wed, 10 Sep 2025 23:16:14 +0300 Subject: [PATCH] For bug 73531 --- apps/common/main/lib/component/InputField.js | 7 ++++++- .../main/lib/component/TextareaField.js | 1 + apps/common/main/lib/template/Chat.template | 2 +- .../main/lib/template/Comments.template | 8 +++---- .../lib/template/CommentsPopover.template | 10 ++++----- .../common/main/lib/view/AutoCorrectDialog.js | 12 +++++++---- apps/common/main/resources/less/input.less | 8 ++++++- .../template/ControlSettingsDialog.template | 2 +- .../template/ImageSettingsAdvanced.template | 2 +- .../app/template/MailMergeEmailDlg.template | 2 +- .../template/TableSettingsAdvanced.template | 2 +- .../main/app/view/BookmarksDialog.js | 1 + .../main/app/view/FileMenuPanels.js | 21 ++++++++++++------- .../main/app/view/ImageSettingsAdvanced.js | 3 ++- .../main/app/view/TableSettingsAdvanced.js | 3 ++- .../template/ImageSettingsAdvanced.template | 2 +- .../template/ShapeSettingsAdvanced.template | 2 +- .../template/TableSettingsAdvanced.template | 2 +- .../pdfeditor/main/app/view/FileMenuPanels.js | 17 +++++++++------ .../template/ChartSettingsAdvanced.template | 2 +- .../template/ImageSettingsAdvanced.template | 2 +- .../template/ShapeSettingsAdvanced.template | 2 +- .../template/TableSettingsAdvanced.template | 2 +- .../main/app/view/ChartSettingsAdvanced.js | 6 ++++-- .../main/app/view/FileMenuPanels.js | 19 ++++++++++------- .../app/template/ChartSettingsDlg.template | 2 +- .../template/ImageSettingsAdvanced.template | 2 +- .../template/PivotSettingsAdvanced.template | 2 +- .../template/ShapeSettingsAdvanced.template | 2 +- .../template/SlicerSettingsAdvanced.template | 2 +- .../template/TableSettingsAdvanced.template | 2 +- .../main/app/view/ChartSettingsDlg.js | 3 ++- .../main/app/view/DataValidationDialog.js | 6 ++++-- .../main/app/view/FieldSettingsDialog.js | 3 ++- .../main/app/view/FileMenuPanels.js | 19 ++++++++++------- .../main/app/view/ImageSettingsAdvanced.js | 3 ++- .../main/app/view/NamedRangeEditDlg.js | 1 + .../main/app/view/PivotSettingsAdvanced.js | 6 ++++-- .../main/app/view/ShapeSettingsAdvanced.js | 3 ++- .../main/app/view/SlicerSettingsAdvanced.js | 9 +++++--- .../main/app/view/TableSettingsAdvanced.js | 3 ++- .../main/app/view/ValueFieldSettingsDialog.js | 3 ++- .../main/app/view/FileMenuPanels.js | 19 ++++++++++------- 43 files changed, 145 insertions(+), 85 deletions(-) diff --git a/apps/common/main/lib/component/InputField.js b/apps/common/main/lib/component/InputField.js index f8155b6d6d..a9cbf17fe4 100644 --- a/apps/common/main/lib/component/InputField.js +++ b/apps/common/main/lib/component/InputField.js @@ -74,7 +74,8 @@ define([ validateOnBlur: true, disabled: false, editable: true, - hideErrorOnInput: false + hideErrorOnInput: false, + dir: '' }, template: _.template([ @@ -88,6 +89,9 @@ define([ 'data-hint="<%= dataHint %>"', 'data-hint-direction="<%= dataHintDirection %>"', 'data-hint-offset="<%= dataHintOffset %>"', + '<% if (dir) {%>', + 'dir="<%= dir %>" ', + '<% } %>', '>', '', '' @@ -140,6 +144,7 @@ define([ dataHint : this.options.dataHint, dataHintDirection: this.options.dataHintDirection, dataHintOffset: this.options.dataHintOffset, + dir: this.options.dir, scope : me })); diff --git a/apps/common/main/lib/component/TextareaField.js b/apps/common/main/lib/component/TextareaField.js index 9ed47a7a93..77e5cdd43d 100644 --- a/apps/common/main/lib/component/TextareaField.js +++ b/apps/common/main/lib/component/TextareaField.js @@ -69,6 +69,7 @@ define([], function () { 'use strict'; '<% if (dataHintOffset) {%>', 'data-hint-offset="<%= dataHintOffset %>" ', '<% } %>', + 'dir="auto"', '>', '' ].join('')), diff --git a/apps/common/main/lib/template/Chat.template b/apps/common/main/lib/template/Chat.template index 488d323833..825998b151 100644 --- a/apps/common/main/lib/template/Chat.template +++ b/apps/common/main/lib/template/Chat.template @@ -7,7 +7,7 @@
- +
diff --git a/apps/common/main/lib/template/Comments.template b/apps/common/main/lib/template/Comments.template index eec227f93a..7b55f52a9b 100644 --- a/apps/common/main/lib/template/Comments.template +++ b/apps/common/main/lib/template/Comments.template @@ -22,7 +22,7 @@
<%=scope.getFixedQuote(quote)%>
<% } %> <% if (!editText || scope.viewmode) { %> -
<%=scope.pickLink(comment)%>
+
<%=scope.pickLink(comment)%>
<% } else { %>
@@ -55,7 +55,7 @@
<% if (!item.get("editText")) { %> -
<%=scope.pickLink(item.get("reply"))%>
+
<%=scope.pickLink(item.get("reply"))%>
<% if (!scope.viewmode) { %>
<% if (item.get("editable")) { %> @@ -68,7 +68,7 @@ <%}%> <% } else { %>
- +
@@ -112,7 +112,7 @@ <% if (showReply) { %>
- +
diff --git a/apps/common/main/lib/template/CommentsPopover.template b/apps/common/main/lib/template/CommentsPopover.template index 1fb1734c2e..cb488f65f9 100644 --- a/apps/common/main/lib/template/CommentsPopover.template +++ b/apps/common/main/lib/template/CommentsPopover.template @@ -17,10 +17,10 @@
<% if (!editTextInPopover || (hint && !fullInfoInHint) || scope.viewmode) { %> -
<%=scope.pickLink(comment)%>
+
<%=scope.pickLink(comment)%>
<% } else { %>
- + <% if (hideAddReply) { %> <% } else { %> @@ -54,7 +54,7 @@
<% if (!item.get("editTextInPopover")) { %> -
<%=scope.pickLink(item.get("reply"))%>
+
<%=scope.pickLink(item.get("reply"))%>
<% if ((fullInfoInHint || !hint) && !scope.viewmode) { %>
<% if (item.get("editable")) { %> @@ -67,7 +67,7 @@ <%}%> <% } else { %>
- +
@@ -111,7 +111,7 @@ <% if (showReplyInPopover) { %>
- +
diff --git a/apps/common/main/lib/view/AutoCorrectDialog.js b/apps/common/main/lib/view/AutoCorrectDialog.js index 3802820d9f..110b314487 100644 --- a/apps/common/main/lib/view/AutoCorrectDialog.js +++ b/apps/common/main/lib/view/AutoCorrectDialog.js @@ -139,7 +139,8 @@ define([ allowBlank : true, validateOnChange : true, maxLength : 31, - validation : function () { return true; } + validation : function () { return true; }, + dir: 'auto' }).on ('changing', function (input, value) { var _selectedItem; if (value.length) { @@ -180,7 +181,8 @@ define([ allowBlank : true, validateOnChange : true, maxLength : 255, - validation : function () { return true; } + validation : function () { return true; }, + dir: 'auto' }).on ('changing', function (input, value) { me.updateControls(); }); @@ -222,7 +224,8 @@ define([ allowBlank : true, validateOnChange : true, maxLength : 255, - validation : function () { return true; } + validation : function () { return true; }, + dir: 'auto' }).on ('changing', function (input, value) { var _selectedItem; if (value.length) { @@ -398,7 +401,8 @@ define([ allowBlank : true, validateOnChange : true, maxLength : 255, - validation : function () { return true; } + validation : function () { return true; }, + dir: 'auto' }).on ('changing', _.bind(this.onChangeInputException, this)); this.exceptionsFindInput.cmpEl.find('input').on('keydown', function(event){ diff --git a/apps/common/main/resources/less/input.less b/apps/common/main/resources/less/input.less index a91b417533..84d26043b9 100644 --- a/apps/common/main/resources/less/input.less +++ b/apps/common/main/resources/less/input.less @@ -78,7 +78,13 @@ position: relative; } - input { + input:not([dir=auto]) { + .rtl & { + direction: rtl; + } + } + + input:placeholder-shown { .rtl & { direction: rtl; } diff --git a/apps/documenteditor/main/app/template/ControlSettingsDialog.template b/apps/documenteditor/main/app/template/ControlSettingsDialog.template index 96eeeb5102..fddd721cba 100644 --- a/apps/documenteditor/main/app/template/ControlSettingsDialog.template +++ b/apps/documenteditor/main/app/template/ControlSettingsDialog.template @@ -178,7 +178,7 @@ - + diff --git a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template index 8147278cf0..88adacacfa 100644 --- a/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/ImageSettingsAdvanced.template @@ -431,7 +431,7 @@ - + diff --git a/apps/documenteditor/main/app/template/MailMergeEmailDlg.template b/apps/documenteditor/main/app/template/MailMergeEmailDlg.template index 0e041c4e05..710da1c120 100644 --- a/apps/documenteditor/main/app/template/MailMergeEmailDlg.template +++ b/apps/documenteditor/main/app/template/MailMergeEmailDlg.template @@ -32,7 +32,7 @@ - + diff --git a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template index a488fdd398..04a4076c2b 100644 --- a/apps/documenteditor/main/app/template/TableSettingsAdvanced.template +++ b/apps/documenteditor/main/app/template/TableSettingsAdvanced.template @@ -340,7 +340,7 @@ - + diff --git a/apps/documenteditor/main/app/view/BookmarksDialog.js b/apps/documenteditor/main/app/view/BookmarksDialog.js index d3dd464802..6e9b529eeb 100644 --- a/apps/documenteditor/main/app/view/BookmarksDialog.js +++ b/apps/documenteditor/main/app/view/BookmarksDialog.js @@ -138,6 +138,7 @@ define([ validateOnBlur: true, value : '', maxLength: 40, + dir: 'auto', validation : function(value) { var check = me.props.asc_CheckNewBookmarkName(value), exist = me.props.asc_HaveBookmark(value); diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 3ee4c6c41e..a911ccaf65 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -1477,7 +1477,7 @@ define([], function () { '
', '', '', - '', + '', '', '
', '
', @@ -1566,7 +1566,8 @@ define([], function () { dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small', - ariaLabel: this.txtTitle + ariaLabel: this.txtTitle, + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putTitle(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1580,7 +1581,8 @@ define([], function () { dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small', - ariaLabel: this.txtTags + ariaLabel: this.txtTags, + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putKeywords(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1594,7 +1596,8 @@ define([], function () { dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small', - ariaLabel: this.txtSubject + ariaLabel: this.txtSubject, + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putSubject(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1608,7 +1611,8 @@ define([], function () { dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small', - ariaLabel: this.txtComment + ariaLabel: this.txtComment, + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putDescription(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1623,7 +1627,7 @@ define([], function () { this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); @@ -1646,7 +1650,8 @@ define([], function () { dataHint: '2', dataHintDirection: 'left', dataHintOffset: 'small', - ariaLabel: this.txtAuthor + ariaLabel: this.txtAuthor, + dir: 'auto' }).on('changed:after', function(input, newValue, oldValue, e) { if (newValue == oldValue) return; @@ -2006,7 +2011,7 @@ define([], function () { return '' + '' + '
' + - '' + + '' + '
' + '
'; }, diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js index ad402655df..215c933cc7 100644 --- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js @@ -1121,7 +1121,8 @@ define([ el : $('#image-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js index d23c833777..4d74465969 100644 --- a/apps/documenteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/documenteditor/main/app/view/TableSettingsAdvanced.js @@ -979,7 +979,8 @@ define([ el : $('#table-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/pdfeditor/main/app/template/ImageSettingsAdvanced.template b/apps/pdfeditor/main/app/template/ImageSettingsAdvanced.template index d9af1d4a86..8d60cf8876 100644 --- a/apps/pdfeditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/pdfeditor/main/app/template/ImageSettingsAdvanced.template @@ -104,7 +104,7 @@ - + diff --git a/apps/pdfeditor/main/app/template/ShapeSettingsAdvanced.template b/apps/pdfeditor/main/app/template/ShapeSettingsAdvanced.template index ab690219a5..4a493e5a08 100644 --- a/apps/pdfeditor/main/app/template/ShapeSettingsAdvanced.template +++ b/apps/pdfeditor/main/app/template/ShapeSettingsAdvanced.template @@ -225,7 +225,7 @@ - + diff --git a/apps/pdfeditor/main/app/template/TableSettingsAdvanced.template b/apps/pdfeditor/main/app/template/TableSettingsAdvanced.template index edac27f065..92bb15436f 100644 --- a/apps/pdfeditor/main/app/template/TableSettingsAdvanced.template +++ b/apps/pdfeditor/main/app/template/TableSettingsAdvanced.template @@ -137,7 +137,7 @@ - + diff --git a/apps/pdfeditor/main/app/view/FileMenuPanels.js b/apps/pdfeditor/main/app/view/FileMenuPanels.js index 7dc95ed558..27347ee396 100644 --- a/apps/pdfeditor/main/app/view/FileMenuPanels.js +++ b/apps/pdfeditor/main/app/view/FileMenuPanels.js @@ -1272,7 +1272,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore); this.inputTags = new Common.UI.InputField({ el : $markup.findById('#id-info-tags'), @@ -1281,7 +1282,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore); this.inputSubject = new Common.UI.InputField({ el : $markup.findById('#id-info-subject'), @@ -1290,7 +1292,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore); this.inputComment = new Common.UI.InputField({ el : $markup.findById('#id-info-comment'), @@ -1299,7 +1302,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore); // modify info @@ -1311,7 +1315,7 @@ define([], function () { this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); @@ -1331,7 +1335,8 @@ define([], function () { placeHolder: this.txtAddAuthor, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('changed:after', function(input, newValue, oldValue, e) { if (newValue == oldValue) return; diff --git a/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template index c10e706163..4ee8a1ab7e 100644 --- a/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ChartSettingsAdvanced.template @@ -125,7 +125,7 @@ - + diff --git a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template index cec1660503..fbf0c5f304 100644 --- a/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ImageSettingsAdvanced.template @@ -104,7 +104,7 @@ - + diff --git a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template index 472d4817c0..c1f12aef6e 100644 --- a/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/ShapeSettingsAdvanced.template @@ -225,7 +225,7 @@ - + diff --git a/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template b/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template index 90c3ba0dff..9f3b13f536 100644 --- a/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template +++ b/apps/presentationeditor/main/app/template/TableSettingsAdvanced.template @@ -137,7 +137,7 @@ - + diff --git a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js index 987e37629d..25ab78922e 100644 --- a/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js +++ b/apps/presentationeditor/main/app/view/ChartSettingsAdvanced.js @@ -101,7 +101,8 @@ define([ el : $('#chart-advanced-name'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isChartNameChanged = true; }); @@ -235,7 +236,8 @@ define([ el : $('#chart-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index 0066c783e7..923a8659cd 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -1183,7 +1183,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putTitle(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1196,7 +1197,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putKeywords(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1209,7 +1211,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putSubject(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1222,7 +1225,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putDescription(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1237,7 +1241,7 @@ define([], function () { this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); @@ -1259,7 +1263,8 @@ define([], function () { placeHolder: this.txtAddAuthor, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('changed:after', function(input, newValue, oldValue, e) { if (newValue == oldValue) return; @@ -1433,7 +1438,7 @@ define([], function () { return '' + '' + '
' + - '' + + '' + '
' + '
'; }, diff --git a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template index b3d1929a31..15f032b206 100644 --- a/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template +++ b/apps/spreadsheeteditor/main/app/template/ChartSettingsDlg.template @@ -181,7 +181,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template index 76cb94e71d..27e6f05b43 100644 --- a/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/ImageSettingsAdvanced.template @@ -57,7 +57,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template index 0fc055d16d..246b16299f 100644 --- a/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/PivotSettingsAdvanced.template @@ -86,7 +86,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template index d41a011466..85b866f03c 100644 --- a/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.template @@ -194,7 +194,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template index 004610c682..db4e59dcd0 100644 --- a/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/SlicerSettingsAdvanced.template @@ -106,7 +106,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/template/TableSettingsAdvanced.template b/apps/spreadsheeteditor/main/app/template/TableSettingsAdvanced.template index fc0f57fa10..1e0e6ffd29 100644 --- a/apps/spreadsheeteditor/main/app/template/TableSettingsAdvanced.template +++ b/apps/spreadsheeteditor/main/app/template/TableSettingsAdvanced.template @@ -10,7 +10,7 @@ - + diff --git a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js index 09513420ef..1f97c7f35b 100644 --- a/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js +++ b/apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js @@ -522,7 +522,8 @@ define([ el : $('#chart-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js index 1856361bd4..5716d4e719 100644 --- a/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js +++ b/apps/spreadsheeteditor/main/app/view/DataValidationDialog.js @@ -182,7 +182,8 @@ define([ allowBlank : true, validateOnBlur: false, maxLength: 32, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isInputTitleChanged = true; }); @@ -226,7 +227,8 @@ define([ allowBlank : true, validateOnBlur: false, maxLength: 32, - style : 'width: 140px;' + style : 'width: 140px;', + dir: 'auto' }).on('changed:after', function() { me.isErrorTitleChanged = true; }); diff --git a/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js index 63588bc77e..0358e5c72d 100644 --- a/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/FieldSettingsDialog.js @@ -81,7 +81,8 @@ define([ el : $('#field-settings-custom'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }); this.lblSourceName = this.$window.find('#field-settings-source'); diff --git a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js index 80851be92c..d7732facfa 100644 --- a/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js +++ b/apps/spreadsheeteditor/main/app/view/FileMenuPanels.js @@ -1761,7 +1761,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putTitle(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1774,7 +1775,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putKeywords(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1787,7 +1789,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putSubject(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1800,7 +1803,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putDescription(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -1815,7 +1819,7 @@ define([], function () { this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); @@ -1837,7 +1841,8 @@ define([], function () { placeHolder: this.txtAddAuthor, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('changed:after', function(input, newValue, oldValue, e) { if (newValue == oldValue) return; @@ -2050,7 +2055,7 @@ define([], function () { return '' + '' + '
' + - '' + + '' + '
' + '
'; }, diff --git a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js index abe8ccd544..d3e994d0d3 100644 --- a/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ImageSettingsAdvanced.js @@ -126,7 +126,8 @@ define([ el : $('#image-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js index e2fe90db02..6e2058a2fb 100644 --- a/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js +++ b/apps/spreadsheeteditor/main/app/view/NamedRangeEditDlg.js @@ -117,6 +117,7 @@ define([ validateOnChange: false, validateOnBlur: false, style : 'width: 100%;', + dir: 'auto', validation : function(value) { var isvalid = me.api.asc_checkDefinedName(value, (me.cmbScope.getValue()==-255) ? null : me.cmbScope.getValue()); if (isvalid.asc_getStatus() === true) return true; diff --git a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js index ad3c442998..057d06085b 100644 --- a/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/PivotSettingsAdvanced.js @@ -88,7 +88,8 @@ define([ el : $('#pivot-adv-name'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }); this.radioDown = new Common.UI.RadioBox({ @@ -164,7 +165,8 @@ define([ el : $('#pivot-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js index 9248020f51..0abdaf5030 100644 --- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js @@ -529,7 +529,8 @@ define([ el : $('#shape-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js index 76d9a12a29..6cf0d495cb 100644 --- a/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/SlicerSettingsAdvanced.js @@ -94,7 +94,8 @@ define([ this.inputHeader = new Common.UI.InputField({ el : $('#sliceradv-text-header'), allowBlank : true, - style : 'width: 178px;' + style : 'width: 178px;', + dir: 'auto' }).on('changed:after', function() { me.isCaptionChanged = true; }); @@ -326,7 +327,8 @@ define([ el : $('#sliceradv-text-name'), allowBlank : false, blankError : me.txtEmpty, - style : 'width: 178px;' + style : 'width: 178px;', + dir: 'auto' }).on('changed:after', function() { me.isNameChanged = true; }); @@ -365,7 +367,8 @@ define([ el : $('#sliceradv-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js index 2237991d91..701b3494f4 100644 --- a/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js +++ b/apps/spreadsheeteditor/main/app/view/TableSettingsAdvanced.js @@ -78,7 +78,8 @@ define([ el : $('#table-advanced-alt-title'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }).on('changed:after', function() { me.isAltTitleChanged = true; }); diff --git a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js index 6d761f781f..d9cd0c7683 100644 --- a/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js +++ b/apps/spreadsheeteditor/main/app/view/ValueFieldSettingsDialog.js @@ -114,7 +114,8 @@ define([ el : $('#value-field-settings-custom'), allowBlank : true, validateOnBlur: false, - style : 'width: 100%;' + style : 'width: 100%;', + dir: 'auto' }); this.cmbSummarize = new Common.UI.ComboBox({ diff --git a/apps/visioeditor/main/app/view/FileMenuPanels.js b/apps/visioeditor/main/app/view/FileMenuPanels.js index 57ac4c0b63..2dc365bc68 100644 --- a/apps/visioeditor/main/app/view/FileMenuPanels.js +++ b/apps/visioeditor/main/app/view/FileMenuPanels.js @@ -861,7 +861,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putTitle(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -874,7 +875,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putKeywords(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -887,7 +889,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putSubject(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -900,7 +903,8 @@ define([], function () { validateOnBlur: false, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('keydown:before', keyDownBefore).on('changed:after', function(_, newValue) { me.coreProps.asc_putDescription(newValue); me.api.asc_setCoreProps(me.coreProps); @@ -915,7 +919,7 @@ define([], function () { this.lblApplication = $markup.findById('#id-info-appname'); this.tblAuthor = $markup.findById('#id-info-author table'); this.trAuthor = $markup.findById('#id-info-add-author').closest('tr'); - this.authorTpl = '
'; + this.authorTpl = '
'; this.tblAuthor.on('click', function(e) { var btn = $markup.find(e.target); @@ -937,7 +941,8 @@ define([], function () { placeHolder: this.txtAddAuthor, dataHint: '2', dataHintDirection: 'left', - dataHintOffset: 'small' + dataHintOffset: 'small', + dir: 'auto' }).on('changed:after', function(input, newValue, oldValue, e) { if (newValue == oldValue) return; @@ -1094,7 +1099,7 @@ define([], function () { return '' + '' + '
' + - '' + + '' + '
' + '
'; },