Commit 22618813 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

(1.0.0.114): FileConverterUtils2

Поправил лицензию.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@62108 954022d7-b5bf-4e40-9824-e11837661b57
parent 16c1f443
......@@ -26,6 +26,7 @@
this.isPeriodicalyTracking = false;
this.isAliveTrackingOnly = false;
this.isTrackDone = false;
this.bAliveUser2 = false;
if (undefined != obj && null != obj) {
if (undefined != obj["licenseId"] && null != obj["licenseId"])
......@@ -46,7 +47,12 @@
break;
case c_TrackingType.TT_DOCUMENT_SESSION:
this.isPeriodicalyTracking = false;
this.isAliveTrackingOnly = true;
break;
case c_TrackingType.TT_USER_COUNT_2:
this.bAliveUser2 = true; // Сразу выставляем, что пользователь активный
this.isPeriodicalyTracking = false;
this.isAliveTrackingOnly = true;
break;
......@@ -80,7 +86,7 @@
setTimeout(_OnTrackingTimer, oThis.trackingInterval);
};
if (this.isAliveTrackingOnly && !this.bAliveUser) {
if (this.isAliveTrackingOnly && !this.bAliveUser && !this.bAliveUser2) {
_OnSendTrack();
} else {
this.isTrackDone = true;
......
......@@ -1418,7 +1418,7 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
this.handlers.trigger("asc_onGetEditorPermissions", oEditorPermissions);
if (undefined != oSettings['trackingInfo'] && null != oSettings['trackingInfo']) {
if (undefined != oSettings['trackingInfo'] && null != oSettings['trackingInfo'] && oEditorPermissions.asc_getCanEdit()) {
this.TrackFile = new asc_CTrackFile(oSettings['trackingInfo']);
this.TrackFile.setDocId(this.DocInfo["Id"]);
......
......@@ -752,7 +752,7 @@ asc_docs_api.prototype.asc_getEditorPermissionsCallback = function(response) {
var oEditorPermissions = new asc_CAscEditorPermissions(oSettings);
this.asc_fireCallback("asc_onGetEditorPermissions", oEditorPermissions);
if (undefined != oSettings['trackingInfo'] && null != oSettings['trackingInfo']) {
if (undefined != oSettings['trackingInfo'] && null != oSettings['trackingInfo'] && oEditorPermissions.asc_getCanEdit()) {
var asc_CTrackFile = window["Asc"].CTrackFile;
this.TrackFile = new asc_CTrackFile(oSettings['trackingInfo']);
......
......@@ -704,7 +704,7 @@ asc_docs_api.prototype.asc_getEditorPermissionsCallback = function(response) {
var oEditorPermissions = new asc_CAscEditorPermissions(oSettings);
this.asc_fireCallback("asc_onGetEditorPermissions", oEditorPermissions);
if (undefined != oSettings['trackingInfo'] && null != oSettings['trackingInfo']) {
if (undefined != oSettings['trackingInfo'] && null != oSettings['trackingInfo'] && oEditorPermissions.asc_getCanEdit()) {
var asc_CTrackFile = window["Asc"].CTrackFile;
this.TrackFile = new asc_CTrackFile(oSettings['trackingInfo']);
......
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