Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #1047 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-08-04 19:24:36 +03:00 committed by GitHub
parent 7211050c0d 9d9ae009e3
commit a23e816aa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -323,6 +323,7 @@ define([
toolbar.btnShowHidenChars.on('toggle', _.bind(this.onNonPrintingToggle, this)); toolbar.btnShowHidenChars.on('toggle', _.bind(this.onNonPrintingToggle, this));
toolbar.mnuTablePicker.on('select', _.bind(this.onTablePickerSelect, this)); toolbar.mnuTablePicker.on('select', _.bind(this.onTablePickerSelect, this));
toolbar.mnuInsertTable.on('item:click', _.bind(this.onInsertTableClick, this)); toolbar.mnuInsertTable.on('item:click', _.bind(this.onInsertTableClick, this));
toolbar.mnuInsertTable.on('show:after', _.bind(this.onInsertTableShow, this));
toolbar.mnuInsertImage.on('item:click', _.bind(this.onInsertImageClick, this)); toolbar.mnuInsertImage.on('item:click', _.bind(this.onInsertImageClick, this));
toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this)); toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this));
toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this)); toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this));
@ -1525,6 +1526,11 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Table'); Common.component.Analytics.trackEvent('ToolBar', 'Table');
}, },
onInsertTableShow: function(menu) {
var selected = this.api.asc_GetSelectedText();
menu.items[4].setDisabled(!selected || selected.length<1);
},
onInsertTableClick: function(menu, item, e) { onInsertTableClick: function(menu, item, e) {
var me = this; var me = this;
if (item.value === 'custom') { if (item.value === 'custom') {

3
apps/documenteditor/main/app/view/TextToTableDialog.js
View file

@ -247,7 +247,7 @@ define([
maxLength: 1, maxLength: 1,
validateOnChange: true, validateOnChange: true,
validateOnBlur: false, validateOnBlur: false,
value: '-' value: Common.Utils.InternalSettings.get("de-text-to-table-separator") || '-'
}).on ('changing', function(input, newValue) { }).on ('changing', function(input, newValue) {
if (me.props && newValue) { if (me.props && newValue) {
me.props.put_SeparatorType(3, true); me.props.put_SeparatorType(3, true);
@ -315,6 +315,7 @@ define([
if (this.props) { if (this.props) {
this.props.put_AutoFitType(this.rbFixed.getValue() ? 1 : (this.rbContents.getValue() ? 2 : 3)); this.props.put_AutoFitType(this.rbFixed.getValue() ? 1 : (this.rbContents.getValue() ? 2 : 3));
this.rbFixed.getValue() && this.props.put_Fit(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue())); this.rbFixed.getValue() && this.props.put_Fit(Common.Utils.Metric.fnRecalcToMM(this.spnWidth.getNumberValue()));
this.rbOther.getValue() && Common.Utils.InternalSettings.set("de-text-to-table-separator", String.fromCharCode(this.props.get_Separator()));
} }
return this.props; return this.props;