Commit 67ece603 authored by GoshaZotov's avatar GoshaZotov

getTargetDocContent(true) -> getTargetDocContent()

parent 74132d69
...@@ -8809,7 +8809,7 @@ ...@@ -8809,7 +8809,7 @@
return; return;
} }
var isIntoShape = t.objectRender.controller.getTargetDocContent(true); var isIntoShape = t.objectRender.controller.getTargetDocContent();
var onSelectionCallback = function(isSuccess) var onSelectionCallback = function(isSuccess)
{ {
if(!isSuccess) if(!isSuccess)
...@@ -8890,6 +8890,8 @@ ...@@ -8890,6 +8890,8 @@
else if(isIntoShape && specialPasteUndoData && specialPasteUndoData.shapeSelectionState)//курсор и специальная вставка в шейпе else if(isIntoShape && specialPasteUndoData && specialPasteUndoData.shapeSelectionState)//курсор и специальная вставка в шейпе
{ {
//таким образом удаляю вставляенный фрагмент до специальной вставки //таким образом удаляю вставляенный фрагмент до специальной вставки
isIntoShape = t.objectRender.controller.getTargetDocContent(true);
var State = specialPasteUndoData.shapeSelectionState; var State = specialPasteUndoData.shapeSelectionState;
isIntoShape.Set_SelectionState(State, State.length - 1); isIntoShape.Set_SelectionState(State, State.length - 1);
isIntoShape.Remove(1, true, true); isIntoShape.Remove(1, true, true);
...@@ -10045,7 +10047,7 @@ ...@@ -10045,7 +10047,7 @@
WorksheetView.prototype.updateSpecialPasteOptionsPosition = function(changeActiveRange) WorksheetView.prototype.updateSpecialPasteOptionsPosition = function(changeActiveRange)
{ {
var _clipboard = AscCommonExcel.g_clipboardExcel; var _clipboard = AscCommonExcel.g_clipboardExcel;
var isIntoShape = this.objectRender.controller.getTargetDocContent(true); var isIntoShape = this.objectRender.controller.getTargetDocContent();
if(window['AscCommon'].g_clipboardBase.showSpecialPasteButton && isIntoShape) if(window['AscCommon'].g_clipboardBase.showSpecialPasteButton && isIntoShape)
{ {
if(window['AscCommon'].g_clipboardBase.specialPasteButtonProps.shapeId === isIntoShape.Id) if(window['AscCommon'].g_clipboardBase.specialPasteButtonProps.shapeId === isIntoShape.Id)
......
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