Skip to content

S
sdkjs
Commit eee6f8ca authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov
Browse files
Options

горячая клавиша для евро по аналогии с редактором документов 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@52597 954022d7-b5bf-4e40-9824-e11837661b57
parent 880129bf
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 125 deletions
PowerPoint/Editor/Format/Presentation.js
View file @ eee6f8ca
...@@ -3120,10 +3120,7 @@ CPresentation.prototype = ...@@ -3120,10 +3120,7 @@ CPresentation.prototype =
case STATES_ID_TEXT_ADD: case STATES_ID_TEXT_ADD:
case STATES_ID_TEXT_ADD_IN_GROUP: case STATES_ID_TEXT_ADD_IN_GROUP:
{ {
if(this.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) this.Paragraph_Add(new ParaTab());
{
this.Paragraph_Add(new ParaTab());
}
break; break;
} }
} }
...@@ -3143,22 +3140,17 @@ CPresentation.prototype = ...@@ -3143,22 +3140,17 @@ CPresentation.prototype =
} }
else else
{ {
var CheckType = ( e.ShiftKey || e.CtrlKey ? changestype_Paragraph_Content : changestype_Document_Content_Add ); if ( e.ShiftKey )
if ( false === this.Document_Is_SelectionLocked(CheckType) )
{ {
this.Create_NewHistoryPoint(); this.Paragraph_Add( new ParaNewLine( break_Line ) );
if ( e.ShiftKey ) }
{ else if ( e.CtrlKey )
this.Paragraph_Add( new ParaNewLine( break_Line ) ); {
} this.Paragraph_Add( new ParaNewLine( break_Page ) );
else if ( e.CtrlKey ) }
{ else
this.Paragraph_Add( new ParaNewLine( break_Page ) ); {
} this.Add_NewParagraph();
else
{
this.Add_NewParagraph();
}
} }
} }
...@@ -3182,27 +3174,23 @@ CPresentation.prototype = ...@@ -3182,27 +3174,23 @@ CPresentation.prototype =
} }
else if ( e.KeyCode == 32 && false === editor.isViewMode ) // Space else if ( e.KeyCode == 32 && false === editor.isViewMode ) // Space
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) if ( true === e.ShiftKey && true === e.CtrlKey )
{ {
this.Create_NewHistoryPoint(); this.DrawingDocument.TargetStart();
if ( true === e.ShiftKey && true === e.CtrlKey ) this.DrawingDocument.TargetShow();
{
this.DrawingDocument.TargetStart();
this.DrawingDocument.TargetShow();
this.Paragraph_Add( new ParaText( String.fromCharCode( 0x00A0 ) ) ); this.Paragraph_Add( new ParaText( String.fromCharCode( 0x00A0 ) ) );
} }
else if ( true === e.CtrlKey ) else if ( true === e.CtrlKey )
{ {
this.Paragraph_ClearFormatting(); this.Paragraph_ClearFormatting();
} }
else else
{ {
this.DrawingDocument.TargetStart(); this.DrawingDocument.TargetStart();
this.DrawingDocument.TargetShow(); this.DrawingDocument.TargetShow();
this.Paragraph_Add( new ParaSpace( 1 ) ); this.Paragraph_Add( new ParaSpace( 1 ) );
}
} }
bRetValue = true; bRetValue = true;
...@@ -3560,12 +3548,8 @@ CPresentation.prototype = ...@@ -3560,12 +3548,8 @@ CPresentation.prototype =
var TextPr = this.Get_Paragraph_TextPr(); var TextPr = this.Get_Paragraph_TextPr();
if ( null != TextPr ) if ( null != TextPr )
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) this.Paragraph_Add( new ParaTextPr( { Bold : TextPr.Bold === true ? false : true } ) );
{ this.Document_UpdateInterfaceState();
this.Create_NewHistoryPoint();
this.Paragraph_Add( new ParaTextPr( { Bold : TextPr.Bold === true ? false : true } ) );
this.Document_UpdateInterfaceState();
}
bRetValue = true; bRetValue = true;
} }
} }
...@@ -3584,15 +3568,21 @@ CPresentation.prototype = ...@@ -3584,15 +3568,21 @@ CPresentation.prototype =
} }
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 - переключение прилегания параграфа между center и left
{ {
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 )
{ {
this.Create_NewHistoryPoint(); this.Create_NewHistoryPoint();
this.Set_ParagraphAlign( ParaPr.Jc === align_Center ? align_Left : align_Center ); this.Set_ParagraphAlign( ParaPr.Jc === align_Center ? align_Left : align_Center );
this.Document_UpdateInterfaceState(); this.Document_UpdateInterfaceState();
bRetValue = true;
} }
}
else // Ctrl + Alt + E - добавляем знак евро €
{
this.Paragraph_Add( new ParaText( "€" ) );
bRetValue = true; bRetValue = true;
} }
} }
...@@ -3601,12 +3591,7 @@ CPresentation.prototype = ...@@ -3601,12 +3591,7 @@ CPresentation.prototype =
var TextPr = this.Get_Paragraph_TextPr(); var TextPr = this.Get_Paragraph_TextPr();
if ( null != TextPr ) if ( null != TextPr )
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) this.Paragraph_Add( new ParaTextPr( { Italic : TextPr.Italic === true ? false : true } ) );
{
this.Create_NewHistoryPoint();
this.Paragraph_Add( new ParaTextPr( { Italic : TextPr.Italic === true ? false : true } ) );
this.Document_UpdateInterfaceState();
}
bRetValue = true; bRetValue = true;
} }
} }
...@@ -3635,7 +3620,7 @@ CPresentation.prototype = ...@@ -3635,7 +3620,7 @@ CPresentation.prototype =
{ {
if ( true === e.ShiftKey ) // Ctrl + Shift + L - добавляем список к данному параграфу if ( true === e.ShiftKey ) // Ctrl + Shift + L - добавляем список к данному параграфу
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) if ( false === this.Document_Is_SelectionLocked(changestype_Drawing_Props) )
{ {
this.Create_NewHistoryPoint(); this.Create_NewHistoryPoint();
this.Set_ParagraphNumbering( { Type : 0, SubType : 1 } ); this.Set_ParagraphNumbering( { Type : 0, SubType : 1 } );
...@@ -3669,11 +3654,7 @@ CPresentation.prototype = ...@@ -3669,11 +3654,7 @@ CPresentation.prototype =
{ {
if ( true === e.ShiftKey && false === editor.isViewMode ) // Ctrl + Shift + P - добавляем номер страницы в текущую позицию if ( true === e.ShiftKey && false === editor.isViewMode ) // Ctrl + Shift + P - добавляем номер страницы в текущую позицию
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) this.Paragraph_Add( new ParaPageNum() );
{
this.Create_NewHistoryPoint();
this.Paragraph_Add( new ParaPageNum() );
}
bRetValue = true; bRetValue = true;
} }
else // Ctrl + P - print else // Ctrl + P - print
...@@ -3706,12 +3687,7 @@ CPresentation.prototype = ...@@ -3706,12 +3687,7 @@ CPresentation.prototype =
var TextPr = this.Get_Paragraph_TextPr(); var TextPr = this.Get_Paragraph_TextPr();
if ( null != TextPr ) if ( null != TextPr )
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) this.Paragraph_Add( new ParaTextPr( { Underline : TextPr.Underline === true ? false : true } ) );
{
this.Create_NewHistoryPoint();
this.Paragraph_Add( new ParaTextPr( { Underline : TextPr.Underline === true ? false : true } ) );
this.Document_UpdateInterfaceState();
}
bRetValue = true; bRetValue = true;
} }
} }
...@@ -3760,7 +3736,7 @@ CPresentation.prototype = ...@@ -3760,7 +3736,7 @@ CPresentation.prototype =
} }
else if ( e.KeyCode == 88 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + X - cut else if ( e.KeyCode == 88 && false === editor.isViewMode && true === e.CtrlKey ) // Ctrl + X - cut
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) if ( false === this.Document_Is_SelectionLocked(changestype_Drawing_Props) )
{ {
this.Create_NewHistoryPoint(); this.Create_NewHistoryPoint();
Editor_Copy(this.DrawingDocument.m_oWordControl.m_oApi, true); Editor_Copy(this.DrawingDocument.m_oWordControl.m_oApi, true);
...@@ -3862,15 +3838,10 @@ CPresentation.prototype = ...@@ -3862,15 +3838,10 @@ CPresentation.prototype =
var TextPr = this.Get_Paragraph_TextPr(); var TextPr = this.Get_Paragraph_TextPr();
if ( null != TextPr ) if ( null != TextPr )
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) if ( true === e.ShiftKey )
{ this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SuperScript ? vertalign_Baseline : vertalign_SuperScript } ) );
this.Create_NewHistoryPoint(); else
if ( true === e.ShiftKey ) this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SubScript ? vertalign_Baseline : vertalign_SubScript } ) );
this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SuperScript ? vertalign_Baseline : vertalign_SuperScript } ) );
else
this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SubScript ? vertalign_Baseline : vertalign_SubScript } ) );
this.Document_UpdateInterfaceState();
}
bRetValue = true; bRetValue = true;
} }
} }
...@@ -3879,37 +3850,27 @@ CPresentation.prototype = ...@@ -3879,37 +3850,27 @@ CPresentation.prototype =
var TextPr = this.Get_Paragraph_TextPr(); var TextPr = this.Get_Paragraph_TextPr();
if ( null != TextPr ) if ( null != TextPr )
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SuperScript ? vertalign_Baseline : vertalign_SuperScript } ) );
{
this.Create_NewHistoryPoint();
this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SuperScript ? vertalign_Baseline : vertalign_SuperScript } ) );
this.Document_UpdateInterfaceState();
}
bRetValue = true; bRetValue = true;
} }
} }
else if ( e.KeyCode == 189 && false === editor.isViewMode ) // Клавиша Num- else if ( e.KeyCode == 189 && false === editor.isViewMode ) // Клавиша Num-
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) this.DrawingDocument.TargetStart();
{ this.DrawingDocument.TargetShow();
this.Create_NewHistoryPoint();
this.DrawingDocument.TargetStart();
this.DrawingDocument.TargetShow();
var Item = null; var Item = null;
if ( true === e.CtrlKey && true === e.ShiftKey ) if ( true === e.CtrlKey && true === e.ShiftKey )
{ {
Item = new ParaText( String.fromCharCode( 0x2013 ) ); Item = new ParaText( String.fromCharCode( 0x2013 ) );
Item.SpaceAfter = false; Item.SpaceAfter = false;
}
else if ( true === e.ShiftKey )
Item = new ParaText( "_" );
else
Item = new ParaText( "-" );
this.Paragraph_Add( Item );
} }
else if ( true === e.ShiftKey )
Item = new ParaText( "_" );
else
Item = new ParaText( "-" );
this.Paragraph_Add( Item );
bRetValue = true; bRetValue = true;
} }
else if ( e.KeyCode == 190 && true === e.CtrlKey ) // Ctrl + . else if ( e.KeyCode == 190 && true === e.CtrlKey ) // Ctrl + .
...@@ -3917,12 +3878,8 @@ CPresentation.prototype = ...@@ -3917,12 +3878,8 @@ CPresentation.prototype =
var TextPr = this.Get_Paragraph_TextPr(); var TextPr = this.Get_Paragraph_TextPr();
if ( null != TextPr ) if ( null != TextPr )
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SubScript ? vertalign_Baseline : vertalign_SubScript } ) );
{ this.Document_UpdateInterfaceState();
this.Create_NewHistoryPoint();
this.Paragraph_Add( new ParaTextPr( { VertAlign : TextPr.VertAlign === vertalign_SubScript ? vertalign_Baseline : vertalign_SubScript } ) );
this.Document_UpdateInterfaceState();
}
bRetValue = true; bRetValue = true;
} }
} }
...@@ -3977,7 +3934,7 @@ CPresentation.prototype = ...@@ -3977,7 +3934,7 @@ CPresentation.prototype =
} }
else*/ if ( Code > 0x20 ) else*/ if ( Code > 0x20 )
{ {
//if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) //if ( false === this.Document_Is_SelectionLocked(changestype_Drawing_Props) )
{ {
//this.Create_NewHistoryPoint(); //this.Create_NewHistoryPoint();
...@@ -7117,28 +7074,22 @@ CPresentation.prototype = ...@@ -7117,28 +7074,22 @@ CPresentation.prototype =
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
TextBox_Put : function(sText) TextBox_Put : function(sText)
{ {
if ( false === this.Document_Is_SelectionLocked(changestype_Paragraph_Content) ) // Отключаем пересчет, включим перед последним добавлением. Поскольку,
{ // у нас все добавляется в 1 параграф, так можно делать.
this.Create_NewHistoryPoint(); this.TurnOffRecalc = true;
// Отключаем пересчет, включим перед последним добавлением. Поскольку,
// у нас все добавляется в 1 параграф, так можно делать.
this.TurnOffRecalc = true;
var Count = sText.length;
for ( var Index = 0; Index < Count; Index++ )
{
if ( Index === Count - 1 )
this.TurnOffRecalc = false;
var _char = sText.charAt(Index); var Count = sText.length;
if (" " == _char) for ( var Index = 0; Index < Count; Index++ )
this.Paragraph_Add( new ParaSpace(1) ); {
else if ( Index === Count - 1 )
this.Paragraph_Add( new ParaText(_char) ); this.TurnOffRecalc = false;
}
// На случай, если Count = 0 var _char = sText.charAt(Index);
if (" " == _char)
this.Paragraph_Add( new ParaSpace(1) );
else
this.Paragraph_Add( new ParaText(_char) );
// На случай, если Count = 0
this.TurnOffRecalc = false; this.TurnOffRecalc = false;
} }
}, },
......
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