Skip to content

Commit

Permalink
Merge pull request 'release/v8.3.0' (#381) from release/v8.3.0 into d…
Browse files Browse the repository at this point in the history 
…evelop

Reviewed-on: https://git.onlyoffice.com/ONLYOFFICE/sdkjs/pulls/381
  • Loading branch information
@konovalovsergey
konovalovsergey committed Dec 4, 2024
2 parents 78350fa + 04679a7 commit 6b5d936
Show file tree
Hide file tree
Showing 27 changed files with 187 additions and 190 deletions.
28 changes: 14 additions & 14 deletions build/Gruntfile.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ module.exports = function(grunt) {
this.word = null;
this.cell = null;
this.slide = null;
this.draw = null;
this.visio = null;

this.append(pathConfigs);
}
Expand Down Expand Up @@ -133,10 +133,10 @@ module.exports = function(grunt) {
appendOption.call(this, 'word');
appendOption.call(this, 'cell');
appendOption.call(this, 'slide');
appendOption.call(this, 'draw');
appendOption.call(this, 'visio');
};
CConfig.prototype.valid = function () {
return this.externs && this.word && this.cell && this.slide && this.draw;
return this.externs && this.word && this.cell && this.slide && this.visio;
};

function getExterns(config) {
Expand Down Expand Up @@ -178,7 +178,7 @@ module.exports = function(grunt) {
const word = path.join(deploy, 'word');
const cell = path.join(deploy, 'cell');
const slide = path.join(deploy, 'slide');
const draw = path.join(deploy, 'draw');
const visio = path.join(deploy, 'visio');

const level = grunt.option('level') || 'ADVANCED';
const formatting = grunt.option('formatting') || '';
Expand Down Expand Up @@ -240,7 +240,7 @@ module.exports = function(grunt) {
const configWord = configs.word['sdk'];
const configCell = configs.cell['sdk'];
const configSlide = configs.slide['sdk'];
const configDraw = configs.draw['sdk'];
const configVisio = configs.visio['sdk'];

const compilerArgs = getExterns(configs.externs);
if (formatting) {
Expand Down Expand Up @@ -306,8 +306,8 @@ module.exports = function(grunt) {
grunt.initConfig(getCompileConfig(getFilesMin(configSlide), getFilesAll(configSlide), 'sdk-all-min', 'sdk-all', 'slide', path.join(slide , '/')));
grunt.task.run('closure-compiler');
});
grunt.registerTask('compile-draw', 'Compile Draw SDK', function () {
grunt.initConfig(getCompileConfig(getFilesMin(configDraw), getFilesAll(configDraw), 'sdk-all-min', 'sdk-all', 'draw', path.join(draw , '/')));
grunt.registerTask('compile-visio', 'Compile Visio SDK', function () {
grunt.initConfig(getCompileConfig(getFilesMin(configVisio), getFilesAll(configVisio), 'sdk-all-min', 'sdk-all', 'visio', path.join(visio , '/')));
grunt.task.run('closure-compiler');
});
grunt.registerTask('copy-maps', 'Copy maps from deploy to build', function() {
Expand Down Expand Up @@ -361,18 +361,18 @@ module.exports = function(grunt) {
}
]
},
draw: {
visio: {
files: [
{
expand: true,
cwd: draw,
cwd: visio,
src: [
'sdk-all-min.js.map',
'sdk-all.js.map',
],
dest: 'maps',
rename: function (dest, src) {
return path.join(dest , src.replace('sdk', 'draw'));
return path.join(dest , src.replace('sdk', 'visio'));
}
}
]
Expand All @@ -390,15 +390,15 @@ module.exports = function(grunt) {
path.join(cell, 'sdk-all.js.map'),
path.join(slide, 'sdk-all-min.js.map'),
path.join(slide, 'sdk-all.js.map'),
path.join(draw, 'sdk-all-min.js.map'),
path.join(draw, 'sdk-all.js.map'),
path.join(visio, 'sdk-all-min.js.map'),
path.join(visio, 'sdk-all.js.map'),
]
}
}
});
grunt.task.run('copy', 'clean');
});
grunt.registerTask('compile-sdk', ['compile-word', 'compile-cell', 'compile-slide', 'compile-draw']);
grunt.registerTask('compile-sdk', ['compile-word', 'compile-cell', 'compile-slide', 'compile-visio']);
grunt.registerTask('clean-deploy', 'Clean deploy folder before deploying', function () {
grunt.initConfig({
clean: {
Expand Down Expand Up @@ -517,7 +517,7 @@ module.exports = function(grunt) {
writeScripts(configs.word['sdk'], 'word');
writeScripts(configs.cell['sdk'], 'cell');
writeScripts(configs.slide['sdk'], 'slide');
writeScripts(configs.draw['sdk'], 'draw');
writeScripts(configs.visio['sdk'], 'visio');
});
const defaultTasks = ['clean-deploy', 'compile-sdk', 'copy-other'];
if (grunt.option('map')) {
Expand Down
2 changes: 1 addition & 1 deletion common/editorscommon.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2167,7 +2167,7 @@

if (data["subType"] === "connector")
{
window.g_asc_plugins.externalConnectorMessage(data["data"]);
window.g_asc_plugins.externalConnectorMessage(data["data"], event.origin);
return;
}

Expand Down
2 changes: 1 addition & 1 deletion common/externs/global.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ var AscCommon;
var AscCommonWord;
var AscCommonExcel;
var AscCommonSlide;
var AscCommonDraw;
var AscVisio;
var AscBuilder;
var AscWord;
var AscMath;
Expand Down
4 changes: 2 additions & 2 deletions common/plugins.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1241,7 +1241,7 @@
},

// external
externalConnectorMessage : function(data)
externalConnectorMessage : function(data, origin)
{
switch (data["type"])
{
Expand All @@ -1251,7 +1251,7 @@
this.loadExtensionPlugins([{
"name" : "connector",
"guid" : data["guid"],
"baseUrl" : "",
"baseUrl" : (origin !== undefined) ? origin : "",
"isConnector" : true,

"variations" : [
Expand Down
21 changes: 9 additions & 12 deletions configs/draw.json → configs/visio.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@
"common/AdvancedOptions.js",
"common/libfont/engine.js",
"common/libfont/loader.js",
"draw/apiDefines.js",
"visio/apiDefines.js",
"common/collaborativeHistory.js",
"common/CollaborativeEditingBase.js",
"common/macros.js",
"common/apiBase.js",
"common/apiBase_plugins.js",
"word/apiCommon.js",
"draw/api.js",
"visio/api.js",
"common/spell/spell.js",
"word/Editor/Table/TableLook.js",
"cell/utils/utils.js"
Expand Down Expand Up @@ -186,7 +186,7 @@
"slide/Drawing/MorphTransition.js",
"word/Drawing/cachemanager.js",
"slide/Drawing/DrawingDocument.js",
"draw/Drawing/HtmlPage.js",
"visio/Drawing/HtmlPage.js",
"word/Editor/StylesChanges.js",
"word/Editor/RevisionsChange.js",
"word/Editor/Paragraph/RunContent/Types.js",
Expand Down Expand Up @@ -324,9 +324,6 @@
"common/Drawings/Format/LockedCanvas.js",
"slide/apiCommon.js",

"word/apiBuilder.js",
"slide/apiBuilder.js",

"common/versionHistory.js",
"common/clipboard_base.js",
"common/text_input2.js",
Expand All @@ -339,12 +336,12 @@

"vendor/easysax.js",
"common/openxml.js",
"draw/model/ooxmlApi/ooxmlApiIndex.js",
"draw/model/ooxmlApi/convertFunctions.js",
"draw/model/ooxmlApi/get-geometry-from-class.js",
"draw/model/visioFunctionsApi.js",
"draw/model/VisioDocument.js",
"draw/model/overrides.js",
"visio/model/ooxmlApi/ooxmlApiIndex.js",
"visio/model/ooxmlApi/convertFunctions.js",
"visio/model/ooxmlApi/get-geometry-from-class.js",
"visio/model/visioFunctionsApi.js",
"visio/model/VisioDocument.js",
"visio/model/overrides.js",

"slide/Editor/CollaborativeEditing.js"
],
Expand Down
2 changes: 1 addition & 1 deletion tests/draw/api/api-test.html → tests/visio/api/api-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>

<script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
<script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
<script type="text/javascript">
window["WebAssembly"] = undefined
window.sdk_scripts.forEach(function(item){
Expand Down
8 changes: 4 additions & 4 deletions tests/draw/api/api-test.js → tests/visio/api/api-test.js
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions tests/draw/api/api.js → tests/visio/api/api.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
// }

function createCell(n, v, u, e, f) {
let cell = new AscCommonDraw.Cell_Type();
let cell = new AscVisio.Cell_Type();
cell.n = getValueSafe(n, null);
cell.v = getValueSafe(v, null);
cell.u = getValueSafe(u, null);
Expand All @@ -88,7 +88,7 @@

let pointsArray = getValueSafe(argumentsObject.points, []);

let shape = new AscCommonDraw.ShapeSheet_Type();
let shape = new AscVisio.ShapeSheet_Type();
shape.type = "Shape";
shape.lineStyle = 0;
shape.fillStyle = 0;
Expand All @@ -101,18 +101,18 @@
elements.push(createCell("Angle", angle));
elements.push(createCell("FillForegnd", fillForegroundColor));

let section = new AscCommonDraw.Section_Type();
let section = new AscVisio.Section_Type();
section.n = "Geometry";
section.iX = 0;

for (let i = 0; i < pointsArray.length; i++) {
let row;
if (i === 0) {
row = new AscCommonDraw.Row_Type();
row = new AscVisio.Row_Type();
row.t = "RelMoveTo";
row.iX = 1;
} else {
row = new AscCommonDraw.Row_Type();
row = new AscVisio.Row_Type();
row.t = "RelLineTo";
row.iX = i + 1;
}
Expand All @@ -124,22 +124,22 @@
return shape;
}

AscCommonDraw.CPageContents.prototype.addShape = function (shape, pinX, pinY) {
AscVisio.CPageContents.prototype.addShape = function (shape, pinX, pinY) {
shape.iD = this.shapes.length + 1;
shape.elements.push(createCell("PinX", pinX));
shape.elements.push(createCell("PinY", pinY));
this.shapes.push(shape);
}

AscCommonDraw.CVisioDocument.prototype.getPages = function () {
AscVisio.CVisioDocument.prototype.getPages = function () {
let pagesArray = this.pages.page;
return pagesArray;
}

AscCommonDraw.CVisioDocument.prototype.getPageContents = function (i) {
AscVisio.CVisioDocument.prototype.getPageContents = function (i) {
let pageContents = this.pageContents[i];
return pageContents;
}

window['AscCommonDraw'].createShape = createShape;
window['AscVisio'].createShape = createShape;
})(window, window.document);
0 tests/draw/api/test-files.js → tests/visio/api/test-files.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/draw/draw-main/draw-main.html → tests/visio/draw-main/draw-main.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>

<script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
<script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
<script>
window.sdk_scripts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
Expand Down
2 changes: 1 addition & 1 deletion tests/draw/draw-main/draw-main.js → tests/visio/draw-main/draw-main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
+function ($) {
"use strict";
let api = new Asc.asc_docs_api({'id-view' : 'editor_sdk'});
let api = new Asc.VisioEditorApi({'id-view' : 'editor_sdk'});

var holder = document.getElementById("editor_sdk");
holder.ondragover = holderOnDradOver;
Expand Down
2 changes: 1 addition & 1 deletion tests/draw/drawFile/draw-file.html → tests/visio/drawFile/draw-file.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.6.0/jquery.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>

<script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
<script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
<script>
window.sdk_scripts.forEach(function(item){
document.write('<script type="text/javascript" src="' + item + '"><\/script>');
Expand Down
2 changes: 1 addition & 1 deletion tests/draw/drawFile/draw-file.js → tests/visio/drawFile/draw-file.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
*/
+function ($) {
"use strict";
let api = new Asc.asc_docs_api({'id-view' : 'editor_sdk'});
let api = new Asc.VisioEditorApi({'id-view' : 'editor_sdk'});

var holder = document.getElementById("editor_sdk");
holder.ondragover = holderOnDradOver;
Expand Down
0 ...raw/serialize/sax-serialize-files-many.js → ...sio/serialize/sax-serialize-files-many.js
View file
File renamed without changes.
0 tests/draw/serialize/sax-serialize-files.js → tests/visio/serialize/sax-serialize-files.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion tests/draw/serialize/sax-serialize.html → tests/visio/serialize/sax-serialize.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/qunit/2.16.0/qunit.min.js"></script>
<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/xregexp/3.2.0/xregexp-all.min.js"></script>

<script type="text/javascript" src="../../../develop/sdkjs/draw/scripts.js"></script>
<script type="text/javascript" src="../../../develop/sdkjs/visio/scripts.js"></script>
<script type="text/javascript">
window["WebAssembly"] = undefined
window.sdk_scripts.forEach(function(item){
Expand Down
Loading

0 comments on commit 6b5d936

Please sign in to comment.