Skip to content

S
sdkjs
Commit bfdeaf68 authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov
Browse files
Options

Реализовал чтение новой информации о лицензии с сервера. 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68619 954022d7-b5bf-4e40-9824-e11837661b57
parent 2a5691e5
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 98 deletions
Build/deploy/sdk_configs/webexcel.json
View file @ bfdeaf68
......@@ -162,7 +162,6 @@
"../../Common/apiBase.js",
"../../Excel/api.js",
"../../Common/Private/license.js",
"../../Excel/Private/license.js",
"../../Excel/Private/comments.js"
],
"dst": "../../Excel/sdk-all.js",
......
Build/deploy/sdk_configs/webpowerpoint.json
View file @ bfdeaf68
......@@ -135,7 +135,6 @@
"../../Common/apiBase.js",
"../../PowerPoint/api.js",
"../../Common/Private/license.js",
"../../PowerPoint/Private/license.js",
"../../PowerPoint/Private/comments.js",
"../../PowerPoint/apiCommon.js",
"../../Word/apiCommon.js",
......
Build/deploy/sdk_configs/webword.json
View file @ bfdeaf68
......@@ -122,7 +122,6 @@
"../../Common/apiBase.js",
"../../Word/api.js",
"../../Common/Private/license.js",
"../../Word/Private/license.js",
"../../Common/Private/versionHistory.js",
"../../Word/Private/comments.js",
"../../Word/Private/StyleManager.js",
......
Build/local/webexcel.json
View file @ bfdeaf68
......@@ -162,7 +162,6 @@
"../../Common/apiBase.js",
"../../Excel/api.js",
"../../Common/Private/license.js",
"../../Excel/Private/license.js",
"../../Excel/Private/comments.js",
"../../Common/Local/common.js",
"../../Excel/Local/api.js"
......
Build/local/webpowerpoint.json
View file @ bfdeaf68
......@@ -135,7 +135,6 @@
"../../Common/apiBase.js",
"../../PowerPoint/api.js",
"../../Common/Private/license.js",
"../../PowerPoint/Private/license.js",
"../../PowerPoint/Private/comments.js",
"../../PowerPoint/apiCommon.js",
"../../Word/apiCommon.js",
......
Build/local/webword.json
View file @ bfdeaf68
......@@ -122,7 +122,6 @@
"../../Common/apiBase.js",
"../../Word/api.js",
"../../Common/Private/license.js",
"../../Word/Private/license.js",
"../../Common/Private/versionHistory.js",
"../../Word/Private/comments.js",
"../../Word/Private/StyleManager.js",
......
Common/Private/license.js
View file @ bfdeaf68
......@@ -81,10 +81,12 @@ baseEditorsApi.prototype._onCheckLicenseEnd = function(err, res) {
this._onEndPermissions();
};
baseEditorsApi.prototype._onEndPermissions = function() {
if (null !== this.licenseResult && this.isOnFirstConnectEnd) {
if (this.isOnFirstConnectEnd && this.isOnLoadLicense) {
var oResult = new window['Asc'].asc_CAscEditorPermissions();
oResult.asc_setCanLicense(g_oLicenseResult.Success === this.licenseResult.res);
oResult.asc_setCanBranding(g_oLicenseResult.Error !== this.licenseResult.res); // Для тех, у кого есть лицензия, branding доступен
if (null !== this.licenseResult) {
oResult.asc_setCanLicense(g_oLicenseResult.Success === this.licenseResult);
oResult.asc_setCanBranding(g_oLicenseResult.Error !== this.licenseResult); // Для тех, у кого есть лицензия, branding доступен
}
this.sendEvent('asc_onGetEditorPermissions', oResult);
}
};
\ No newline at end of file
Common/apiBase.js
View file @ bfdeaf68
......@@ -77,6 +77,8 @@ function baseEditorsApi(name) {
this.licenseResult = null;
// Подключились ли уже к серверу
this.isOnFirstConnectEnd = false;
// Получили ли лицензию
this.isOnLoadLicense = false;
this.canSave = true; // Флаг нужен чтобы не происходило сохранение пока не завершится предыдущее сохранение
this.IsUserSave = false; // Флаг, контролирующий сохранение было сделано пользователем или нет (по умолчанию - нет)
......@@ -354,7 +356,7 @@ baseEditorsApi.prototype.asc_getEditorPermissions = function() {
this._coAuthoringInit();
};
baseEditorsApi.prototype._onEndPermissions = function() {
if (this.isOnFirstConnectEnd) {
if (this.isOnFirstConnectEnd && this.isOnLoadLicense) {
this.sendEvent('asc_onGetEditorPermissions', new window['Asc'].asc_CAscEditorPermissions());
}
};
......@@ -396,6 +398,11 @@ baseEditorsApi.prototype._coAuthoringInit = function() {
t.isOnFirstConnectEnd = true;
t._onEndPermissions();
};
this.CoAuthoringApi.onLicense = function(res) {
t.licenseResult = res;
t.isOnLoadLicense = true;
t._onEndPermissions();
};
this.CoAuthoringApi.onWarning = function(e) {
t.sendEvent('asc_onError', c_oAscError.ID.Warning, c_oAscError.Level.NoCritical);
};
......
Common/docscoapi.js
View file @ bfdeaf68
......@@ -32,6 +32,7 @@
this.onRecalcLocks = options.onRecalcLocks;
this.onDocumentOpen = options.onDocumentOpen;
this.onFirstConnect = options.onFirstConnect;
this.onLicense = options.onLicense;
}
}
......@@ -99,12 +100,16 @@
this._CoAuthoringApi.onFirstConnect = function() {
t.callback_OnFirstConnect();
};
this._CoAuthoringApi.onLicense = function(res) {
t.callback_OnLicense(res);
};
this._CoAuthoringApi.init(user, docid, documentCallbackUrl, token, editorType, documentFormatSave);
this._onlineWork = true;
} else {
// Фиктивные вызовы
this.onFirstConnect();
this.onLicense();
}
};
......@@ -376,6 +381,11 @@
this.onFirstConnect();
}
};
CDocsCoApi.prototype.callback_OnLicense = function(res) {
if (this.onLicense) {
this.onLicense(res);
}
};
function LockBufferElement(arrayBlockId, callback) {
this._arrayBlockId = arrayBlockId;
......@@ -403,6 +413,7 @@
this.onRecalcLocks = options.onRecalcLocks;
this.onDocumentOpen = options.onDocumentOpen;
this.onFirstConnect = options.onFirstConnect;
this.onLicense = options.onLicense;
}
this._state = ConnectionState.None;
// Online-пользователи в документе
......@@ -410,6 +421,7 @@
this._countEditUsers = 0;
this._countUsers = 0;
this.isLicenseInit = false;
this.isAuthInit = false;
this._locks = {};
this._msgBuffer = [];
......@@ -1045,6 +1057,13 @@
this.onWarning(data ? data['description'] : '');
};
DocsCoApi.prototype._onLicense = function(data) {
if (!this.isLicenseInit) {
this.isLicenseInit = true;
this.onLicense(data['license']);
}
};
DocsCoApi.prototype._onAuth = function(data) {
var t = this;
if (true === this._isAuth) {
......@@ -1197,7 +1216,7 @@
//TODO: add checks and error handling
//Get data type
var dataObject = JSON.parse(e.data);
var type = dataObject.type;
var type = dataObject['type'];
switch (type) {
case 'auth' :
t._onAuth(dataObject);
......@@ -1243,6 +1262,8 @@
case 'warning':
t._onWarning(dataObject);
break;
case 'license':
t._onLicense(dataObject);
}
};
sockjs.onclose = function(evt) {
......
Excel/Private/license.js deleted 100644 → 0
View file @ 2a5691e5
"use strict";
/* license.js
*
* Author: Alexander.Trofimov@avsmedia.net
* Date: Apr 23, 2015
*/
(/**
* @param {jQuery} $
* @param {Window} window
* @param {undefined} undefined
*/
function($, window, undefined) {
var asc = window["Asc"];
var prot;
asc['spreadsheet_api'].prototype.asc_getEditorPermissions = function(licenseUrl, customerId) {
var t = this;
if (this.DocInfo && this.DocInfo.asc_getId() && this.DocInfo.asc_getUrl()) {
var sUserFirstName = null, sUserLastName = null;
var oUserInfo = this.DocInfo.get_UserInfo();
if (oUserInfo) {
sUserFirstName = oUserInfo.get_FirstName();
sUserLastName = oUserInfo.get_LastName();
}
CheckLicense(licenseUrl, customerId, this.DocInfo.asc_getUserId(), sUserFirstName, sUserLastName, function(err, res) {
t._onCheckLicenseEnd(err, res);
});
} else {
// Фиктивный вызов
this._onCheckLicenseEnd(true, g_oLicenseResult.Error);
}
this._coAuthoringInit();
};
prot = asc['spreadsheet_api'].prototype;
prot['asc_getEditorPermissions'] = prot.asc_getEditorPermissions;
})(jQuery, window);
Excel/SpreadsheetTestMenu.html
View file @ bfdeaf68
......@@ -111,7 +111,6 @@
<script type="text/javascript" src="../Common/apiBase.js"></script>
<script type="text/javascript" src="api.js"></script>
<script type="text/javascript" src="../Common/Private/license.js"></script>
<script type="text/javascript" src="Private/license.js"></script>
<script type="text/javascript" src="Private/comments.js"></script>
<script type="text/javascript" src="menu/menu.js"></script>
......
Excel/index.html
View file @ bfdeaf68
......@@ -314,7 +314,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Common/apiBase.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/Private/comments.js"></script>
<!--for theme-->
......
Excel/index_mobile.html
View file @ bfdeaf68
......@@ -281,7 +281,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Common/apiBase.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Excel/Private/comments.js"></script>
<!--for theme-->
......
PowerPoint/Private/license.js deleted 100644 → 0
View file @ 2a5691e5
"use strict";
asc_docs_api.prototype.asc_getEditorPermissions = function(licenseUrl, customerId) {
var t = this;
if (this.DocInfo && this.DocInfo.get_Id()) {
var sUserFirstName = null, sUserLastName = null;
var oUserInfo = this.DocInfo.get_UserInfo();
if (oUserInfo) {
sUserFirstName = oUserInfo.get_FirstName();
sUserLastName = oUserInfo.get_LastName();
}
CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), sUserFirstName, sUserLastName, function(err, res) {
t._onCheckLicenseEnd(err, res);
});
} else {
// Фиктивный вызов
this._onCheckLicenseEnd(true, g_oLicenseResult.Error);
}
this._coAuthoringInit();
};
\ No newline at end of file
PowerPoint/index.html
View file @ bfdeaf68
......@@ -358,7 +358,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Common/apiBase.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Private/comments.js"></script>
......
Word/Private/license.js deleted 100644 → 0
View file @ 2a5691e5
"use strict";
asc_docs_api.prototype.asc_getEditorPermissions = function(licenseUrl, customerId) {
var t = this;
if (this.DocInfo && this.DocInfo.get_Id()) {
var sUserFirstName = null, sUserLastName = null;
var oUserInfo = this.DocInfo.get_UserInfo();
if (oUserInfo) {
sUserFirstName = oUserInfo.get_FirstName();
sUserLastName = oUserInfo.get_LastName();
}
CheckLicense(licenseUrl, customerId, this.DocInfo.get_UserId(), sUserFirstName, sUserLastName, function(err, res) {
t._onCheckLicenseEnd(err, res);
});
} else {
// Фиктивный вызов
this._onCheckLicenseEnd(true, g_oLicenseResult.Error);
}
this._coAuthoringInit();
};
\ No newline at end of file
Word/index.html
View file @ bfdeaf68
......@@ -419,7 +419,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/OfflineDocuments/ApplyDocumentChanges.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/versionHistory.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/comments.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/StyleManager.js"></script>
......
Word/index_mobile.html
View file @ bfdeaf68
......@@ -171,7 +171,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Common/apiBase.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/versionHistory.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/comments.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/document/empty.js"></script>
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7