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

[DE] Open content control settings after it's creating

Browse source
This commit is contained in:
Julia Radzhabova 2020-09-30 18:52:11 +03:00
parent 8494d1b752
commit 7016660299
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/documenteditor/main/app/controller/Main.js
View file

@ -1356,6 +1356,7 @@ define([
toolbarView.on('insertshape', _.bind(me.onInsertShape, me)); toolbarView.on('insertshape', _.bind(me.onInsertShape, me));
toolbarView.on('inserttextart', _.bind(me.onInsertTextArt, me)); toolbarView.on('inserttextart', _.bind(me.onInsertTextArt, me));
toolbarView.on('insertchart', _.bind(me.onInsertChart, me)); toolbarView.on('insertchart', _.bind(me.onInsertChart, me));
toolbarView.on('insertcontrol', _.bind(me.onInsertControl, me));
} }
var value = Common.localStorage.getItem('de-settings-unit'); var value = Common.localStorage.getItem('de-settings-unit');
@ -2032,6 +2033,10 @@ define([
this.getApplication().getController('RightMenu').onInsertTextArt(); this.getApplication().getController('RightMenu').onInsertTextArt();
}, },
onInsertControl: function() {
this.getApplication().getController('RightMenu').onInsertControl();
},
unitsChanged: function(m) { unitsChanged: function(m) {
var value = Common.localStorage.getItem("de-settings-unit"); var value = Common.localStorage.getItem("de-settings-unit");
value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric(); value = (value!==null) ? parseInt(value) : Common.Utils.Metric.getDefaultMetric();

5
apps/documenteditor/main/app/controller/RightMenu.js
View file

@ -261,6 +261,11 @@ define([
this._settings[Common.Utils.documentSettingsType.TextArt].needShow = true; this._settings[Common.Utils.documentSettingsType.TextArt].needShow = true;
}, },
onInsertControl: function() {
if (this._settings[Common.Utils.documentSettingsType.Form])
this._settings[Common.Utils.documentSettingsType.Form].needShow = true;
},
UpdateThemeColors: function() { UpdateThemeColors: function() {
this.rightmenu.paragraphSettings.UpdateThemeColors(); this.rightmenu.paragraphSettings.UpdateThemeColors();
this.rightmenu.tableSettings.UpdateThemeColors(); this.rightmenu.tableSettings.UpdateThemeColors();

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

@ -1835,6 +1835,7 @@ define([
oPr, oFormPr; oPr, oFormPr;
if (isnew) { if (isnew) {
oFormPr = new AscCommon.CSdtFormPr(); oFormPr = new AscCommon.CSdtFormPr();
this.toolbar.fireEvent('insertcontrol', this.toolbar);
} }
if (item.value == 'plain' || item.value == 'rich') if (item.value == 'plain' || item.value == 'rich')
this.api.asc_AddContentControl((item.value=='plain') ? Asc.c_oAscSdtLevelType.Inline : Asc.c_oAscSdtLevelType.Block); this.api.asc_AddContentControl((item.value=='plain') ? Asc.c_oAscSdtLevelType.Inline : Asc.c_oAscSdtLevelType.Block);