Commit d4c84cf9 authored by Alexey.Musinov's avatar Alexey.Musinov

[mobile] селект текста

parent 75e23a9f
...@@ -5766,7 +5766,7 @@ function offline_stz(v) {_s.zoom = v; _api.asc_setZoom(v);} ...@@ -5766,7 +5766,7 @@ function offline_stz(v) {_s.zoom = v; _api.asc_setZoom(v);}
function offline_ds(x, y, width, height, ratio, istoplayer) {_s.drawSheet(x, y, width, height, ratio, istoplayer);} function offline_ds(x, y, width, height, ratio, istoplayer) {_s.drawSheet(x, y, width, height, ratio, istoplayer);}
function offline_dh(x, y, width, height, type, ratio) {_s.drawHeader(x, y, width, height, type, ratio);} function offline_dh(x, y, width, height, type, ratio) {_s.drawHeader(x, y, width, height, type, ratio);}
function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeResize, isChartRange, indexRange, resizeRange, targetCol, targetRow) { function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeResize, isChartRange, indexRange, resizeRange, targetCol, targetRow, select) {
_s.isShapeAction = false; _s.isShapeAction = false;
var ws = _api.wb.getWorksheet(); var ws = _api.wb.getWorksheet();
...@@ -5782,11 +5782,26 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR ...@@ -5782,11 +5782,26 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR
ws.objectRender.drawingArea.reinitRanges(); ws.objectRender.drawingArea.reinitRanges();
var graphicsInfo = wb._onGetGraphicsInfo(x, y); var graphicsInfo = wb._onGetGraphicsInfo(x, y);
if (graphicsInfo) { if (graphicsInfo) {
ws.arrActiveChartsRanges = [];
window.AscDisableTextSelection = true;
var e = {isLocked:true, Button:0, ClickCount:1, shiftKey:false, metaKey:false, ctrlKey:false}; var e = {isLocked:true, Button:0, ClickCount:1, shiftKey:false, metaKey:false, ctrlKey:false};
ws.arrActiveChartsRanges = []; var content = null;
window.AscDisableTextSelection = true; if (1 === select.pin) {
content = ws.objectRender.controller.getTargetDocContent();
wb._onGraphicObjectMouseDown(e, select.beginX, select.beginY);
wb._onGraphicObjectMouseUp(e, select.endX, select.endY);
e.shiftKey = true;
}
if (-1 === select.pin) {
content = ws.objectRender.controller.getTargetDocContent();
wb._onGraphicObjectMouseDown(e, select.endX, select.endY);
wb._onGraphicObjectMouseUp(e, select.beginX, select.beginY);
e.shiftKey = true;
}
wb._onGraphicObjectMouseDown(e, x, y); wb._onGraphicObjectMouseDown(e, x, y);
wb._onUpdateSelectionShape(true); wb._onUpdateSelectionShape(true);
...@@ -5803,6 +5818,7 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR ...@@ -5803,6 +5818,7 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR
} }
var ischart = false; var ischart = false;
var isimage = false;
var controller = ws.objectRender.controller; var controller = ws.objectRender.controller;
var selected_objects = controller.selection.groupSelection ? controller.selection.groupSelection.selectedObjects : controller.selectedObjects; var selected_objects = controller.selection.groupSelection ? controller.selection.groupSelection.selectedObjects : controller.selectedObjects;
if (selected_objects.length === 1 && selected_objects[0].getObjectType() === historyitem_type_ChartSpace) { if (selected_objects.length === 1 && selected_objects[0].getObjectType() === historyitem_type_ChartSpace) {
...@@ -5814,8 +5830,14 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR ...@@ -5814,8 +5830,14 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR
window.AscAlwaysSaveAspectOnResizeTrack = false; window.AscAlwaysSaveAspectOnResizeTrack = false;
} }
} }
else if (selected_objects.length === 1 && selected_objects[0].getObjectType() === historyitem_type_ImageShape) {
isimage = true;
}
return {id:graphicsInfo.id, ischart:ischart, 'textselect':(null !== ws.objectRender.controller.selection.textSelection)}; return {id:graphicsInfo.id, ischart:ischart, isimage:isimage,
'textselect':(null !== ws.objectRender.controller.selection.textSelection),
'chartselect':(null !== ws.objectRender.controller.selection.chartSelection)
};
} }
_s.cellPin = pin; _s.cellPin = pin;
...@@ -5875,7 +5897,7 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR ...@@ -5875,7 +5897,7 @@ function offline_mouse_down(x, y, pin, isViewerMode, isFormulaEditMode, isRangeR
return null; return null;
} }
function offline_mouse_move(x, y, isViewerMode, isRangeResize, isChartRange, indexRange, resizeRange, targetCol, targetRow) { function offline_mouse_move(x, y, isViewerMode, isRangeResize, isChartRange, indexRange, resizeRange, targetCol, targetRow, textPin) {
var ws = _api.wb.getWorksheet(); var ws = _api.wb.getWorksheet();
var wb = _api.wb; var wb = _api.wb;
...@@ -5904,7 +5926,6 @@ function offline_mouse_move(x, y, isViewerMode, isRangeResize, isChartRange, ind ...@@ -5904,7 +5926,6 @@ function offline_mouse_move(x, y, isViewerMode, isRangeResize, isChartRange, ind
if (_s.isShapeAction) { if (_s.isShapeAction) {
if (!isViewerMode) { if (!isViewerMode) {
var e = {isLocked: true, Button: 0, ClickCount: 1, shiftKey: false, metaKey: false, ctrlKey: false}; var e = {isLocked: true, Button: 0, ClickCount: 1, shiftKey: false, metaKey: false, ctrlKey: false};
ws.objectRender.graphicObjectMouseMove(e, x, y); ws.objectRender.graphicObjectMouseMove(e, x, y);
} }
...@@ -6510,7 +6531,7 @@ function offline_paste(params) { ...@@ -6510,7 +6531,7 @@ function offline_paste(params) {
} }
else if (2 == type) else if (2 == type)
{ {
_api.wb.clipboard._pasteFromBinaryExcel(worksheet, params[1]); _api.wb.clipboard._pasteFromBinaryExcel(worksheet, params[1], null, true);
} }
} }
function offline_cut() { function offline_cut() {
......
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