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

[PE][SSE] Use sdk events to display equation bar

Browse source
This commit is contained in:
Julia Radzhabova 2022-11-02 00:27:17 +03:00
parent 98684a0c8b
commit a50f6d8674
2 changed files with 95 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
apps/presentationeditor/main/app/controller/DocumentHolder.js
View file

@ -221,6 +221,8 @@ define([
me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Video, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Video));
me.api.asc_registerPlaceholderCallback(AscCommon.PlaceholderButtonType.Audio, _.bind(me.onClickPlaceholder, me, AscCommon.PlaceholderButtonType.Audio));
me.api.asc_registerCallback('asc_onTrackGuide', _.bind(me.onTrackGuide, me));
me.api.asc_registerCallback('asc_onShowMathTrack', _.bind(me.onShowMathTrack, me));
me.api.asc_registerCallback('asc_onHideMathTrack', _.bind(me.onHideMathTrack, me));
}
me.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(me.onCoAuthoringDisconnect, me));
Common.NotificationCenter.on('api:disconnect', _.bind(me.onCoAuthoringDisconnect, me));
@ -628,22 +630,28 @@ define([
}
}
}
var i = -1,
in_equation = false,
locked = false;
while (++i < selectedElements.length) {
var type = selectedElements[i].get_ObjectType();
if (type === Asc.c_oAscTypeSelectElement.Math) {
in_equation = true;
} else if (type === Asc.c_oAscTypeSelectElement.Slide) {
var value = selectedElements[i].get_ObjectValue();
value && (locked = locked || value.get_LockDelete());
} else if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
var value = selectedElements[i].get_ObjectValue();
value && (locked = locked || value.get_Locked());
if (this.mode && this.mode.isEdit) {
var i = -1,
in_equation = false,
locked = false;
while (++i < selectedElements.length) {
var type = selectedElements[i].get_ObjectType();
if (type === Asc.c_oAscTypeSelectElement.Math) {
in_equation = true;
} else if (type === Asc.c_oAscTypeSelectElement.Slide) {
var value = selectedElements[i].get_ObjectValue();
value && (locked = locked || value.get_LockDelete());
} else if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
var value = selectedElements[i].get_ObjectValue();
value && (locked = locked || value.get_Locked());
}
}
if (in_equation) {
this._state.equationLocked = locked;
this.disableEquationBar();
}
}
in_equation && me.mode.isEdit && !me._isDisabled ? this.onEquationPanelShow(locked) : this.onEquationPanelHide();
},
handleDocumentWheel: function(event){
@ -2239,7 +2247,11 @@ define([
}
},
onEquationPanelShow: function(disabled) {
onShowMathTrack: function(bounds) {
if (bounds[3] < 0) {
this.onHideMathTrack();
return;
}
var me = this,
documentHolder = me.documentHolder,
eqContainer = documentHolder.cmpEl.find('#equation-container');
@ -2294,7 +2306,7 @@ define([
menu : new Common.UI.Menu({
cls: 'menu-shapes',
value: i,
// restoreHeight: equationGroup.get('groupHeight') ? parseInt(equationGroup.get('groupHeight')) : true,
restoreHeight: equationGroup.get('groupHeight') ? parseInt(equationGroup.get('groupHeight')) : true,
items: [
{ template: _.template('<div id="id-document-holder-btn-equation-menu-' + i +
'" class="menu-shape" style="width:' + (equationGroup.get('groupWidth') + 8) + 'px; ' +
@ -2325,8 +2337,12 @@ define([
});
}
var showPoint = [(me._Width - eqContainer.outerWidth())/2, 0];
eqContainer.css({left: showPoint[0], top : showPoint[1]});
var showPoint = [(bounds[0] + bounds[2])/2 - eqContainer.outerWidth()/2, bounds[1] - eqContainer.outerHeight() - 10];
if (showPoint[1]<0) {
showPoint[1] = bounds[3] + 10;
}
eqContainer.css({left: showPoint[0], top : Math.min(me._Height - eqContainer.outerHeight(), Math.max(0, showPoint[1]))});
// menu.menuAlign = validation ? 'tr-br' : 'tl-bl';
if (eqContainer.is(':visible')) {
if (me.equationSettingsBtn.menu.isVisible()) {
me.equationSettingsBtn.menu.options.initMenu();
@ -2335,19 +2351,28 @@ define([
} else {
eqContainer.show();
}
me.equationBtns.forEach(function(item){
item && item.setDisabled(!!disabled);
});
me.equationSettingsBtn.setDisabled(!!disabled);
me.disableEquationBar();
},
onEquationPanelHide: function() {
onHideMathTrack: function() {
var eqContainer = this.documentHolder.cmpEl.find('#equation-container');
if (eqContainer.is(':visible')) {
eqContainer.hide();
}
},
disableEquationBar: function() {
var eqContainer = this.documentHolder.cmpEl.find('#equation-container'),
disabled = this._isDisabled || this._state.equationLocked;
if (eqContainer.length>0 && eqContainer.is(':visible')) {
this.equationBtns.forEach(function(item){
item && item.setDisabled(!!disabled);
});
this.equationSettingsBtn.setDisabled(!!disabled);
}
},
convertEquation: function(menu, item, e) {
if (this.api) {
if (item.options.type=='input')
@ -2360,6 +2385,7 @@ define([
SetDisabled: function(state) {
this._isDisabled = state;
this.documentHolder.SetDisabled(state);
this.disableEquationBar();
},
editComplete: function() {

66
apps/spreadsheeteditor/main/app/controller/DocumentHolder.js
View file

@ -384,6 +384,8 @@ define([
this.api.asc_registerCallback('asc_onUpdateExternalReference', _.bind(this.onUpdateExternalReference, this));
Common.Gateway.on('setreferencedata', _.bind(this.setReferenceData, this));
}
this.api.asc_registerCallback('asc_onShowMathTrack', _.bind(this.onShowMathTrack, this));
this.api.asc_registerCallback('asc_onHideMathTrack', _.bind(this.onHideMathTrack, this));
}
this.api.asc_registerCallback('asc_onShowForeignCursorLabel', _.bind(this.onShowForeignCursorLabel, this));
this.api.asc_registerCallback('asc_onHideForeignCursorLabel', _.bind(this.onHideForeignCursorLabel, this));
@ -1989,20 +1991,25 @@ define([
if (!this.mouse.isLeftButtonDown) return;
var selectedObjects = this.api.asc_getGraphicObjectProps(),
i = -1,
in_equation = false,
locked = false;
while (++i < selectedObjects.length) {
var type = selectedObjects[i].asc_getObjectType();
if (type === Asc.c_oAscTypeSelectElement.Math) {
in_equation = true;
} else if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
var value = selectedObjects[i].asc_getObjectValue();
value && (locked = locked || value.asc_getLocked());
if (this.permissions && this.permissions.isEdit) {
var selectedObjects = this.api.asc_getGraphicObjectProps(),
i = -1,
in_equation = false,
locked = false;
while (++i < selectedObjects.length) {
var type = selectedObjects[i].asc_getObjectType();
if (type === Asc.c_oAscTypeSelectElement.Math) {
in_equation = true;
} else if (type === Asc.c_oAscTypeSelectElement.Paragraph) {
var value = selectedObjects[i].asc_getObjectValue();
value && (locked = locked || value.asc_getLocked());
}
}
if (in_equation) {
this._state.equationLocked = locked;
this.disableEquationBar();
}
}
in_equation && this.permissions.isEdit && !this._isDisabled ? this.onEquationPanelShow(locked) : this.onEquationPanelHide();
},
fillMenuProps: function(cellinfo, showMenu, event){
@ -2448,6 +2455,7 @@ define([
documentHolder.menuParagraphVAlign.setVisible(false); // убрать после того, как заголовок можно будет растягивать по вертикали!!
documentHolder.menuParagraphDirection.setVisible(false); // убрать после того, как заголовок можно будет растягивать по вертикали!!
documentHolder.pmiTextAdvanced.setVisible(false);
documentHolder.menuParagraphEquation.setVisible(false);
documentHolder.textInShapeMenu.items[9].setVisible(false);
documentHolder.menuParagraphBullets.setVisible(false);
documentHolder.textInShapeMenu.items[3].setVisible(false);
@ -4303,7 +4311,11 @@ define([
}
},
onEquationPanelShow: function(disabled) {
onShowMathTrack: function(bounds) {
if (bounds[3] < 0) {
this.onHideMathTrack();
return;
}
var me = this,
documentHolder = me.documentHolder,
eqContainer = documentHolder.cmpEl.find('#equation-container');
@ -4392,8 +4404,12 @@ define([
if (!me.tooltips.coauth.XY)
me.onDocumentResize();
var showPoint = [(me.tooltips.coauth.apiWidth - eqContainer.outerWidth())/2, 0];
eqContainer.css({left: showPoint[0], top : showPoint[1]});
var showPoint = [(bounds[0] + bounds[2])/2 - eqContainer.outerWidth()/2, bounds[1] - eqContainer.outerHeight() - 10];
if (showPoint[1]<0) {
showPoint[1] = bounds[3] + 10;
}
eqContainer.css({left: showPoint[0], top : Math.min(me.tooltips.coauth.apiHeight - eqContainer.outerHeight(), Math.max(0, showPoint[1]))});
// menu.menuAlign = validation ? 'tr-br' : 'tl-bl';
if (eqContainer.is(':visible')) {
if (me.equationSettingsBtn.menu.isVisible()) {
me.equationSettingsBtn.menu.options.initMenu();
@ -4402,19 +4418,28 @@ define([
} else {
eqContainer.show();
}
me.equationBtns.forEach(function(item){
item && item.setDisabled(!!disabled);
});
me.equationSettingsBtn.setDisabled(!!disabled);
me.disableEquationBar();
},
onEquationPanelHide: function() {
onHideMathTrack: function() {
var eqContainer = this.documentHolder.cmpEl.find('#equation-container');
if (eqContainer.is(':visible')) {
eqContainer.hide();
}
},
disableEquationBar: function() {
var eqContainer = this.documentHolder.cmpEl.find('#equation-container'),
disabled = this._isDisabled || this._state.equationLocked;
if (eqContainer.length>0 && eqContainer.is(':visible')) {
this.equationBtns.forEach(function(item){
item && item.setDisabled(!!disabled);
});
this.equationSettingsBtn.setDisabled(!!disabled);
}
},
convertEquation: function(menu, item, e) {
if (this.api) {
if (item.options.type=='input')
@ -4447,6 +4472,7 @@ define([
SetDisabled: function(state, canProtect) {
this._isDisabled = state;
this._canProtect = canProtect;
this.disableEquationBar();
},
guestText : 'Guest',