Skip to content

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

delete ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT 

Теперь шрифты генерируются автоматически при запуске сервера.


git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@68340 954022d7-b5bf-4e40-9824-e11837661b57
parent 3c770dcb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 486 additions and 438 deletions
Build/deploy/sdk_configs/nativeword.json
View file @ 6afa2a3a
......@@ -172,10 +172,7 @@
"../../Common/3rdparty/XRegExp/xregexp-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../Word/Build/Log",
"define": [
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"log": "../../Word/Build/Log"
},
"defines": {
"src": [],
......
Build/deploy/sdk_configs/webexcel.json
View file @ 6afa2a3a
......@@ -179,10 +179,7 @@
"../../Common/3rdparty/perfect-scrollbar/perfect-scrollbar.js"
],
"map": "sdk-all.js.map",
"log": "../../Excel/Build/Log",
"define": [
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"log": "../../Excel/Build/Log"
},
"defines": {
"src": [
......
Build/deploy/sdk_configs/webpowerpoint.json
View file @ 6afa2a3a
......@@ -160,10 +160,7 @@
"../../Common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../PowerPoint/Build/Log",
"define": [
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"log": "../../PowerPoint/Build/Log"
},
"defines": {
"src": [
......
Build/deploy/sdk_configs/webword.json
View file @ 6afa2a3a
......@@ -165,10 +165,7 @@
"../../Common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../Word/Build/Log",
"define": [
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"log": "../../Word/Build/Log"
},
"defines": {
"src": [
......@@ -201,15 +198,6 @@
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/Word/"
},
"fonts": {
"expand": true,
"cwd": "../../Fonts/",
"src": [
"js/*.js",
"odttf/*.js"
],
"dest": "<%= pkg.menu_path %>/Fonts/"
},
"doc": {
"expand": true,
"cwd": "../../Word/",
......@@ -220,7 +208,6 @@
"expand": true,
"cwd": "../../Common/",
"src": [
"AllFonts.js",
"spellcheckapisettings.js",
"commonDefines.js",
"apiCommon.js",
......
Build/local/webexcel.json
View file @ 6afa2a3a
......@@ -181,10 +181,7 @@
"../../Common/3rdparty/perfect-scrollbar/perfect-scrollbar.js"
],
"map": "sdk-all.js.map",
"log": "../../Excel/Build/Log",
"define": [
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"log": "../../Excel/Build/Log"
},
"defines": {
"src": [
......
Build/local/webpowerpoint.json
View file @ 6afa2a3a
......@@ -162,10 +162,7 @@
"../../Common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../PowerPoint/Build/Log",
"define": [
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"log": "../../PowerPoint/Build/Log"
},
"defines": {
"src": [
......
Build/local/webword.json
View file @ 6afa2a3a
......@@ -167,10 +167,7 @@
"../../Common/3rdparty/jsrsasign/jsrsasign-latest-all-min.js"
],
"map": "sdk-all.js.map",
"log": "../../Word/Build/Log",
"define": [
"ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT=true"
]
"log": "../../Word/Build/Log"
},
"defines": {
"src": [
......@@ -203,15 +200,6 @@
"src": "sdk-all.js",
"dest": "<%= pkg.menu_path %>/Word/"
},
"fonts": {
"expand": true,
"cwd": "../../Fonts/",
"src": [
"js/*.js",
"odttf/*.js"
],
"dest": "<%= pkg.menu_path %>/Fonts/"
},
"doc": {
"expand": true,
"cwd": "../../Word/",
......@@ -222,7 +210,6 @@
"expand": true,
"cwd": "../../Common/",
"src": [
"AllFonts.js",
"spellcheckapisettings.js",
"commonDefines.js",
"apiCommon.js",
......
Common/AllFonts.js deleted 100644 → 0
View file @ 3c770dcb
This diff is collapsed.
Common/ComboBoxFonts.js 0 → 100644
View file @ 6afa2a3a
This diff is collapsed.
OFFICE_SVN.bat
View file @ 6afa2a3a
......@@ -4,7 +4,6 @@ copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Word\index.h
copy "D:\Projects\wwwrootOffice\apps\documenteditor\main\app.js" "D:\Projects\wwwrootOffice\apps\documenteditor\main\app_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Word\app.js" "D:\Projects\wwwrootOffice\apps\documenteditor\main\app.js"
copy "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index.html" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Excel\index.html" "D:\Projects\wwwrootOffice\apps\spreadsheeteditor\main\index.html"
......@@ -16,3 +15,6 @@ copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\PowerPoint\a
copy "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index.html" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index_new.html"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\PowerPoint\index.html" "D:\Projects\wwwrootOffice\apps\presentationeditor\main\index.html"
copy "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts.js" "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts_new.js"
copy "D:\Projects\activex\AVS\Sources\TeamlabOffice\trunk\OfficeWeb\Common\ComboBoxFonts.js" "D:\Projects\wwwrootOffice\apps\common\main\lib\component\ComboBoxFonts.js"
Word/Drawing/Externals.js
View file @ 6afa2a3a
......@@ -278,9 +278,6 @@ function ZBase32Encoder()
};
}
/** @define {boolean} */
var ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT = false;
var bIsLocalFontsUse = false;
function _is_support_cors()
......@@ -314,8 +311,7 @@ function postLoadScript(scriptName)
if (_files[i].Id == _mess)
{
var bIsUseOrigF = false;
if (ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT && // проставляется в true на этапе сборки
_files[i].CanUseOriginalFormat && // false if load embedded fonts
if (_files[i].CanUseOriginalFormat && // false if load embedded fonts
bIsSupportOriginalFormatFonts) // false if work on ie9
bIsUseOrigF = true;
......@@ -502,8 +498,7 @@ CFontFileLoader.prototype.LoadFontAsync = function(basePath, _callback, isEmbed)
return;
}
if (ASC_DOCS_API_USE_FONTS_ORIGINAL_FORMAT && // проставляется в true на этапе сборки
this.CanUseOriginalFormat && // false if load embedded fonts
if (this.CanUseOriginalFormat && // false if load embedded fonts
bIsSupportOriginalFormatFonts) // false if work on ie9
{
this.LoadFontAsync2(basePath, _callback);
......
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