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

[PE] Fix bug for adding table/chart for several placeholders

Browse source
This commit is contained in:
Julia Radzhabova 2019-11-28 11:25:32 +03:00
parent 025f4022eb
commit 2c78122099
1 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/presentationeditor/main/app/view/DocumentHolder.js
View file

@ -3445,6 +3445,8 @@ define([
onClickPlaceholderChart: function(obj, x, y) { onClickPlaceholderChart: function(obj, x, y) {
if (!this.api) return; if (!this.api) return;
this._state.placeholderObj = obj;
var menu = this.placeholderMenuChart, var menu = this.placeholderMenuChart,
menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
me = this; me = this;
@ -3478,7 +3480,7 @@ define([
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>') itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
}); });
picker.on('item:click', function (picker, item, record, e) { picker.on('item:click', function (picker, item, record, e) {
me.editChartClick(record.get('type'), obj); me.editChartClick(record.get('type'), me._state.placeholderObj);
}); });
} }
menuContainer.css({left: x, top : y}); menuContainer.css({left: x, top : y});
@ -3495,6 +3497,8 @@ define([
onClickPlaceholderTable: function(obj, x, y) { onClickPlaceholderTable: function(obj, x, y) {
if (!this.api) return; if (!this.api) return;
this._state.placeholderObj = obj;
var menu = this.placeholderMenuTable, var menu = this.placeholderMenuTable,
menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null, menuContainer = menu ? this.cmpEl.find(Common.Utils.String.format('#menu-container-{0}', menu.id)) : null,
me = this; me = this;
@ -3526,7 +3530,7 @@ define([
maxColumns: 10 maxColumns: 10
}); });
picker.on('select', function(picker, columns, rows){ picker.on('select', function(picker, columns, rows){
me.api.put_Table(columns, rows, obj); me.api.put_Table(columns, rows, me._state.placeholderObj);
me.fireEvent('editcomplete', me); me.fireEvent('editcomplete', me);
}); });
menu.on('item:click', function(menu, item, e){ menu.on('item:click', function(menu, item, e){
@ -3534,7 +3538,7 @@ define([
(new Common.Views.InsertTableDialog({ (new Common.Views.InsertTableDialog({
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') if (result == 'ok')
me.api.put_Table(value.columns, value.rows, obj); me.api.put_Table(value.columns, value.rows, me._state.placeholderObj);
me.fireEvent('editcomplete', me); me.fireEvent('editcomplete', me);
} }
})).show(); })).show();
@ -3555,6 +3559,7 @@ define([
onHidePlaceholderActions: function() { onHidePlaceholderActions: function() {
this.placeholderMenuChart && this.placeholderMenuChart.hide(); this.placeholderMenuChart && this.placeholderMenuChart.hide();
this.placeholderMenuTable && this.placeholderMenuTable.hide();
}, },
onClickPlaceholder: function(type, obj, x, y) { onClickPlaceholder: function(type, obj, x, y) {