Skip to content

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

_onCheckLicenseEnd сделал общей в Private/license.js 

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66177 954022d7-b5bf-4e40-9824-e11837661b57
parent 15cca79a
Hide whitespace changes
Inline Side-by-side
Showing with 18 additions and 27 deletions
Build/deploy/sdk_configs/webexcel.json
View file @ 5836973b
......@@ -18,7 +18,6 @@
"../../Common/apiCommon.js",
"../../Common/commonDefines.js",
"../../Common/editorscommon.js",
"../../Common/Private/license.js",
"../../Common/NumFormat.js",
"../../Common/Charts/charts.js",
"../../Common/Charts/DrawingArea.js",
......@@ -158,6 +157,7 @@
"../../Excel/apiCommonExport.js",
"../../Common/apiBase.js",
"../../Excel/api.js",
"../../Common/Private/license.js",
"../../Excel/Private/license.js",
"../../Excel/Private/comments.js"
],
......
Build/deploy/sdk_configs/webpowerpoint.json
View file @ 5836973b
......@@ -25,7 +25,6 @@
"../../Common/docscoapi.js",
"../../Common/wordcopypaste.js",
"../../Common/editorscommon.js",
"../../Common/Private/license.js",
"../../PowerPoint/Drawing/ThemeLoader.js",
"../../Common/Charts/DrawingObjects.js",
"../../Common/SerializeCommonWordExcel.js",
......@@ -131,6 +130,7 @@
"../../PowerPoint/Editor/Format/GraphicFrame.js",
"../../Common/apiBase.js",
"../../PowerPoint/api.js",
"../../Common/Private/license.js",
"../../PowerPoint/Private/license.js",
"../../PowerPoint/Private/comments.js",
"../../PowerPoint/apiCommon.js",
......
Build/deploy/sdk_configs/webword.json
View file @ 5836973b
......@@ -22,7 +22,6 @@
"../../Common/downloaderfiles.js",
"../../Common/commonDefines.js",
"../../Common/editorscommon.js",
"../../Common/Private/license.js",
"../../Common/Shapes/Serialize.js",
"../../Common/Shapes/SerializeWriter.js",
"../../Common/SerializeCommonWordExcel.js",
......@@ -117,6 +116,7 @@
"../../Word/apiDefines.js",
"../../Common/apiBase.js",
"../../Word/api.js",
"../../Common/Private/license.js",
"../../Word/Private/license.js",
"../../Word/Private/comments.js",
"../../Word/Private/StyleManager.js",
......
Common/Private/license.js
View file @ 5836973b
......@@ -63,4 +63,9 @@ function CheckUserInLicense(customerId, userId, userFirstName, userLastName, oLi
res = false;
}
return res;
}
\ No newline at end of file
}
baseEditorsApi.prototype._onCheckLicenseEnd = function(err, res) {
this.licenseResult = {err: err, res: res};
this._onEndPermissions();
};
\ No newline at end of file
Excel/.unit-tests/FormulaTests.html
View file @ 5836973b
......@@ -33,7 +33,6 @@
<script type="text/javascript" src="../../Common/commonDefines.js"></script>
<script type="text/javascript" src="../../Common/NumFormat.js"></script>
<script type="text/javascript" src="../../Common/editorscommon.js"></script>
<script type="text/javascript" src="../../Common/Private/license.js"></script>
<script type="text/javascript" src="../../Common/apiCommon.js"></script>
<script type="text/javascript" src="../../Common/FontsFreeType/font_engine.js"></script>
......
Excel/Private/license.js
View file @ 5836973b
......@@ -34,10 +34,6 @@
}
this._coAuthoringInit();
};
asc['spreadsheet_api'].prototype._onCheckLicenseEnd = function(err, res) {
this.licenseResult = {err: err, res: res};
this._onEndPermissions();
};
asc['spreadsheet_api'].prototype._onEndPermissions = function() {
if (null !== this.licenseResult && this.isOnFirstConnectEnd) {
var oResult = new asc.asc_CAscEditorPermissions();
......
Excel/SpreadsheetTestMenu.html
View file @ 5836973b
......@@ -48,7 +48,6 @@
<script type="text/javascript" src="../Common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../Common/commonDefines.js"></script>
<script type="text/javascript" src="../Common/editorscommon.js"></script>
<script type="text/javascript" src="../Common/Private/license.js"></script>
<script type="text/javascript" src="../Common/apiCommon.js"></script>
<script type="text/javascript" src="../Common/FontsFreeType/font_engine.js"></script>
......@@ -113,6 +112,7 @@
<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/SpreadsheetTestMobile.html
View file @ 5836973b
......@@ -38,7 +38,6 @@
<script type="text/javascript" src="../Common/Charts/ChartsDrawer.js"></script>
<script type="text/javascript" src="../Common/commonDefines.js"></script>
<script type="text/javascript" src="../Common/editorscommon.js"></script>
<script type="text/javascript" src="../Common/Private/license.js"></script>
<script type="text/javascript" src="../Common/apiCommon.js"></script>
<script type="text/javascript" src="../Common/FontsFreeType/font_engine.js"></script>
......
Excel/index.html
View file @ 5836973b
......@@ -246,7 +246,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Common/browser.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapi.js"></script>
......@@ -321,6 +320,7 @@
<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>
......
Excel/index_mobile.html
View file @ 5836973b
......@@ -210,7 +210,6 @@
</script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/browser.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapi.js"></script>
......@@ -282,6 +281,7 @@
<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>
......
PowerPoint/PowerPoint.html
View file @ 5836973b
......@@ -30,7 +30,6 @@
<script type="text/javascript" src="../Common/browser.js"></script>
<script type="text/javascript" src="../Common/wordcopypaste.js"></script>
<script type="text/javascript" src="../Common/editorscommon.js"></script>
<script type="text/javascript" src="../Common/Private/license.js"></script>
<script type="text/javascript" src="menu/main_menu.js"></script>
<script type="text/javascript" src="menu/Statusbar.js"></script>
......@@ -106,6 +105,7 @@
<script type="text/javascript" src="../Common/apiBase.js"></script>
<script type="text/javascript" src="../PowerPoint/api.js"></script>
<script type="text/javascript" src="../Common/Private/license.js"></script>
<script type="text/javascript" src="../PowerPoint/Private/license.js"></script>
<script type="text/javascript" src="../PowerPoint/Private/comments.js"></script>
......
PowerPoint/Private/license.js
View file @ 5836973b
......@@ -18,10 +18,6 @@ asc_docs_api.prototype.asc_getEditorPermissions = function(licenseUrl, customerI
}
this._coAuthoringInit();
};
asc_docs_api.prototype._onCheckLicenseEnd = function(err, res) {
this.licenseResult = {err: err, res: res};
this._onEndPermissions();
};
asc_docs_api.prototype._onEndPermissions = function() {
if (null !== this.licenseResult && this.isOnFirstConnectEnd) {
var oResult = new window['Asc'].asc_CAscEditorPermissions();
......
PowerPoint/index.html
View file @ 5836973b
......@@ -260,7 +260,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Common/wordcopypaste.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/PowerPoint/Drawing/ThemeLoader.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script>
......@@ -322,6 +321,7 @@
<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
View file @ 5836973b
......@@ -19,10 +19,6 @@ asc_docs_api.prototype.asc_getEditorPermissions = function(licenseUrl, customerI
}
this._coAuthoringInit();
};
asc_docs_api.prototype._onCheckLicenseEnd = function(err, res) {
this.licenseResult = {err: err, res: res};
this._onEndPermissions();
};
asc_docs_api.prototype._onEndPermissions = function() {
if (null !== this.licenseResult && this.isOnFirstConnectEnd) {
var oResult = new window['Asc'].asc_CAscEditorPermissions();
......
Word/TextEditor.html
View file @ 5836973b
......@@ -28,7 +28,6 @@
<!-- application -->
<script type="text/javascript" src="../Common/browser.js"></script>
<script type="text/javascript" src="../Common/editorscommon.js"></script>
<script type="text/javascript" src="../Common/Private/license.js"></script>
<script type="text/javascript" src="../Common/downloaderfiles.js"></script>
<script type="text/javascript" src="../Common/docscoapicommon.js"></script>
<script type="text/javascript" src="../Common/docscoapi.js"></script>
......@@ -179,6 +178,7 @@
<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="document/empty.js"></script>
......
Word/index.html
View file @ 5836973b
......@@ -243,7 +243,6 @@
<!-- -->
<script type="text/javascript" src="../../../../OfficeWeb/Common/browser.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapi.js"></script>
......@@ -421,6 +420,7 @@
<!-- apply changes -->
<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/Word/Private/comments.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/Private/StyleManager.js"></script>
......
Word/index_mobile.html
View file @ 5836973b
......@@ -74,7 +74,6 @@
<script type="text/javascript" src="../../../../OfficeWeb/Common/browser.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/editorscommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/downloaderfiles.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapicommon.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Common/docscoapi.js"></script>
......@@ -171,6 +170,7 @@
<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/Word/Private/comments.js"></script>
<script type="text/javascript" src="../../../../OfficeWeb/Word/document/empty.js"></script>
......
Word/mobile_editor.html
View file @ 5836973b
......@@ -27,7 +27,6 @@
<script type="text/javascript" src="../../OfficeWeb/Common/CommonDefines.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/NumFormat.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/editorscommon.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/Private/license.js"></script>
<script type="text/javascript" src="../../OfficeWeb/Common/apiCommon.js"></script>
......@@ -109,6 +108,7 @@
<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/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