Commit aed52fce authored by Sergey Luzyanin's avatar Sergey Luzyanin

fix Bug 32524 - Набор текста c клавиатуры в пустое место рабочей области...

fix Bug 32524 - Набор текста c клавиатуры в пустое место рабочей области считается изменением документа
parent 1196c4a4
...@@ -1515,7 +1515,7 @@ CPresentation.prototype = ...@@ -1515,7 +1515,7 @@ CPresentation.prototype =
if ( "undefined" === typeof(bRemoveOnlySelection) ) if ( "undefined" === typeof(bRemoveOnlySelection) )
bRemoveOnlySelection = false; bRemoveOnlySelection = false;
if(this.Slides[this.CurPage]) if(this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects && this.Slides[this.CurPage].graphicObjects.selectedObjects.length !== 0)
{ {
this.Slides[this.CurPage].graphicObjects.remove(Count, bOnlyText, bRemoveOnlySelection, AscCommon.CollaborativeEditing.Is_Fast()); this.Slides[this.CurPage].graphicObjects.remove(Count, bOnlyText, bRemoveOnlySelection, AscCommon.CollaborativeEditing.Is_Fast());
this.Document_UpdateInterfaceState(); this.Document_UpdateInterfaceState();
...@@ -2074,23 +2074,29 @@ CPresentation.prototype = ...@@ -2074,23 +2074,29 @@ CPresentation.prototype =
{ {
if ( e.ShiftKey ) if ( e.ShiftKey )
{ {
if(AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) { if(this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects && this.Slides[this.CurPage].graphicObjects.selectedObjects.length !== 0) {
if (AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) {
History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd); History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd);
this.Paragraph_Add(new ParaNewLine(break_Line)); this.Paragraph_Add(new ParaNewLine(break_Line));
} }
} }
}
else if ( e.CtrlKey ) else if ( e.CtrlKey )
{ {
if(AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) { if(this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects && this.Slides[this.CurPage].graphicObjects.selectedObjects.length !== 0) {
if (AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) {
History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd); History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd);
this.Paragraph_Add(new ParaNewLine(break_Page)); this.Paragraph_Add(new ParaNewLine(break_Page));
} }
} }
}
else else
{ {
if(this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects && this.Slides[this.CurPage].graphicObjects.selectedObjects.length !== 0) {
this.Add_NewParagraph(); this.Add_NewParagraph();
} }
} }
}
bRetValue = keydownresult_PreventAll; bRetValue = keydownresult_PreventAll;
} }
...@@ -2212,10 +2218,12 @@ CPresentation.prototype = ...@@ -2212,10 +2218,12 @@ CPresentation.prototype =
if(AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) { if(AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) {
if(this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects && this.Slides[this.CurPage].graphicObjects.selectedObjects.length !== 0){
History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd); History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd);
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();
...@@ -2226,10 +2234,12 @@ CPresentation.prototype = ...@@ -2226,10 +2234,12 @@ CPresentation.prototype =
// this.DrawingDocument.TargetShow(); // this.DrawingDocument.TargetShow();
if(AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) { if(AscCommon.CollaborativeEditing.Is_Fast() || editor.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Drawing_Props) === false) {
if(this.Slides[this.CurPage] && this.Slides[this.CurPage].graphicObjects && this.Slides[this.CurPage].graphicObjects.selectedObjects.length !== 0) {
History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd); History.Create_NewPoint(AscDFH.historydescription_Presentation_ParagraphAdd);
this.Paragraph_Add(new ParaSpace(1)); this.Paragraph_Add(new ParaSpace(1));
} }
} }
}
bRetValue = keydownresult_PreventAll; bRetValue = keydownresult_PreventAll;
} }
......
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