Commit 9a26f644 authored by Alexey.Musinov's avatar Alexey.Musinov

mobile-coautoring

parent 36d63e83
...@@ -4374,21 +4374,18 @@ function OfflineEditor () { ...@@ -4374,21 +4374,18 @@ function OfflineEditor () {
{ {
stream["WriteLong"](Asc.c_oAscTypeSelectElement.Paragraph); stream["WriteLong"](Asc.c_oAscTypeSelectElement.Paragraph);
asc_menu_WriteParagraphPr(SelectedObjects[i].Value, stream); asc_menu_WriteParagraphPr(SelectedObjects[i].Value, stream);
//console.log('c_oAscTypeSelectElement.Paragraph');
break; break;
} }
case Asc.c_oAscTypeSelectElement.Image: case Asc.c_oAscTypeSelectElement.Image:
{ {
stream["WriteLong"](Asc.c_oAscTypeSelectElement.Image); stream["WriteLong"](Asc.c_oAscTypeSelectElement.Image);
asc_menu_WriteImagePr(SelectedObjects[i].Value, stream); asc_menu_WriteImagePr(SelectedObjects[i].Value, stream);
//console.log('c_oAscTypeSelectElement.Image');
break; break;
} }
case Asc.c_oAscTypeSelectElement.Hyperlink: case Asc.c_oAscTypeSelectElement.Hyperlink:
{ {
stream["WriteLong"](Asc.c_oAscTypeSelectElement.Hyperlink); stream["WriteLong"](Asc.c_oAscTypeSelectElement.Hyperlink);
asc_menu_WriteHyperPr(SelectedObjects[i].Value, stream); asc_menu_WriteHyperPr(SelectedObjects[i].Value, stream);
//console.log('c_oAscTypeSelectElement.Hyperlink');
break; break;
} }
default: default:
...@@ -5380,16 +5377,14 @@ window["native"]["offline_mouse_down"] = function(x, y, pin, isViewerMode, isFor ...@@ -5380,16 +5377,14 @@ window["native"]["offline_mouse_down"] = function(x, y, pin, isViewerMode, isFor
if (!isViewerMode) { if (!isViewerMode) {
var ct = ws.getCursorTypeFromXY(x, y, isViewerMode); var ct = ws.getCursorTypeFromXY(x, y, isViewerMode);
//console.log(JSON.stringify(ct));
ws.startCellMoveResizeRange = null; ws.startCellMoveResizeRange = null;
var rangeChange = new window["Asc"].Range(resizeRange[0], resizeRange[1], resizeRange[2], resizeRange[3]); var rangeChange = new window["Asc"].Range(resizeRange[0], resizeRange[1], resizeRange[2], resizeRange[3]);
var target = { var target = {
formulaRange: rangeChange, formulaRange: rangeChange,
row: ct.row, //isChartRange ? ct.row : targetRow, row: ct.row,
col: ct.col, //isChartRange ? ct.col : targetCol, col: ct.col,
target: ct.target, target: ct.target,
targetArr: isChartRange ? -1 : 0, targetArr: isChartRange ? -1 : 0,
cursor: "se-resize", cursor: "se-resize",
...@@ -7289,6 +7284,9 @@ window["native"]["offline_apply_event"] = function(type,params) { ...@@ -7289,6 +7284,9 @@ window["native"]["offline_apply_event"] = function(type,params) {
case 'cursor' : case 'cursor' :
t._onCursor(dataObject); t._onCursor(dataObject);
break; break;
case 'meta' :
t._onMeta(dataObject);
break;
case 'getLock' : case 'getLock' :
t._onGetLock(dataObject); t._onGetLock(dataObject);
break; break;
...@@ -7327,15 +7325,24 @@ window["native"]["offline_apply_event"] = function(type,params) { ...@@ -7327,15 +7325,24 @@ window["native"]["offline_apply_event"] = function(type,params) {
case 'license': case 'license':
t._onLicense(dataObject); t._onLicense(dataObject);
break; break;
case 'session' :
t._onSession(dataObject);
break;
} }
break; break;
} }
case 11010: // ASC_SOCKET_EVENT_TYPE_ON_DISCONNECT case 11010: // ASC_SOCKET_EVENT_TYPE_ON_DISCONNECT
{
}
case 11020: // ASC_SOCKET_EVENT_TYPE_TRY_RECONNECT
{ {
var t = _api.CoAuthoringApi._CoAuthoringApi; var t = _api.CoAuthoringApi._CoAuthoringApi;
t.onDisconnect("", false, false); delete t.sockjs;
t._initSocksJs();
} }
default: default:
...@@ -7479,8 +7486,7 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElements = fu ...@@ -7479,8 +7486,7 @@ window["AscCommonExcel"].WorksheetView.prototype._drawCollaborativeElements = fu
}; };
window["Asc"]["spreadsheet_api"].prototype.openDocument = function(sData) { window["Asc"]["spreadsheet_api"].prototype.openDocument = function(sData) {
//asc["editor"] = this;
var t = this; var t = this;
setTimeout(function() { setTimeout(function() {
......
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