Commit 8df37c07 authored by Alexey.Musinov's avatar Alexey.Musinov

mobile-coautoring

parent 98c98d5b
...@@ -1218,4 +1218,4 @@ CGraphics.prototype = ...@@ -1218,4 +1218,4 @@ CGraphics.prototype =
}; };
//------------------------------------------------------------export---------------------------------------------------- //------------------------------------------------------------export----------------------------------------------------
window['AscCommon'] = window['AscCommon'] || {}; window['AscCommon'] = window['AscCommon'] || {};
window['AscCommon'].CGraphics = CGraphics; window['AscCommon'].CGraphics = CGraphics;
\ No newline at end of file
...@@ -677,10 +677,10 @@ CAutoshapeTrack.prototype = ...@@ -677,10 +677,10 @@ CAutoshapeTrack.prototype =
{ {
this.Native["PD_reset"](); this.Native["PD_reset"]();
}, },
transform3 : function(m) transform3 : function(m, isNeedInvert, funcName)
{ {
var isNeedInvert = false; var isNeedInvert = false;
this.Native["PD_transform3"](m.sx,m.shy,m.shx,m.sy,m.tx,m.ty,isNeedInvert); this.Native[funcName ? funcName : "PD_transform3"](m.sx,m.shy,m.shx,m.sy,m.tx,m.ty,isNeedInvert);
}, },
transform : function(sx,shy,shx,sy,tx,ty) transform : function(sx,shy,shx,sy,tx,ty)
{ {
...@@ -3067,4 +3067,4 @@ window['AscCommon'] = window['AscCommon'] || {}; ...@@ -3067,4 +3067,4 @@ window['AscCommon'] = window['AscCommon'] || {};
window['AscCommon'].COverlay = COverlay; window['AscCommon'].COverlay = COverlay;
window['AscCommon'].TRACK_CIRCLE_RADIUS = TRACK_CIRCLE_RADIUS; window['AscCommon'].TRACK_CIRCLE_RADIUS = TRACK_CIRCLE_RADIUS;
window['AscCommon'].TRACK_DISTANCE_ROTATE = TRACK_DISTANCE_ROTATE; window['AscCommon'].TRACK_DISTANCE_ROTATE = TRACK_DISTANCE_ROTATE;
window['AscCommon'].CAutoshapeTrack = CAutoshapeTrack; window['AscCommon'].CAutoshapeTrack = CAutoshapeTrack;
\ No newline at end of file
This diff is collapsed.
...@@ -269,24 +269,7 @@ function openFileCommand(binUrl, changesUrl, Signature, callback) { ...@@ -269,24 +269,7 @@ function openFileCommand(binUrl, changesUrl, Signature, callback) {
var sFileUrl = binUrl; var sFileUrl = binUrl;
sFileUrl = sFileUrl.replace(/\\/g, "/"); sFileUrl = sFileUrl.replace(/\\/g, "/");
if (window['IS_NATIVE_EDITOR']) { if (!window['IS_NATIVE_EDITOR']) {
result = window["native"]["openFileCommand"](sFileUrl, changesUrl, Signature);
var url;
var nIndex = sFileUrl.lastIndexOf("/");
url = (-1 !== nIndex) ? sFileUrl.substring(0, nIndex + 1) : sFileUrl;
if (0 < result.length) {
oResult.bSerFormat = Signature === result.substring(0, Signature.length);
oResult.data = result;
oResult.url = url;
} else {
bError = true;
}
bEndLoadFile = true;
onEndOpen();
} else {
asc_ajax({ asc_ajax({
url: sFileUrl, url: sFileUrl,
dataType: "text", dataType: "text",
...@@ -335,8 +318,27 @@ function openFileCommand(binUrl, changesUrl, Signature, callback) { ...@@ -335,8 +318,27 @@ function openFileCommand(binUrl, changesUrl, Signature, callback) {
} else { } else {
bEndLoadChanges = true; bEndLoadChanges = true;
} }
}
function sendCommand(editor, fCallback, rdata, dataContainer) { if (window['IS_NATIVE_EDITOR']) {
result = window["native"]["openFileCommand"](sFileUrl, changesUrl, Signature);
var url;
var nIndex = sFileUrl.lastIndexOf("/");
url = (-1 !== nIndex) ? sFileUrl.substring(0, nIndex + 1) : sFileUrl;
if (0 < result.length) {
oResult.bSerFormat = Signature === result.substring(0, Signature.length);
oResult.data = result;
oResult.url = url;
} else {
bError = true;
}
bEndLoadFile = true;
onEndOpen();
}
}
function sendCommand(editor, fCallback, rdata, dataContainer) {
//json не должен превышать размера 2097152, иначе при его чтении будет exception //json не должен превышать размера 2097152, иначе при его чтении будет exception
var docConnectionId = editor.CoAuthoringApi.getDocId(); var docConnectionId = editor.CoAuthoringApi.getDocId();
if (docConnectionId && docConnectionId !== rdata["id"]) { if (docConnectionId && docConnectionId !== rdata["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