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

Fix chart adding to document and presentaion editors

Browse source
This commit is contained in:
Julia Radzhabova 2018-07-20 15:07:14 +03:00
parent f12c6f5c48
commit 68f097c5b2
2 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1691,7 +1691,7 @@ define([
onApiSheetChanged: function() {
if (!this.toolbar.mode || !this.toolbar.mode.isEdit) return;
if (!this.toolbar.mode || !this.toolbar.mode.isEdit || this.toolbar.mode.isEditDiagram || this.toolbar.mode.isEditMailMerge) return;
var currentSheet = this.api.asc_getActiveWorksheetIndex(),
props = this.api.asc_getPageOptions(currentSheet),

29
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -1538,17 +1538,19 @@ define([
});
if ( mode.isEdit ) {
var top = Common.localStorage.getItem("sse-pgmargins-top"),
left = Common.localStorage.getItem("sse-pgmargins-left"),
bottom = Common.localStorage.getItem("sse-pgmargins-bottom"),
right = Common.localStorage.getItem("sse-pgmargins-right");
if ( top!==null && left!==null && bottom!==null && right!==null ) {
var mnu = this.btnPageMargins.menu.items[0];
mnu.options.value = mnu.value = [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)];
mnu.setVisible(true);
$(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options}));
} else
this.btnPageMargins.menu.items[0].setVisible(false);
if (!mode.isEditDiagram && !mode.isEditMailMerge) {
var top = Common.localStorage.getItem("sse-pgmargins-top"),
left = Common.localStorage.getItem("sse-pgmargins-left"),
bottom = Common.localStorage.getItem("sse-pgmargins-bottom"),
right = Common.localStorage.getItem("sse-pgmargins-right");
if ( top!==null && left!==null && bottom!==null && right!==null ) {
var mnu = this.btnPageMargins.menu.items[0];
mnu.options.value = mnu.value = [parseFloat(top), parseFloat(left), parseFloat(bottom), parseFloat(right)];
mnu.setVisible(true);
$(mnu.el).html(mnu.template({id: Common.UI.getId(), caption : mnu.caption, options : mnu.options}));
} else
this.btnPageMargins.menu.items[0].setVisible(false);
}
me.setTab('home');
}
@ -1911,7 +1913,8 @@ define([
});
}
this.updateMetricUnit();
if (!this.mode.isEditMailMerge && !this.mode.isEditDiagram)
this.updateMetricUnit();
},
onToolbarAfterRender: function(toolbar) {
@ -2131,6 +2134,8 @@ define([
},
onAppReady: function (config) {
if (!this.mode.isEdit || this.mode.isEditMailMerge || this.mode.isEditDiagram) return;
var me = this;
var _holder_view = SSE.getController('DocumentHolder').getView('DocumentHolder');
me.btnImgForward.updateHint(me.tipSendForward);