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

[SSE] Update table templates depending on whether or not a table is selected. Query table templates when theme colors are changed.

Browse source
This commit is contained in:
Julia Radzhabova 2016-11-29 15:48:18 +03:00
parent 28a4bf62b7
commit 2600efb38c
2 changed files with 18 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -272,7 +272,7 @@ define([
setApi: function(api) { setApi: function(api) {
this.api = api; this.api = api;
this.api.asc_registerCallback('asc_onInitTablePictures', _.bind(this.onApiInitTableTemplates, this)); this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this)); this.api.asc_registerCallback('asc_onInitEditorStyles', _.bind(this.onApiInitEditorStyles, this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this, true)); this.api.asc_registerCallback('asc_onCoAuthoringDisconnect',_.bind(this.onApiCoAuthoringDisconnect, this, true));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this)); Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiCoAuthoringDisconnect, this));
@ -1366,14 +1366,21 @@ define([
}, },
onTableTplMenuOpen: function(cmp) { onTableTplMenuOpen: function(cmp) {
var scroller = this.toolbar.mnuTableTemplatePicker.scroller; this.onApiInitTableTemplates(this.api.asc_getTablePictures(this.api.asc_getCellInfo().asc_getFormatTableInfo()));
var scroller = this.toolbar.mnuTableTemplatePicker.scroller;
if (scroller) { if (scroller) {
scroller.update({alwaysVisibleY: true}); scroller.update({alwaysVisibleY: true});
scroller.scrollTop(0); scroller.scrollTop(0);
} }
}, },
onSendThemeColors: function() {
// get new table templates
if (this.toolbar.btnTableTemplate.rendered && this.toolbar.btnTableTemplate.cmpEl.hasClass('open'))
this.onTableTplMenuOpen();
},
onApiInitTableTemplates: function(images) { onApiInitTableTemplates: function(images) {
var store = this.getCollection('TableTemplates'); var store = this.getCollection('TableTemplates');
if (store) { if (store) {

10
apps/spreadsheeteditor/main/app/view/TableSettings.js
View file

@ -140,7 +140,7 @@ define([
setApi: function(o) { setApi: function(o) {
this.api = o; this.api = o;
if (o) { if (o) {
this.api.asc_registerCallback('asc_onInitTablePictures', _.bind(this.onApiInitTableTemplates, this)); this.api.asc_registerCallback('asc_onSendThemeColors', _.bind(this.onSendThemeColors, this));
} }
return this; return this;
}, },
@ -347,6 +347,14 @@ define([
} }
}, },
onSendThemeColors: function() {
// get new table templates
if (this.cmbTableTemplate) {
this.onApiInitTableTemplates(this.api.asc_getTablePictures(this._originalProps));
this.cmbTableTemplate.menuPicker.scroller.update({alwaysVisibleY: true});
}
},
onApiInitTableTemplates: function(Templates){ onApiInitTableTemplates: function(Templates){
var self = this; var self = this;
this._isTemplatesChanged = true; this._isTemplatesChanged = true;