Commit bd3fafbf authored by Anna.Pavlova's avatar Anna.Pavlova Committed by Alexander.Trofimov

Поправлен баг в предыдущей заливке : не открывался радикал со степенью

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56800 954022d7-b5bf-4e40-9824-e11837661b57
parent 701f9262
...@@ -947,12 +947,12 @@ CRadical.prototype.setProperties = function(props) ...@@ -947,12 +947,12 @@ CRadical.prototype.setProperties = function(props)
if(props.degHide === true || props.degHide === 1) if(props.degHide === true || props.degHide === 1)
{ {
this.Pr.degHide = true; this.Pr.degHide = true;
//this.Pr.type = SQUARE_RADICAL; this.Pr.type = SQUARE_RADICAL;
} }
else if(props.degHide == false || props.degHide === 0) else if(props.degHide == false || props.degHide === 0)
{ {
this.Pr.degHide = false; this.Pr.degHide = false;
//this.Pr.type = DEGREE_RADICAL; this.Pr.type = DEGREE_RADICAL;
} }
this.setCtrPrp(props.ctrPrp); this.setCtrPrp(props.ctrPrp);
...@@ -982,8 +982,8 @@ CRadical.prototype.fillMathComposition = function(props, contents /*array*/) ...@@ -982,8 +982,8 @@ CRadical.prototype.fillMathComposition = function(props, contents /*array*/)
this.Iterator = contents[0]; this.Iterator = contents[0];
this.Base = contents[1]; this.Base = contents[1];
if(this.Iterator != null && props.degHide == false) //if(this.Iterator != null && props.degHide == false)
this.Iterator.setArgSize(-2);
/*if(this.Pr.type == SQUARE_RADICAL) /*if(this.Pr.type == SQUARE_RADICAL)
this.elements[0][0] = contents[0]; this.elements[0][0] = contents[0];
...@@ -1023,7 +1023,6 @@ CRadical.prototype.Resize = function(Parent, ParaMath, oMeasure) ...@@ -1023,7 +1023,6 @@ CRadical.prototype.Resize = function(Parent, ParaMath, oMeasure)
{ {
if(this.Pr.degHide == true) if(this.Pr.degHide == true)
{ {
this.Pr.type = SQUARE_RADICAL;
this.setDimension(1, 1); this.setDimension(1, 1);
if(this.Iterator !== null) if(this.Iterator !== null)
...@@ -1047,9 +1046,12 @@ CRadical.prototype.Resize = function(Parent, ParaMath, oMeasure) ...@@ -1047,9 +1046,12 @@ CRadical.prototype.Resize = function(Parent, ParaMath, oMeasure)
} }
else else
{ {
this.Pr.type == DEGREE_RADICAL; this.setDimension(1, 2);
this.elements[0][0] = this.Iterator; this.elements[0][0] = this.Iterator;
this.elements[0][1] = this.Base; this.elements[0][1] = this.Base;
this.Iterator.setArgSize(-2);
this.RealBase = this.Base; this.RealBase = this.Base;
} }
......
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