Merge branch 'develop' into feature/buttons-set
This commit is contained in:
commit
756a02cfb9
|
@ -151,7 +151,7 @@ define([
|
|||
|
||||
var tip = el.data('bs.tooltip');
|
||||
if (tip) {
|
||||
if (tip.dontShow===undefined)
|
||||
if (tip.dontShow===undefined && el.is(':hover'))
|
||||
tip.dontShow = true;
|
||||
}
|
||||
|
||||
|
|
|
@ -721,7 +721,8 @@ define([
|
|||
arr.push({
|
||||
imageUrl: template.asc_getImage(),
|
||||
id : Common.UI.getId(),
|
||||
templateId: template.asc_getId()
|
||||
templateId: template.asc_getId(),
|
||||
tip : template.asc_getDisplayName()
|
||||
});
|
||||
});
|
||||
self.cmbTableTemplate.menuPicker.store.add(arr);
|
||||
|
|
|
@ -690,7 +690,8 @@ define([
|
|||
arr.push({
|
||||
imageUrl: template.asc_getImage(),
|
||||
id : Common.UI.getId(),
|
||||
templateId: template.asc_getId()
|
||||
templateId: template.asc_getId(),
|
||||
tip : template.asc_getDisplayName()
|
||||
});
|
||||
});
|
||||
self.cmbTableTemplate.menuPicker.store.add(arr);
|
||||
|
|
|
@ -1450,7 +1450,7 @@ define([
|
|||
if (_.isUndefined(me.toolbar.mnuTableTemplatePicker))
|
||||
me.onApiInitTableTemplates(me.api.asc_getTablePictures(formattableinfo));
|
||||
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) {
|
||||
if (me.api) {
|
||||
me._state.tablestylename = null;
|
||||
if (!record)
|
||||
record = picker.store.at(23);
|
||||
me._setTableFormat(record.get('name'));
|
||||
me._setTableFormat(record ? record.get('name') : me.api.asc_getDefaultTableStyle());
|
||||
|
||||
Common.NotificationCenter.trigger('edit:complete', me.toolbar);
|
||||
Common.component.Analytics.trackEvent('ToolBar', 'Table Templates');
|
||||
|
@ -1614,8 +1612,7 @@ define([
|
|||
listStyles.menuPicker.store.reset([]); // remove all
|
||||
|
||||
var mainController = this.getApplication().getController('Main');
|
||||
var merged_array = styles.asc_getDocStyles().concat(styles.asc_getDefaultStyles());
|
||||
_.each(merged_array, function(style){
|
||||
_.each(styles, function(style){
|
||||
listStyles.menuPicker.store.add({
|
||||
imageUrl: style.asc_getImage(),
|
||||
name : style.asc_getName(),
|
||||
|
|
|
@ -361,9 +361,7 @@ define([
|
|||
onApiInitEditorStyles: function(styles){
|
||||
window.styles_loaded = false;
|
||||
|
||||
_cellStyles = styles.asc_getDefaultStyles().concat(styles.asc_getDocStyles());
|
||||
|
||||
this.getView('EditCell').renderStyles(_cellStyles);
|
||||
this.getView('EditCell').renderStyles(styles);
|
||||
|
||||
window.styles_loaded = true;
|
||||
},
|
||||
|
|
Loading…
Reference in a new issue