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

Fix Bug 36134.

Browse source
This commit is contained in:
Julia Radzhabova 2017-10-24 15:59:18 +03:00
parent 99d5205a80
commit 03890e6403
4 changed files with 37 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1746,6 +1746,8 @@ define([
},
onSelectChart: function(picker, item, record) {
if (!record) return;
var me = this,
type = record.get('type'),
chart = false;
@ -2339,8 +2341,10 @@ define([
shapePicker.on('item:click', function(picker, item, record, e) {
if (me.api) {
me._addAutoshape(true, record.get('data').shapeType);
me._isAddingShape = true;
if (record) {
me._addAutoshape(true, record.get('data').shapeType);
me._isAddingShape = true;
}
if (me.toolbar.btnInsertText.pressed) {
me.toolbar.btnInsertText.toggle(false, true);
@ -2411,7 +2415,8 @@ define([
equationPicker.on('item:click', function(picker, item, record, e) {
if (me.api) {
me.api.asc_AddMath(record.get('data').equationType);
if (record)
me.api.asc_AddMath(record.get('data').equationType);
if (me.toolbar.btnInsertText.pressed) {
me.toolbar.btnInsertText.toggle(false, true);
@ -2575,8 +2580,10 @@ define([
this.toolbar.mnuTextArtPicker.on('item:click', function(picker, item, record, e) {
if (me.api) {
me.toolbar.fireEvent('inserttextart', me.toolbar);
me.api.AddTextArt(record.get('data'));
if (record) {
me.toolbar.fireEvent('inserttextart', me.toolbar);
me.api.AddTextArt(record.get('data'));
}
if (me.toolbar.btnInsertShape.pressed)
me.toolbar.btnInsertShape.toggle(false, true);

13
apps/presentationeditor/main/app/controller/Toolbar.js
View file

@ -805,7 +805,8 @@ define([
onAddSlide: function(picker, item, record) {
if (this.api) {
this.api.AddSlide(record.get('data').idx);
if (record)
this.api.AddSlide(record.get('data').idx);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Add Slide');
@ -821,7 +822,8 @@ define([
onChangeSlide: function(picker, item, record) {
if (this.api) {
this.api.ChangeLayout(record.get('data').idx);
if (record)
this.api.ChangeLayout(record.get('data').idx);
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
Common.component.Analytics.trackEvent('ToolBar', 'Change Layout');
@ -1502,6 +1504,8 @@ define([
},
onSelectChart: function(picker, item, record) {
if (!record) return;
var me = this,
type = record.get('type'),
chart = false;
@ -1541,7 +1545,7 @@ define([
onListThemeSelect: function(combo, record) {
this._state.themeId = undefined;
if (this.api)
if (this.api && record)
this.api.ChangeTheme(record.get('themeId'));
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
@ -1769,7 +1773,8 @@ define([
equationPicker.on('item:click', function(picker, item, record, e) {
if (me.api) {
me.api.asc_AddMath(record.get('data').equationType);
if (record)
me.api.asc_AddMath(record.get('data').equationType);
if (me.toolbar.btnsInsertText.pressed) {
me.toolbar.btnsInsertText.toggle(false, true);

8
apps/presentationeditor/main/app/view/Toolbar.js
View file

@ -1681,9 +1681,10 @@ define([
});
btn.textartPicker.on('item:click', function(picker, item, record, e) {
me.fireEvent('insert:textart', [record.get('data')]);
if (record)
me.fireEvent('insert:textart', [record.get('data')]);
if (e.type !== 'click') this.menu.hide();
if (e.type !== 'click') btn.menu.hide();
});
}
},
@ -1714,7 +1715,8 @@ define([
itemTemplate: _.template('<div class="item-shape"><img src="<%= imageUrl %>" id="<%= id %>"></div>')
})).on('item:click', function (picker, item, record, e) {
if (e.type !== 'click') Common.UI.Menu.Manager.hideAll();
me.fireEvent('insert:shape', [record.get('data').shapeType]);
if (record)
me.fireEvent('insert:shape', [record.get('data').shapeType]);
});
});
}

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

@ -863,7 +863,7 @@ define([
},
onSelectChart: function(picker, item, record, e) {
if (!this.editMode) return;
if (!this.editMode || !record) return;
var me = this,
info = me.api.asc_getCellInfo(),
type = info.asc_getFlags().asc_getSelectionType(),
@ -2369,8 +2369,10 @@ define([
shapePicker.on('item:click', function(picker, item, record, e) {
if (me.api) {
me._addAutoshape(true, record.get('data').shapeType);
me._isAddingShape = true;
if (record) {
me._addAutoshape(true, record.get('data').shapeType);
me._isAddingShape = true;
}
if (me.toolbar.btnInsertText.pressed) {
me.toolbar.btnInsertText.toggle(false, true);
@ -2411,9 +2413,10 @@ define([
this.toolbar.mnuTextArtPicker.on('item:click',
function(picker, item, record, e) {
me.toolbar.fireEvent('inserttextart', me.toolbar);
me.api.asc_addTextArt(record.get('data'));
if (record) {
me.toolbar.fireEvent('inserttextart', me.toolbar);
me.api.asc_addTextArt(record.get('data'));
}
if ( me.toolbar.btnInsertShape.pressed )
me.toolbar.btnInsertShape.toggle(false, true);
@ -2483,7 +2486,8 @@ define([
equationPicker.on('item:click', function(picker, item, record, e) {
if (me.api) {
me.api.asc_AddMath(record.get('data').equationType);
if (record)
me.api.asc_AddMath(record.get('data').equationType);
if (me.toolbar.btnInsertText.pressed) {
me.toolbar.btnInsertText.toggle(false, true);