Commit 13f47601 authored by Alexander.Trofimov's avatar Alexander.Trofimov

Merge branch 'feature/build-version' into develop

fix bug 33186

# Conflicts:
#	common/Private/license.js
#	common/apiCommon.js
parents 84c67364 bea219dc
......@@ -42,6 +42,7 @@ AscCommon.baseEditorsApi.prototype._onEndPermissions = function () {
oResult.setIsLight(this.licenseResult['light']);
oResult.setTrial(this.licenseResult['trial']);
oResult.setRights(this.licenseResult['rights']);
oResult.setBuildVersion(this.licenseResult['buildVersion']);
}
this.sendEvent('asc_onGetEditorPermissions', oResult);
}
......
......@@ -138,6 +138,7 @@
this.isAutosaveEnable = true;
this.AutosaveMinInterval = 300;
this.isAnalyticsEnable = false;
this.buildVersion = null;
return this;
}
......@@ -171,6 +172,9 @@
asc_CAscEditorPermissions.prototype.asc_getRights = function () {
return this.rights;
};
asc_CAscEditorPermissions.prototype.asc_getBuildVersion = function () {
return this.buildVersion;
};
asc_CAscEditorPermissions.prototype.setLicenseType = function (v) {
this.licenseType = v;
......@@ -187,6 +191,9 @@
asc_CAscEditorPermissions.prototype.setRights = function (v) {
this.rights = v;
};
asc_CAscEditorPermissions.prototype.setBuildVersion = function (v) {
this.buildVersion = v;
};
/** @constructor */
function asc_ValAxisSettings() {
......@@ -2719,6 +2726,7 @@
prot["asc_getIsLight"] = prot.asc_getIsLight;
prot["asc_getTrial"] = prot.asc_getTrial;
prot["asc_getRights"] = prot.asc_getRights;
prot["asc_getBuildVersion"] = prot.asc_getBuildVersion;
window["AscCommon"].asc_ValAxisSettings = asc_ValAxisSettings;
prot = asc_ValAxisSettings.prototype;
......
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