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

Merge branch 'develop' into feature/buttons-set

Browse source
This commit is contained in:
Julia Radzhabova 2019-06-10 17:53:29 +03:00
parent 863e500d67 0b31165036
commit 756a02cfb9
5 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/common/main/lib/component/DataView.js
View file

@ -151,7 +151,7 @@ define([
var tip = el.data('bs.tooltip'); var tip = el.data('bs.tooltip');
if (tip) { if (tip) {
if (tip.dontShow===undefined) if (tip.dontShow===undefined && el.is(':hover'))
tip.dontShow = true; tip.dontShow = true;
} }

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

@ -721,7 +721,8 @@ define([
arr.push({ arr.push({
imageUrl: template.asc_getImage(), imageUrl: template.asc_getImage(),
id : Common.UI.getId(), id : Common.UI.getId(),
templateId: template.asc_getId() templateId: template.asc_getId(),
tip : template.asc_getDisplayName()
}); });
}); });
self.cmbTableTemplate.menuPicker.store.add(arr); self.cmbTableTemplate.menuPicker.store.add(arr);

3
apps/presentationeditor/main/app/view/TableSettings.js
View file

@ -690,7 +690,8 @@ define([
arr.push({ arr.push({
imageUrl: template.asc_getImage(), imageUrl: template.asc_getImage(),
id : Common.UI.getId(), id : Common.UI.getId(),
templateId: template.asc_getId() templateId: template.asc_getId(),
tip : template.asc_getDisplayName()
}); });
}); });
self.cmbTableTemplate.menuPicker.store.add(arr); self.cmbTableTemplate.menuPicker.store.add(arr);

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

@ -1450,7 +1450,7 @@ define([
if (_.isUndefined(me.toolbar.mnuTableTemplatePicker)) if (_.isUndefined(me.toolbar.mnuTableTemplatePicker))
me.onApiInitTableTemplates(me.api.asc_getTablePictures(formattableinfo)); me.onApiInitTableTemplates(me.api.asc_getTablePictures(formattableinfo));
var store = me.getCollection('TableTemplates'); var store = me.getCollection('TableTemplates');
me._setTableFormat(store.at(23).get('name')); me._setTableFormat(me.api.asc_getDefaultTableStyle());
} }
} }
@ -1531,9 +1531,7 @@ define([
picker.on('item:click', function(picker, item, record) { picker.on('item:click', function(picker, item, record) {
if (me.api) { if (me.api) {
me._state.tablestylename = null; me._state.tablestylename = null;
if (!record) me._setTableFormat(record ? record.get('name') : me.api.asc_getDefaultTableStyle());
record = picker.store.at(23);
me._setTableFormat(record.get('name'));
Common.NotificationCenter.trigger('edit:complete', me.toolbar); Common.NotificationCenter.trigger('edit:complete', me.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Table Templates'); Common.component.Analytics.trackEvent('ToolBar', 'Table Templates');
@ -1614,8 +1612,7 @@ define([
listStyles.menuPicker.store.reset([]); // remove all listStyles.menuPicker.store.reset([]); // remove all
var mainController = this.getApplication().getController('Main'); var mainController = this.getApplication().getController('Main');
var merged_array = styles.asc_getDocStyles().concat(styles.asc_getDefaultStyles()); _.each(styles, function(style){
_.each(merged_array, function(style){
listStyles.menuPicker.store.add({ listStyles.menuPicker.store.add({
imageUrl: style.asc_getImage(), imageUrl: style.asc_getImage(),
name : style.asc_getName(), name : style.asc_getName(),

4
apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js
View file

@ -361,9 +361,7 @@ define([
onApiInitEditorStyles: function(styles){ onApiInitEditorStyles: function(styles){
window.styles_loaded = false; window.styles_loaded = false;
_cellStyles = styles.asc_getDefaultStyles().concat(styles.asc_getDocStyles()); this.getView('EditCell').renderStyles(styles);
this.getView('EditCell').renderStyles(_cellStyles);
window.styles_loaded = true; window.styles_loaded = true;
}, },