Commit 3058e168 authored by Sergey.Luzyanin's avatar Sergey.Luzyanin Committed by Alexander.Trofimov

Баги с загрузкой картинок при вставке; Баг с перерисовкой текстарта при выходе...

Баги с загрузкой картинок при вставке; Баг с перерисовкой текстарта при выходе из режима редактирвания текста по клавише esc.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@64840 954022d7-b5bf-4e40-9824-e11837661b57
parent efeccd25
...@@ -5020,7 +5020,7 @@ DrawingObjectsController.prototype = ...@@ -5020,7 +5020,7 @@ DrawingObjectsController.prototype =
} }
else if (this.drawingObjects.cSld) else if (this.drawingObjects.cSld)
{ {
if (!(bNoRedraw === true)) // if (!(bNoRedraw === true))
{ {
nPageNum2 = this.drawingObjects.num; nPageNum2 = this.drawingObjects.num;
} }
......
This diff is collapsed.
...@@ -1755,6 +1755,11 @@ CPresentation.prototype = ...@@ -1755,6 +1755,11 @@ CPresentation.prototype =
{ {
bNeedRedraw = false; bNeedRedraw = false;
} }
var bChart = oDrawingObjects.checkChartTextSelection(true);
if(!bNeedRedraw)
{
bNeedRedraw = bChart;
}
if(e.ShiftKey || (!oDrawingObjects.selection.groupSelection && !oDrawingObjects.selection.textSelection && !oDrawingObjects.selection.chartSelection)) if(e.ShiftKey || (!oDrawingObjects.selection.groupSelection && !oDrawingObjects.selection.textSelection && !oDrawingObjects.selection.chartSelection))
{ {
oDrawingObjects.resetSelection(); oDrawingObjects.resetSelection();
......
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