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

[DE][SSE] Loading text arts and equations when editors are opened with compact toolbar.

Browse source
This commit is contained in:
Julia Radzhabova 2016-08-23 11:50:19 +03:00
parent 9f3c4cc909
commit 880fad0c9f
3 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2189,6 +2189,8 @@ define([
}, },
fillEquations: function() { fillEquations: function() {
if (!this.toolbar.btnInsertEquation.rendered) return;
var me = this, equationsStore = this.getApplication().getCollection('EquationGroups'); var me = this, equationsStore = this.getApplication().getCollection('EquationGroups');
me.equationPickers = []; me.equationPickers = [];
@ -2380,8 +2382,9 @@ define([
}, },
fillTextArt: function() { fillTextArt: function() {
var me = this; if (!this.toolbar.btnInsertText.rendered) return;
var me = this;
if (this.toolbar.mnuTextArtPicker) { if (this.toolbar.mnuTextArtPicker) {
var models = this.getApplication().getCollection('Common.Collections.TextArt').models, var models = this.getApplication().getCollection('Common.Collections.TextArt').models,
count = this.toolbar.mnuTextArtPicker.store.length; count = this.toolbar.mnuTextArtPicker.store.length;

5
apps/documenteditor/main/app/view/Toolbar.js
View file

@ -1557,6 +1557,11 @@ define([
if (me.listStyles.menuPicker.store.length > 0 && listStylesVisible){ if (me.listStyles.menuPicker.store.length > 0 && listStylesVisible){
me.listStyles.fillComboView(me.listStyles.menuPicker.getSelectedRec(), true); me.listStyles.fillComboView(me.listStyles.menuPicker.getSelectedRec(), true);
} }
if (me.btnInsertText.rendered)
DE.getController('Toolbar').fillTextArt();
if (me.btnInsertEquation.rendered)
DE.getController('Toolbar').fillEquations();
}, 100); }, 100);
} }

5
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -1256,6 +1256,9 @@ define([
if (me.toolbar.listStyles.menuPicker.store.length > 0 && listStylesVisible){ if (me.toolbar.listStyles.menuPicker.store.length > 0 && listStylesVisible){
me.toolbar.listStyles.fillComboView(me.toolbar.listStyles.menuPicker.getSelectedRec(), true); me.toolbar.listStyles.fillComboView(me.toolbar.listStyles.menuPicker.getSelectedRec(), true);
} }
if (me.toolbar.btnInsertText.rendered)
SSE.getController('Toolbar').fillTextArt();
}, 100); }, 100);
} }
@ -2002,6 +2005,8 @@ define([
}, },
fillTextArt: function() { fillTextArt: function() {
if (!this.toolbar.btnInsertText.rendered) return;
var me = this; var me = this;
if (this.toolbar.mnuTextArtPicker) { if (this.toolbar.mnuTextArtPicker) {