Skip to content

Commit

Permalink
[feature] Rename visio->diagram
Browse files Browse the repository at this point in the history
  • Loading branch information
konovalovsergey committed Jan 14, 2025
1 parent 47a7585 commit 94aa8b5
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 15 deletions.
6 changes: 3 additions & 3 deletions Common/config/default.json
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@
"favIconUrlCell" : "/web-apps/apps/spreadsheeteditor/main/resources/img/favicon.ico",
"favIconUrlSlide" : "/web-apps/apps/presentationeditor/main/resources/img/favicon.ico",
"favIconUrlPdf" : "/web-apps/apps/pdfeditor/main/resources/img/favicon.ico",
"favIconUrlVisio" : "/web-apps/apps/visioeditor/main/resources/img/favicon.ico",
"favIconUrlDiagram" : "/web-apps/apps/visioeditor/main/resources/img/favicon.ico",
"fileInfoBlockList" : ["FileUrl"],
"pdfView": ["djvu", "xps", "oxps"],
"pdfEdit": ["pdf"],
Expand All @@ -237,8 +237,8 @@
"cellEdit": ["xlsx", "xltx", "xlsm", "ods", "csv"],
"slideView": ["ppt", "ppsx", "ppsm", "pps", "potm", "pot", "fodp", "otp", "sxi", "dps", "dpt", "key"],
"slideEdit": ["pptx", "potx", "pptm", "odp"],
"visioView": ["vsdx", "vstx", "vssx", "vsdm", "vstm", "vssm"],
"visioEdit": [],
"diagramView": ["vsdx", "vstx", "vssx", "vsdm", "vstm", "vssm"],
"diagramEdit": [],
"publicKey": "",
"modulus": "",
"exponent": 65537,
Expand Down
6 changes: 3 additions & 3 deletions DocService/sources/DocsCoServer.js
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ const EditorTypes = {
document : 0,
spreadsheet : 1,
presentation : 2,
visio : 3
diagram : 3
};

const defaultHttpPort = 80, defaultHttpsPort = 443; // Default ports (for http and https)
Expand Down Expand Up @@ -1516,7 +1516,7 @@ function getOpenFormatByEditor(editorType) {
case EditorTypes.presentation:
res = constants.AVS_OFFICESTUDIO_FILE_CANVAS_PRESENTATION;
break;
case EditorTypes.visio:
case EditorTypes.diagram:
res = constants.AVS_OFFICESTUDIO_FILE_DRAW_VSDX;
break;
default:
Expand Down Expand Up @@ -3095,7 +3095,7 @@ exports.install = function(server, callbackFunction) {
fCheckLock = _checkLockExcel;
break;
case EditorTypes.presentation:
case EditorTypes.visio:
case EditorTypes.diagram:
// PP
fCheckLock = _checkLockPresentation;
break;
Expand Down
18 changes: 9 additions & 9 deletions DocService/sources/wopiClient.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,14 +75,14 @@ const cfgWopiCellView = config.get('wopi.cellView');
const cfgWopiCellEdit = config.get('wopi.cellEdit');
const cfgWopiSlideView = config.get('wopi.slideView');
const cfgWopiSlideEdit = config.get('wopi.slideEdit');
const cfgWopiVisioView = config.get('wopi.visioView');
const cfgWopiVisioEdit = config.get('wopi.visioEdit');
const cfgWopiDiagramView = config.get('wopi.diagramView');
const cfgWopiDiagramEdit = config.get('wopi.diagramEdit');
const cfgWopiForms = config.get('wopi.forms');
const cfgWopiFavIconUrlWord = config.get('wopi.favIconUrlWord');
const cfgWopiFavIconUrlCell = config.get('wopi.favIconUrlCell');
const cfgWopiFavIconUrlSlide = config.get('wopi.favIconUrlSlide');
const cfgWopiFavIconUrlPdf = config.get('wopi.favIconUrlPdf');
const cfgWopiFavIconUrlVisio = config.get('wopi.favIconUrlVisio');
const cfgWopiFavIconUrlDiagram = config.get('wopi.favIconUrlDiagram');
const cfgWopiPublicKey = config.get('wopi.publicKey');
const cfgWopiModulus = config.get('wopi.modulus');
const cfgWopiExponent = config.get('wopi.exponent');
Expand Down Expand Up @@ -157,14 +157,14 @@ function discovery(req, res) {
const tenWopiCellEdit = ctx.getCfg('wopi.cellEdit', cfgWopiCellEdit);
const tenWopiSlideView = ctx.getCfg('wopi.slideView', cfgWopiSlideView);
const tenWopiSlideEdit = ctx.getCfg('wopi.slideEdit', cfgWopiSlideEdit);
const tenWopiVisioView = ctx.getCfg('wopi.visioView', cfgWopiVisioView);
const tenWopiVisioEdit = ctx.getCfg('wopi.visioEdit', cfgWopiVisioEdit);
const tenWopiDiagramView = ctx.getCfg('wopi.slideView', cfgWopiDiagramView);
const tenWopiDiagramEdit = ctx.getCfg('wopi.slideEdit', cfgWopiDiagramEdit);
const tenWopiForms = ctx.getCfg('wopi.forms', cfgWopiForms);
const tenWopiFavIconUrlWord = ctx.getCfg('wopi.favIconUrlWord', cfgWopiFavIconUrlWord);
const tenWopiFavIconUrlCell = ctx.getCfg('wopi.favIconUrlCell', cfgWopiFavIconUrlCell);
const tenWopiFavIconUrlSlide = ctx.getCfg('wopi.favIconUrlSlide', cfgWopiFavIconUrlSlide);
const tenWopiFavIconUrlPdf = ctx.getCfg('wopi.favIconUrlPdf', cfgWopiFavIconUrlPdf);
const tenWopiFavIconUrlVisio = ctx.getCfg('wopi.favIconUrlVisio', cfgWopiFavIconUrlVisio);
const tenWopiFavIconUrlDiagram = ctx.getCfg('wopi.favIconUrlDiagram', cfgWopiFavIconUrlDiagram);
const tenWopiPublicKey = ctx.getCfg('wopi.publicKey', cfgWopiPublicKey);
const tenWopiModulus = ctx.getCfg('wopi.modulus', cfgWopiModulus);
const tenWopiExponent = ctx.getCfg('wopi.exponent', cfgWopiExponent);
Expand All @@ -185,9 +185,9 @@ function discovery(req, res) {
let documentTypes = [`word`, `cell`, `slide`, `pdf`];
if (true) {//todo check packageType
names.push('Visio');
favIconUrls.push(tenWopiFavIconUrlVisio);
exts.push({targetext: null, view: tenWopiVisioView, edit: tenWopiVisioEdit});
documentTypes.push(`visio`);
favIconUrls.push(tenWopiFavIconUrlDiagram);
exts.push({targetext: null, view: tenWopiDiagramView, edit: tenWopiDiagramEdit});
documentTypes.push(`diagram`);
}

let templatesFolderExtsCache = yield getTemplatesFolderExts(ctx);
Expand Down

0 comments on commit 94aa8b5

Please sign in to comment.