Skip to content

S
sdkjs
Commit 12c0509c authored by Sergey.Tsarkov's avatar Sergey.Tsarkov Committed by Alexander.Trofimov
Browse files
Options

поправлено меню редактора формул 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52777 954022d7-b5bf-4e40-9824-e11837661b57
parent a4128fa6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 289 additions and 155 deletions
Word/Editor/Serialize2.js
View file @ 12c0509c
...@@ -8282,16 +8282,16 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow ...@@ -8282,16 +8282,16 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
var res = c_oSerConstants.ReadOk; var res = c_oSerConstants.ReadOk;
var oThis = this; var oThis = this;
if (c_oSer_OMathContentType.RadPr === type) if (c_oSer_OMathContentType.RadPr === type)
{ {
props.type = SQUARE_RADICAL;
res = this.bcr.Read1(length, function(t, l){ res = this.bcr.Read1(length, function(t, l){
return oThis.ReadMathRadPr(t,l,props,oRad); return oThis.ReadMathRadPr(t,l,props,oRad);
}); });
} }
else if (c_oSer_OMathContentType.Deg === type) else if (c_oSer_OMathContentType.Deg === type)
{ {
if (!props.init) if (!props.init)
{ {
props.type = DEGREE_RADICAL;
oRad.init(props); oRad.init(props);
oElem.addElementToContent(oRad); oElem.addElementToContent(oRad);
props.init = true; props.init = true;
...@@ -8305,6 +8305,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow ...@@ -8305,6 +8305,7 @@ function Binary_DocumentTableReader(doc, oReadResult, openParams, stream, bAllow
{ {
if (!props.init) if (!props.init)
{ {
props.type = SQUARE_RADICAL;
oRad.init(props); oRad.init(props);
oElem.addElementToContent(oRad); oElem.addElementToContent(oRad);
props.init = true; props.init = true;
......
Word/Math/nary.js
View file @ 12c0509c
...@@ -204,11 +204,13 @@ CNary.prototype.getBase = function() ...@@ -204,11 +204,13 @@ CNary.prototype.getBase = function()
} }
CNary.prototype.getUpperIterator = function() CNary.prototype.getUpperIterator = function()
{ {
return this.elements[0][0].getUpperIterator(); if (!this.supHide)
return this.elements[0][0].getUpperIterator();
} }
CNary.prototype.getLowerIterator = function() CNary.prototype.getLowerIterator = function()
{ {
return this.elements[0][0].getLowerIterator(); if (!this.subHide)
return this.elements[0][0].getLowerIterator();
} }
CNary.prototype.getPropsForWhite = function() CNary.prototype.getPropsForWhite = function()
{ {
......
Word/TextEditor.html
View file @ 12c0509c
...@@ -3057,6 +3057,37 @@ ...@@ -3057,6 +3057,37 @@
<div style="float: left; background-image: url(Math/img/degree.png); width: 80px; height: 104px; background-position: 160px 104px;" value="16"></div> <div style="float: left; background-image: url(Math/img/degree.png); width: 80px; height: 104px; background-position: 160px 104px;" value="16"></div>
<div style="float: left; background-image: url(Math/img/degree.png); width: 80px; height: 104px; background-position: 80px 104px;" value="17"></div> <div style="float: left; background-image: url(Math/img/degree.png); width: 80px; height: 104px; background-position: 80px 104px;" value="17"></div>
</div> </div>
<div class="radical mathContainer" style="display:none;width:480px;background-color:#fff;top: 80px; right: -4px;z-index:100;position:absolute;padding-top: 5px;border: 4px ridge silver;overflow-y:scroll;">
<div style="float: left; background-image: url(Math/img/radical.png); width: 80px; height: 104px; background-position: 320px 104px;" value="18"></div>
<div style="float: left; background-image: url(Math/img/radical.png); width: 80px; height: 104px; background-position: 240px 104px;" value="19"></div>
<div style="float: left; background-image: url(Math/img/radical.png); width: 80px; height: 104px; background-position: 160px 104px;" value="20"></div>
<div style="float: left; background-image: url(Math/img/radical.png); width: 80px; height: 104px; background-position: 80px 104px;" value="21"></div>
<div style="float: left; background-image: url(Math/img/radical_equat.png); width: 160px; height: 104px; background-position: 320px 104px;" value="22"></div>
<div style="float: left; background-image: url(Math/img/radical_equat.png); width: 160px; height: 104px; background-position: 160px 104px;" value="23"></div>
</div>
<div class="integral mathContainer" style="display:none;width:480px;background-color:#fff;top: 80px; right: -4px;z-index:100;position:absolute;padding-top: 5px;border: 4px ridge silver;overflow-y:scroll;">
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 240px 728px;" value="24"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 160px 728px;" value="25"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 80px 728px;" value="26"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 240px 624px;" value="27"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 160px 624px;" value="28"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 80px 624px;" value="29"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 240px 520px;" value="30"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 160px 520px;" value="31"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 80px 520px;" value="32"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 240px 416px;" value="33"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 160px 416px;" value="34"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 80px 416px;" value="35"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 240px 312px;" value="36"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 160px 312px;" value="37"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 80px 312px;" value="38"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 240px 208px;" value="39"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 160px 208px;" value="40"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 80px 208px;" value="41"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 240px 104px;" value="42"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 160px 104px;" value="43"></div>
<div style="float: left; background-image: url(Math/img/integral.png); width: 80px; height: 104px; background-position: 80px 104px;" value="44"></div>
</div>
</div> </div>
......
Word/api.js
View file @ 12c0509c
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7