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

Селект для Remove на плейсхолдере

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@56391 954022d7-b5bf-4e40-9824-e11837661b57
parent 9cf77ba3
...@@ -1450,6 +1450,10 @@ CMathBase.prototype = ...@@ -1450,6 +1450,10 @@ CMathBase.prototype =
this.bSelectionUse = false; this.bSelectionUse = false;
}, },
IsCurrentPlh: function()
{
return this.elements[this.CurPos_X][this.CurPos_Y].IsCurrentPlh();
},
// Перемещение по стрелкам // Перемещение по стрелкам
...@@ -1707,8 +1711,8 @@ CMathBase.prototype = ...@@ -1707,8 +1711,8 @@ CMathBase.prototype =
}, },
SetSelectAll: function() SetSelectAll: function()
{ {
this.SelectStart_X = 0; this.SelectStart_X = -1;
this.SelectStart_Y = 0; this.SelectStart_Y = -1;
this.SelectEnd_X = this.nRow - 1; this.SelectEnd_X = this.nRow - 1;
this.SelectEnd_Y = this.nCol - 1; this.SelectEnd_Y = this.nCol - 1;
......
...@@ -5722,6 +5722,10 @@ CMathContent.prototype = ...@@ -5722,6 +5722,10 @@ CMathContent.prototype =
return flag; return flag;
}, },
IsCurrentPlh: function()
{
return this.IsPlaceholder();
},
IsJustDraw: function() IsJustDraw: function()
{ {
return false; return false;
...@@ -6660,10 +6664,19 @@ CMathContent.prototype = ...@@ -6660,10 +6664,19 @@ CMathContent.prototype =
this.content[this.CurPos + 1].SetSelectAll(); this.content[this.CurPos + 1].SetSelectAll();
} }
} }
else else if(this.content[this.CurPos].typeObj == MATH_COMP )
{ {
this.SelectStartPos = this.SelectEndPos = this.CurPos; if(this.content[this.CurPos].IsCurrentPlh())
this.content[this.CurPos].Set_Select_ToMComp(Direction); {
this.SelectStartPos = this.SelectEndPos = this.CurPos;
this.content[this.CurPos].SetSelectAll();
}
else
{
this.SelectStartPos = this.SelectEndPos = this.CurPos;
this.content[this.CurPos].Set_Select_ToMComp(Direction);
}
} }
}, },
getElem: function(nNum) getElem: function(nNum)
......
...@@ -22,7 +22,6 @@ function CMathMatrix(props) ...@@ -22,7 +22,6 @@ function CMathMatrix(props)
plcHide: false plcHide: false
}; };
this.spaceRow = this.spaceRow =
{ {
rule: 0, rule: 0,
...@@ -54,8 +53,6 @@ function CMathMatrix(props) ...@@ -54,8 +53,6 @@ function CMathMatrix(props)
CMathBase.call(this); CMathBase.call(this);
//CMathMatrix.init.call(this, props);
this.init(props); this.init(props);
this.setCtrPrp(props.ctrPrp); this.setCtrPrp(props.ctrPrp);
g_oTableId.Add( this, this.Id ); g_oTableId.Add( this, this.Id );
......
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