Commit 746b16a9 authored by Ilya.Kirillov's avatar Ilya.Kirillov Committed by Alexander.Trofimov

Доработка выделения формул.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52495 954022d7-b5bf-4e40-9824-e11837661b57
parent fafd9f34
...@@ -7292,8 +7292,6 @@ CDocument.prototype = ...@@ -7292,8 +7292,6 @@ CDocument.prototype =
Item.Selection.EndPos = Item.Content.length - 1; Item.Selection.EndPos = Item.Content.length - 1;
else else
Item.Selection.StartPos = Item.Content.length - 1; Item.Selection.StartPos = Item.Content.length - 1;
Item.Selection_Internal_Update();
} }
else //if ( type_Table === ItemType ) else //if ( type_Table === ItemType )
{ {
...@@ -7319,8 +7317,6 @@ CDocument.prototype = ...@@ -7319,8 +7317,6 @@ CDocument.prototype =
Item.Selection.StartPos = Item.Internal_GetStartPos(); Item.Selection.StartPos = Item.Internal_GetStartPos();
else else
Item.Selection.EndPos = Item.Internal_GetStartPos(); Item.Selection.EndPos = Item.Internal_GetStartPos();
Item.Selection_Internal_Update();
} }
else //if ( type_Table === ItemType ) else //if ( type_Table === ItemType )
{ {
...@@ -7350,8 +7346,6 @@ CDocument.prototype = ...@@ -7350,8 +7346,6 @@ CDocument.prototype =
Item.Selection.EndPos = Item.Internal_GetStartPos(); Item.Selection.EndPos = Item.Internal_GetStartPos();
Item.Selection.StartPos = Item.Content.length - 1; Item.Selection.StartPos = Item.Content.length - 1;
} }
Item.Selection_Internal_Update();
} }
else //if ( type_Table === ItemType ) else //if ( type_Table === ItemType )
{ {
...@@ -7376,6 +7370,9 @@ CDocument.prototype = ...@@ -7376,6 +7370,9 @@ CDocument.prototype =
break; break;
} }
if ( ItemType === type_Paragraph && Index === this.Selection.StartPos && Direction != 0 )
Item.Selection_Internal_Update();
} }
this.Content[ContentPos].Selection_SetEnd( X, Y, this.CurPage, MouseEvent ); this.Content[ContentPos].Selection_SetEnd( X, Y, this.CurPage, MouseEvent );
......
...@@ -8488,7 +8488,15 @@ Paragraph.prototype = ...@@ -8488,7 +8488,15 @@ Paragraph.prototype =
Selection_Internal_Update : function() Selection_Internal_Update : function()
{ {
var SelectDirection = this.Parent.Selection_Is_OneElement();
var StartPos = this.Selection.StartPos2;
if ( 0 !== SelectDirection && undefined !== this.Content[StartPos] && para_Math === this.Content[StartPos].Type )
{
if ( SelectDirection > 0 )
this.Content[StartPos].Selection_Ending(false);
else
this.Content[StartPos].Selection_Beginning(false);
}
}, },
Selection_Stop : function(X,Y,PageNum, MouseEvent) Selection_Stop : function(X,Y,PageNum, MouseEvent)
......
...@@ -7569,13 +7569,13 @@ ParaMath.prototype = ...@@ -7569,13 +7569,13 @@ ParaMath.prototype =
Selection_Beginning : function(bStart) Selection_Beginning : function(bStart)
{ {
this.Math.Selection_Beginning(bStart); this.Math.Selection_Beginning(bStart);
console.log( "Selection Beginning" ); console.log( "Selection Beginning(" + bStart +")" );
}, },
Selection_Ending : function(bStart) Selection_Ending : function(bStart)
{ {
this.Math.Selection_Ending(bStart); this.Math.Selection_Ending(bStart);
console.log( "Selection Ending" ); console.log( "Selection Ending(" + bStart +")" );
}, },
Selection_Draw : function() Selection_Draw : function()
......
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