fix Bug 32433 - [Copy&Paste JS ошибка после вставки изображения из CDE и undo

6128c4bd · Sergey Luzyanin · a77dc773 · 6128c4bd
Commit 6128c4bd authored May 19, 2016 by Sergey Luzyanin
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

common/wordcopypaste.js common/wordcopypaste.js +11 -9

No files found.
--- a/common/wordcopypaste.js
+++ b/common/wordcopypaste.js
@@ -405,7 +405,7 @@ function Editor_Copy(api, bCut)
            window["AscDesktopEditor"]["Copy"]();
        }
 		ElemToSelect.innerHTML = "";
        return;
    }       
@@ -3857,14 +3857,16 @@ PasteProcessor.prototype =
                            {
                                if (!(presentationSelectedContent.Drawings[i].Drawing instanceof CGraphicFrame))
                                {
-                                    if (presentationSelectedContent.Drawings[i].Drawing.setBDeleted2)
+                                    AscFormat.ExecuteNoHistory(function(){
-                                    {
+                                        if (presentationSelectedContent.Drawings[i].Drawing.setBDeleted2)
-                                        presentationSelectedContent.Drawings[i].Drawing.setBDeleted2(true);
+                                        {
-                                    }
+                                            presentationSelectedContent.Drawings[i].Drawing.setBDeleted2(true);
-                                    else
+                                        }
-                                    {
+                                        else
-                                        presentationSelectedContent.Drawings[i].Drawing.setBDeleted(true);
+                                        {
-                                    }
+                                            presentationSelectedContent.Drawings[i].Drawing.setBDeleted(true);
+                                        }
+                                    }, this, []);
                                    presentationSelectedContent.Drawings[i].Drawing = presentationSelectedContent.Drawings[i].Drawing.convertToPPTX(oThis.oDocument.DrawingDocument);
                                  AscFormat.checkBlipFillRasterImages(presentationSelectedContent.Drawings[i].Drawing);
                                }