Skip to content

S
sdkjs
Commit 80188b47 authored by Alexander.Trofimov's avatar Alexander.Trofimov
Browse files
Options

before build concate files with closure sdk-all.

parent 5803f73e
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 69 deletions
build/Gruntfile.js
View file @ 80188b47
...@@ -68,56 +68,95 @@ module.exports = function(grunt) { ...@@ -68,56 +68,95 @@ module.exports = function(grunt) {
grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk']); grunt.registerTask('build_all', ['build_webword_init', 'build_sdk', 'build_webexcel_init', 'build_sdk', 'build_webpowerpoint_init', 'build_sdk']);
grunt.registerTask('compile_sdk_init', function(compilation_level) { grunt.registerTask('concat_sdk_init', function() {
var splitLine = ''; var sdkTmp = 'sdk-tmp.js', sdkAllTmp = 'sdk-all-tmp.js', sdkAllMinTmp = 'sdk-all-min-tmp.js';
var tmp_sdk_path = 'sdk-js-tmp.js'; var srcFilesAll = packageFile['compile']['sdk']['common'];
var sdkDstFolder = packageFile['compile']['sdk']['dst'];
var sdkAllMinDst = sdkDstFolder + '/sdk-all-min.js';
var sdkAllDst = sdkDstFolder + '/sdk-all.js';
var concat_src = [sdkAllDst];
var srcFiles = packageFile['compile']['sdk']['common'];
var sdkOpt = { var sdkOpt = {
compilation_level: compilation_level, compilation_level: 'WHITESPACE_ONLY',
warning_level: 'QUIET', warning_level: 'QUIET',
externs: packageFile['compile']['sdk']['externs'] externs: packageFile['compile']['sdk']['externs']
}; };
if (formatting) {
sdkOpt['formatting'] = formatting;
}
if ('ADVANCED' === compilation_level) {
splitLine = ('PRETTY_PRINT' === formatting) ? 'window.split = "split";' : 'window.split="split";';
} else {
splitLine = ('PRETTY_PRINT' === formatting) ? 'window["split"] = "split";' : 'window["split"]="split";';
}
if (grunt.option('mobile')) { if (grunt.option('mobile')) {
var excludeFiles = packageFile['compile']['sdk']['exclude_mobile'] var excludeFiles = packageFile['compile']['sdk']['exclude_mobile']
srcFiles = srcFiles.filter(function(item) { srcFilesAll = srcFilesAll.filter(function(item) {
return -1 === excludeFiles.indexOf(item); return -1 === excludeFiles.indexOf(item);
}); });
var mobileFiles = packageFile['compile']['sdk']['mobile']; var mobileFiles = packageFile['compile']['sdk']['mobile'];
if(mobileFiles){ if(mobileFiles){
srcFiles = srcFiles.concat(mobileFiles); srcFilesAll = srcFilesAll.concat(mobileFiles);
} }
} }
if (!grunt.option('noprivate')) { if (!grunt.option('noprivate')) {
srcFiles = srcFiles.concat(packageFile['compile']['sdk']['private']); srcFilesAll = srcFilesAll.concat(packageFile['compile']['sdk']['private']);
} }
if (grunt.option('desktop')) { if (grunt.option('desktop')) {
srcFiles = srcFiles.concat(packageFile['compile']['sdk']['desktop']); srcFilesAll = srcFilesAll.concat(packageFile['compile']['sdk']['desktop']);
} }
if (grunt.option('builder')) { if (grunt.option('builder')) {
srcFiles = srcFiles.concat(packageFile['compile']['sdk']['builder']); srcFilesAll = srcFilesAll.concat(packageFile['compile']['sdk']['builder']);
} }
grunt.initConfig({ grunt.initConfig({
pkg: packageFile, concat: {
sdkmin: {
options: {
// banner: '(function(window, undefined) {',
// footer: '})(window);window["split"]="split";'
banner: '',
footer: 'window["split"]="split";'
},
src: packageFile['compile']['sdk']['min'],
dest: sdkAllMinTmp
},
sdk: {
options: {
banner: '(function(window, undefined) {',
footer: '})(window);'
},
src: srcFilesAll,
dest: sdkAllTmp
},
all: {
src: [sdkAllMinTmp, sdkAllTmp],
dest: sdkTmp
}
},
clean: [
sdkAllMinTmp,
sdkAllTmp
]
});
});
grunt.registerTask('compile_sdk_init', function(compilation_level) {
var sdkTmp = 'sdk-tmp.js'
var splitLine = '';
var tmp_sdk_path = 'sdk-js-tmp.js';
var sdkDstFolder = packageFile['compile']['sdk']['dst'];
var sdkAllMinDst = sdkDstFolder + '/sdk-all-min.js';
var sdkAllDst = sdkDstFolder + '/sdk-all.js';
var sdkOpt = {
compilation_level: compilation_level,
warning_level: 'QUIET',
externs: packageFile['compile']['sdk']['externs']
};
if (formatting) {
sdkOpt['formatting'] = formatting;
}
if ('ADVANCED' === compilation_level) {
splitLine = ('PRETTY_PRINT' === formatting) ? 'window.split = "split";' : 'window.split="split";';
} else {
splitLine = ('PRETTY_PRINT' === formatting) ? 'window["split"] = "split";' : 'window["split"]="split";';
}
grunt.initConfig({
'closure-compiler': { 'closure-compiler': {
sdk: { sdk: {
options: sdkOpt, options: sdkOpt,
dest: tmp_sdk_path, dest: tmp_sdk_path,
src: srcFiles src: [sdkTmp]
} }
}, },
splitfile: { splitfile: {
...@@ -136,15 +175,12 @@ module.exports = function(grunt) { ...@@ -136,15 +175,12 @@ module.exports = function(grunt) {
dest: sdkAllMinDst dest: sdkAllMinDst
}, },
sdk: { sdk: {
options: { src: ['license.js', sdkAllDst],
banner: '<%= grunt.file.read("license.js") %>' + '\n(function(window, undefined) {',
footer: '})(window);'
},
src: concat_src,
dest: sdkAllDst dest: sdkAllDst
} }
}, },
clean: [ clean: [
sdkTmp,
tmp_sdk_path tmp_sdk_path
], ],
replace: { replace: {
...@@ -163,6 +199,7 @@ module.exports = function(grunt) { ...@@ -163,6 +199,7 @@ module.exports = function(grunt) {
}); });
}); });
grunt.registerTask('compile_sdk', ['compile_sdk_init:' + level, 'closure-compiler', 'splitfile', 'concat', 'replace', 'clean']); grunt.registerTask('concat_sdk', ['concat_sdk_init', 'concat', 'clean']);
grunt.registerTask('compile_sdk', ['concat_sdk', 'compile_sdk_init:' + level, 'closure-compiler', 'splitfile', 'concat', 'replace', 'clean']);
grunt.registerTask('default', ['build_webpowerpoint']); grunt.registerTask('default', ['build_webpowerpoint']);
}; };
\ No newline at end of file
build/configs/webexcel.json
View file @ 80188b47
{ {
"compile": { "compile": {
"sdk": { "sdk": {
"common": [ "min": [
"../common/browser.js", "../common/browser.js",
"../common/commonDefines.js", "../common/commonDefines.js",
"../common/docscoapicommon.js", "../common/docscoapicommon.js",
"../common/docscoapi.js", "../common/docscoapi.js",
...@@ -15,8 +15,9 @@ ...@@ -15,8 +15,9 @@
"../cell/model/CollaborativeEditing.js", "../cell/model/CollaborativeEditing.js",
"../common/apiBase.js", "../common/apiBase.js",
"../common/Private/license.js", "../common/Private/license.js",
"../cell/api.js", "../cell/api.js"
],
"common": [
"../common/downloaderfiles.js", "../common/downloaderfiles.js",
"../common/NumFormat.js", "../common/NumFormat.js",
"../common/SerializeChart.js", "../common/SerializeChart.js",
......
build/configs/webpowerpoint.json
View file @ 80188b47
{ {
"compile": { "compile": {
"sdk": { "sdk": {
"common": [ "min": [
],
"common": [
"../common/browser.js", "../common/browser.js",
"../common/commonDefines.js", "../common/commonDefines.js",
"../common/downloaderfiles.js", "../common/downloaderfiles.js",
......
build/configs/webword.json
View file @ 80188b47
{ {
"compile": { "compile": {
"sdk": { "sdk": {
"common": [ "min": [
"../common/browser.js", "../common/browser.js",
"../common/commonDefines.js", "../common/commonDefines.js",
"../common/docscoapicommon.js", "../common/docscoapicommon.js",
...@@ -17,9 +17,10 @@ ...@@ -17,9 +17,10 @@
"../word/Editor/CollaborativeEditing.js", "../word/Editor/CollaborativeEditing.js",
"../common/apiBase.js", "../common/apiBase.js",
"../common/Private/license.js", "../common/Private/license.js",
"../word/api.js", "../word/api.js"
],
"../common/downloaderfiles.js", "common": [
"../common/downloaderfiles.js",
"../common/NumFormat.js", "../common/NumFormat.js",
"../common/SerializeChart.js", "../common/SerializeChart.js",
"../common/AdvancedOptions.js", "../common/AdvancedOptions.js",
......
cell/api.js
View file @ 80188b47
...@@ -3549,5 +3549,3 @@ var editor; ...@@ -3549,5 +3549,3 @@ var editor;
prot['asc_isOffline'] = prot.asc_isOffline; prot['asc_isOffline'] = prot.asc_isOffline;
prot['asc_getUrlType'] = prot.asc_getUrlType; prot['asc_getUrlType'] = prot.asc_getUrlType;
})(window); })(window);
// don't delete this line!!! This line used for split minimize files
window['split']='split';
slide/api.js
View file @ 80188b47
...@@ -5735,6 +5735,3 @@ CTextProp.prototype['get_VertAlign'] = CTextProp.prototype.get_VertAlign; ...@@ -5735,6 +5735,3 @@ CTextProp.prototype['get_VertAlign'] = CTextProp.prototype.get_VertAlign;
CTextProp.prototype['get_HighLight'] = CTextProp.prototype.get_HighLight; CTextProp.prototype['get_HighLight'] = CTextProp.prototype.get_HighLight;
CParagraphAndTextProp.prototype['get_ParaPr'] = CParagraphAndTextProp.prototype.get_ParaPr; CParagraphAndTextProp.prototype['get_ParaPr'] = CParagraphAndTextProp.prototype.get_ParaPr;
CParagraphAndTextProp.prototype['get_TextPr'] = CParagraphAndTextProp.prototype.get_TextPr; CParagraphAndTextProp.prototype['get_TextPr'] = CParagraphAndTextProp.prototype.get_TextPr;
// don't delete this line!!! This line used for split minimize files
window['split']='split';
word/Editor/CollaborativeEditing.js
View file @ 80188b47
"use strict"; "use strict";
// Import
var History = AscCommon.History;
/** /**
* *
* @constructor * @constructor
...@@ -28,18 +25,18 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition ...@@ -28,18 +25,18 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition
this.Refresh_DCChanges(); this.Refresh_DCChanges();
// Генерируем свои изменения // Генерируем свои изменения
var StartPoint = ( null === History.SavedIndex ? 0 : History.SavedIndex + 1 ); var StartPoint = ( null === AscCommon.History.SavedIndex ? 0 : AscCommon.History.SavedIndex + 1 );
var LastPoint = -1; var LastPoint = -1;
if (this.m_nUseType <= 0) if (this.m_nUseType <= 0)
{ {
// (ненужные точки предварительно удаляем) // (ненужные точки предварительно удаляем)
History.Clear_Redo(); AscCommon.History.Clear_Redo();
LastPoint = History.Points.length - 1; LastPoint = AscCommon.History.Points.length - 1;
} }
else else
{ {
LastPoint = History.Index; LastPoint = AscCommon.History.Index;
} }
// Просчитаем сколько изменений на сервер пересылать не надо // Просчитаем сколько изменений на сервер пересылать не надо
...@@ -47,16 +44,16 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition ...@@ -47,16 +44,16 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition
var StartPoint2 = Math.min(StartPoint, LastPoint + 1); var StartPoint2 = Math.min(StartPoint, LastPoint + 1);
for (var PointIndex = 0; PointIndex < StartPoint2; PointIndex++) for (var PointIndex = 0; PointIndex < StartPoint2; PointIndex++)
{ {
var Point = History.Points[PointIndex]; var Point = AscCommon.History.Points[PointIndex];
SumIndex += Point.Items.length; SumIndex += Point.Items.length;
} }
var deleteIndex = ( null === History.SavedIndex ? null : SumIndex ); var deleteIndex = ( null === AscCommon.History.SavedIndex ? null : SumIndex );
var aChanges = []; var aChanges = [];
for (var PointIndex = StartPoint; PointIndex <= LastPoint; PointIndex++) for (var PointIndex = StartPoint; PointIndex <= LastPoint; PointIndex++)
{ {
var Point = History.Points[PointIndex]; var Point = AscCommon.History.Points[PointIndex];
History.Update_PointInfoItem(PointIndex, StartPoint, LastPoint, SumIndex, deleteIndex); AscCommon.History.Update_PointInfoItem(PointIndex, StartPoint, LastPoint, SumIndex, deleteIndex);
for (var Index = 0; Index < Point.Items.length; Index++) for (var Index = 0; Index < Point.Items.length; Index++)
{ {
...@@ -80,31 +77,31 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition ...@@ -80,31 +77,31 @@ CWordCollaborativeEditing.prototype.Send_Changes = function(IsUserSave, Addition
this.m_aNeedUnlock.length = 0; this.m_aNeedUnlock.length = 0;
this.m_aNeedUnlock2.length = 0; this.m_aNeedUnlock2.length = 0;
var deleteIndex = ( null === History.SavedIndex ? null : SumIndex ); var deleteIndex = ( null === AscCommon.History.SavedIndex ? null : SumIndex );
if (0 < aChanges.length || null !== deleteIndex) { if (0 < aChanges.length || null !== deleteIndex) {
editor.CoAuthoringApi.saveChanges(aChanges, deleteIndex, AdditionalInfo); editor.CoAuthoringApi.saveChanges(aChanges, deleteIndex, AdditionalInfo);
History.CanNotAddChanges = true; AscCommon.History.CanNotAddChanges = true;
} else } else
editor.CoAuthoringApi.unLockDocument(true); editor.CoAuthoringApi.unLockDocument(true);
if (-1 === this.m_nUseType) if (-1 === this.m_nUseType)
{ {
// Чистим Undo/Redo только во время совместного редактирования // Чистим Undo/Redo только во время совместного редактирования
History.Clear(); AscCommon.History.Clear();
History.SavedIndex = null; AscCommon.History.SavedIndex = null;
} }
else if (0 === this.m_nUseType) else if (0 === this.m_nUseType)
{ {
// Чистим Undo/Redo только во время совместного редактирования // Чистим Undo/Redo только во время совместного редактирования
History.Clear(); AscCommon.History.Clear();
History.SavedIndex = null; AscCommon.History.SavedIndex = null;
this.m_nUseType = 1; this.m_nUseType = 1;
} }
else else
{ {
// Обновляем точку последнего сохранения в истории // Обновляем точку последнего сохранения в истории
History.Reset_SavedIndex(IsUserSave); AscCommon.History.Reset_SavedIndex(IsUserSave);
} }
if (false !== IsUpdateInterface) if (false !== IsUpdateInterface)
...@@ -283,7 +280,7 @@ CWordCollaborativeEditing.prototype.OnCallback_AskLock = function(result) ...@@ -283,7 +280,7 @@ CWordCollaborativeEditing.prototype.OnCallback_AskLock = function(result)
// Делаем откат на 1 шаг назад и удаляем из Undo/Redo эту последнюю точку // Делаем откат на 1 шаг назад и удаляем из Undo/Redo эту последнюю точку
oEditor.WordControl.m_oLogicDocument.Document_Undo(); oEditor.WordControl.m_oLogicDocument.Document_Undo();
History.Clear_Redo(); AscCommon.History.Clear_Redo();
} }
oEditor.isChartEditor = false; oEditor.isChartEditor = false;
...@@ -544,4 +541,5 @@ CWordCollaborativeEditing.prototype.Update_ForeignCursorLabelPosition = function ...@@ -544,4 +541,5 @@ CWordCollaborativeEditing.prototype.Update_ForeignCursorLabelPosition = function
//--------------------------------------------------------export---------------------------------------------------- //--------------------------------------------------------export----------------------------------------------------
window['AscCommon'] = window['AscCommon'] || {}; window['AscCommon'] = window['AscCommon'] || {};
window['AscCommon'].CollaborativeEditing = new CWordCollaborativeEditing(); window['AscCommon'].CWordCollaborativeEditing = CWordCollaborativeEditing;
\ No newline at end of file window['AscCommon'].CollaborativeEditing = new CWordCollaborativeEditing();
word/Editor/Document.js
View file @ 80188b47
...@@ -1252,7 +1252,7 @@ function CDocument(DrawingDocument, isMainLogicDocument) ...@@ -1252,7 +1252,7 @@ function CDocument(DrawingDocument, isMainLogicDocument)
this.History = History; this.History = History;
this.IdCounter = AscCommon.g_oIdCounter; this.IdCounter = AscCommon.g_oIdCounter;
this.TableId = g_oTableId; this.TableId = g_oTableId;
this.CollaborativeEditing = (("undefined" !== typeof(CWordCollaborativeEditing) && AscCommon.CollaborativeEditing instanceof CWordCollaborativeEditing) ? AscCommon.CollaborativeEditing : null); this.CollaborativeEditing = (("undefined" !== typeof(AscCommon.CWordCollaborativeEditing) && AscCommon.CollaborativeEditing instanceof AscCommon.CWordCollaborativeEditing) ? AscCommon.CollaborativeEditing : null);
this.Api = editor; this.Api = editor;
//------------------------------------------------------------------------------------------------------------------ //------------------------------------------------------------------------------------------------------------------
// Выставляем ссылки на главный класс // Выставляем ссылки на главный класс
......
word/api.js
View file @ 80188b47
...@@ -7864,8 +7864,4 @@ asc_CCommentDataWord.prototype['asc_putSolved'] = asc_CCommentDataWord.prototype ...@@ -7864,8 +7864,4 @@ asc_CCommentDataWord.prototype['asc_putSolved'] = asc_CCommentDataWord.prototype
asc_CCommentDataWord.prototype['asc_getReply'] = asc_CCommentDataWord.prototype.asc_getReply; asc_CCommentDataWord.prototype['asc_getReply'] = asc_CCommentDataWord.prototype.asc_getReply;
asc_CCommentDataWord.prototype['asc_addReply'] = asc_CCommentDataWord.prototype.asc_addReply; asc_CCommentDataWord.prototype['asc_addReply'] = asc_CCommentDataWord.prototype.asc_addReply;
asc_CCommentDataWord.prototype['asc_getRepliesCount'] = asc_CCommentDataWord.prototype.asc_getRepliesCount; asc_CCommentDataWord.prototype['asc_getRepliesCount'] = asc_CCommentDataWord.prototype.asc_getRepliesCount;
})(window, window.document); })(window, window.document);
// don't delete this line!!! This line used for split minimize files
window['split']='split';
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