Commit b3c1ce91 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@52621 954022d7-b5bf-4e40-9824-e11837661b57
parent b9b01da5
...@@ -8412,16 +8412,31 @@ CDocument.prototype = ...@@ -8412,16 +8412,31 @@ CDocument.prototype =
//не возвращаем true чтобы не было preventDefault //не возвращаем true чтобы не было preventDefault
} }
} }
else if ( e.KeyCode == 69 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + E - переключение прилегания параграфа между center и left else if ( e.KeyCode == 69 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + E + ...
{ {
var ParaPr = this.Get_Paragraph_ParaPr(); if ( true !== e.AltKey ) // Ctrl + E - переключение прилегания параграфа между center и left
if ( null != ParaPr )
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Properties) ) var ParaPr = this.Get_Paragraph_ParaPr();
if ( null != ParaPr )
{
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Properties) )
{
this.Create_NewHistoryPoint();
this.Set_ParagraphAlign( ParaPr.Jc === align_Center ? align_Left : align_Center );
this.Document_UpdateInterfaceState();
}
bRetValue = true;
}
}
else // Ctrl + Alt + E - добавляем знак евро €
{
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) )
{ {
this.Create_NewHistoryPoint(); this.Create_NewHistoryPoint();
this.Set_ParagraphAlign( ParaPr.Jc === align_Center ? align_Left : align_Center );
this.Document_UpdateInterfaceState(); this.DrawingDocument.TargetStart();
this.DrawingDocument.TargetShow();
this.Paragraph_Add( new ParaText( "" ) );
} }
bRetValue = true; bRetValue = true;
} }
......
This diff is collapsed.
...@@ -7556,9 +7556,23 @@ ParaMath.prototype = ...@@ -7556,9 +7556,23 @@ ParaMath.prototype =
return true; return true;
}, },
Add : function(Item)
{
var Type = Item.Type;
if ( para_Text === Type )
this.Math.AddLetter( Item.Value.charCodeAt(0) );
else if ( para_Space === Type )
this.Math.AddLetter( 0x0020 );
},
Remove : function(Order, bOnAddText)
{
return this.Math.Remove(Order, bOnAddText);
},
RecalculateCurPos : function() RecalculateCurPos : function()
{ {
console.log("RecalculateCurPos");
this.Math.UpdateCursor(); this.Math.UpdateCursor();
}, },
...@@ -7592,6 +7606,11 @@ ParaMath.prototype = ...@@ -7592,6 +7606,11 @@ ParaMath.prototype =
return this.Math.Selection_IsEmpty(); return this.Math.Selection_IsEmpty();
}, },
Selection_IsUse : function()
{
return true;
},
Selection_Remove : function() Selection_Remove : function()
{ {
...@@ -7599,9 +7618,25 @@ ParaMath.prototype = ...@@ -7599,9 +7618,25 @@ ParaMath.prototype =
Selection_Check : function(X, Y, Page_Abs) Selection_Check : function(X, Y, Page_Abs)
{ {
var check = this.Math.Selection_Check(X, Y); return this.Math.Selection_Check(X, Y);
console.log("Selection_Check: "+ check); },
return check;
Cursor_MoveLeft : function(bShiftKey, bCtrlKey)
{
return this.Math.Cursor_MoveLeft(bShiftKey, bCtrlKey);
},
Cursor_MoveRight : function(bShiftKey, bCtrlKey)
{
return this.Math.Cursor_MoveRight(bShiftKey, bCtrlKey);
},
Cursor_MoveToStartPos : function()
{
},
Cursor_MoveToEndPos : function()
{
}, },
Copy : function() Copy : 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