Commit 39d98e27 authored by GoshaZotov's avatar GoshaZotov

changes for showing special paste button

parent 02b157db
...@@ -1404,6 +1404,7 @@ ...@@ -1404,6 +1404,7 @@
var allowedSpecialPasteProps = [sProps.sourceformatting, sProps.destinationFormatting]; var allowedSpecialPasteProps = [sProps.sourceformatting, sProps.destinationFormatting];
worksheet.showSpecialPasteOptions(allowedSpecialPasteProps, null, position); worksheet.showSpecialPasteOptions(allowedSpecialPasteProps, null, position);
window['AscCommon'].g_clipboardBase.specialPasteButtonProps = {};
window['AscCommon'].g_clipboardBase.specialPasteButtonProps.range = cursorPos; window['AscCommon'].g_clipboardBase.specialPasteButtonProps.range = cursorPos;
window['AscCommon'].g_clipboardBase.specialPasteButtonProps.shapeId = isIntoShape.Id; window['AscCommon'].g_clipboardBase.specialPasteButtonProps.shapeId = isIntoShape.Id;
} }
......
...@@ -9819,11 +9819,13 @@ ...@@ -9819,11 +9819,13 @@
{ {
var _clipboard = window["Asc"]["editor"].wb.clipboard; var _clipboard = window["Asc"]["editor"].wb.clipboard;
var specialPasteShowOptions = new Asc.SpecialPasteShowOptions(); var specialPasteShowOptions = new Asc.SpecialPasteShowOptions();
window['AscCommon'].g_clipboardBase.specialPasteButtonProps.range = range;
var cellCoord; var cellCoord;
if(!positionShapeContent) if(!positionShapeContent)
{ {
window['AscCommon'].g_clipboardBase.specialPasteButtonProps = {};
window['AscCommon'].g_clipboardBase.specialPasteButtonProps.range = range;
var isVisible = null !== this.getCellVisibleRange(range.c2, range.r2); var isVisible = null !== this.getCellVisibleRange(range.c2, range.r2);
cellCoord = this.getCellCoord(range.c2, range.r2); cellCoord = this.getCellCoord(range.c2, range.r2);
if(!isVisible) if(!isVisible)
...@@ -9890,7 +9892,7 @@ ...@@ -9890,7 +9892,7 @@
var isVisible = null !== this.getCellVisibleRange(range.c2, range.r2); var isVisible = null !== this.getCellVisibleRange(range.c2, range.r2);
var cellCoord = this.getCellCoord(range.c2, range.r2); var cellCoord = this.getCellCoord(range.c2, range.r2);
if(!isVisible) if(!isVisible || window['AscCommon'].g_clipboardBase.specialPasteButtonProps.shapeId)
{ {
cellCoord._x = -1; cellCoord._x = -1;
cellCoord._y = -1; cellCoord._y = -1;
......
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