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

[SSE] Debug equations.

Browse source
This commit is contained in:
Julia Radzhabova 2016-10-24 16:40:06 +03:00
parent 381e886ef9
commit 65251b5250
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1243,12 +1243,11 @@ define([
eqlen = this.addEquationMenu(4);
} else
this.clearEquationMenu(4);
documentHolder.menuEquationSeparator.setVisible(isEquation && eqlen>0);
if (showMenu) this.showPopupMenu(documentHolder.textInShapeMenu, {}, event);
documentHolder.textInShapeMenu.items[3].setVisible( documentHolder.menuHyperlinkShape.isVisible() ||
documentHolder.menuAddHyperlinkShape.isVisible() ||
documentHolder.menuParagraphVAlign.isVisible());
documentHolder.menuParagraphVAlign.isVisible() || isEquation);
} else if (!this.permissions.isEditMailMerge && !this.permissions.isEditDiagram || (seltype !== Asc.c_oAscSelectionType.RangeImage && seltype !== Asc.c_oAscSelectionType.RangeShape &&
seltype !== Asc.c_oAscSelectionType.RangeChart && seltype !== Asc.c_oAscSelectionType.RangeChartText && seltype !== Asc.c_oAscSelectionType.RangeShapeText)) {
if (!showMenu && !documentHolder.ssMenu.isVisible()) return;
@ -1561,7 +1560,7 @@ define([
},
initEquationMenu: function() {
if (!me._currentMathObj) return;
if (!this._currentMathObj) return;
var me = this,
type = me._currentMathObj.get_Type(),
value = me._currentMathObj,

5
apps/spreadsheeteditor/main/app/view/DocumentHolder.js
View file

@ -558,17 +558,12 @@ define([
value : 'paste'
});
me.menuEquationSeparator = new Common.UI.MenuItem({
caption : '--'
});
this.textInShapeMenu = new Common.UI.Menu({
items: [
me.pmiTextCut,
me.pmiTextCopy,
me.pmiTextPaste,
{caption: '--'},
me.menuEquationSeparator,
me.menuParagraphVAlign,
me.menuParagraphDirection,
me.menuAddHyperlinkShape,

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/math.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
apps/spreadsheeteditor/main/resources/img/toolbar/math@2x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 95 KiB

5
apps/spreadsheeteditor/main/resources/less/toolbar.less
View file

@ -253,3 +253,8 @@
margin-bottom: -2px;
}
}
.item-equation {
border: 1px solid @gray;
.background-ximage('@{app-image-path}/toolbar/math.png', '@{app-image-path}/toolbar/math@2x.png', 1500px);
}