Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Support rename for wopi

Browse source
This commit is contained in:
Julia Radzhabova 2021-05-12 19:04:14 +03:00
parent f221d2202e
commit 5c7350e28f
8 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
apps/api/wopi/editor-wopi.ejs
View file

@ -67,6 +67,7 @@ div {
var startTime;
var documentChanged;
var sendNotificationTimer;
var sessionId;
var innerAlert = function (message) {
if (console && console.log)
@ -91,7 +92,7 @@ div {
if (window.parent && window.JSON) {
msgData = msgData || {};
msgData["ui-language"] = lang;
msgData["wdUserSession"] = ""; // ???
msgData["wdUserSession"] = sessionId;
var msg = {
"MessageId": msgId,
"SendTime": Date.now(),
@ -232,6 +233,9 @@ div {
"coEditing": {
"mode": "fast",
"change": false
},
"wopi": {
"FileNameMaxLength": fileInfo.FileNameMaxLength && fileInfo.FileNameMaxLength>0 ? fileInfo.FileNameMaxLength : 250
}
},
"events": {
@ -249,6 +253,7 @@ div {
if (postMessageOrigin && (typeof postMessageOrigin === 'string') && postMessageOrigin.charAt(postMessageOrigin.length-1)=='/')
postMessageOrigin = postMessageOrigin.substring(0, postMessageOrigin.length - 1);
lang = config.editorConfig.lang;
sessionId = userAuth.userSessionId;
startTime = Date.now();
docEditor = new DocsAPI.DocEditor("iframeEditor", config);

1
apps/common/main/lib/view/RenameDialog.js
View file

@ -76,6 +76,7 @@ define([
el : $('#id-dlg-newname'),
style : 'width: 100%;',
validateOnBlur: false,
maxLength: me.options.maxLength,
validation : function(value) {
return (/[\t*\+:\"<>?|\\\\/]/gim.test(value)) ? me.txtInvalidName + "*+:\"<>?|\/" : true;
}

3
apps/documenteditor/main/app/controller/LeftMenu.js
View file

@ -276,9 +276,10 @@ define([
documentCaption = me.api.asc_getDocumentName();
(new Common.Views.RenameDialog({
filename: documentCaption,
maxLength: this.mode.wopi ? this.mode.wopi.FileNameMaxLength : undefined,
handler: function(result, value) {
if (result == 'ok' && !_.isEmpty(value.trim()) && documentCaption !== value.trim()) {
Common.Gateway.requestRename(value);
me.mode.wopi ? me.api.asc_wopi_renameFile(value) : Common.Gateway.requestRename(value);
}
Common.NotificationCenter.trigger('edit:complete', me);
}

7
apps/documenteditor/main/app/controller/Main.js
View file

@ -413,6 +413,8 @@ define([
value = parseInt(value);
Common.Utils.InternalSettings.set("de-macros-mode", value);
this.appOptions.wopi = this.editorConfig.wopi;
Common.Controllers.Desktop.init(this.appOptions);
},
@ -2328,6 +2330,11 @@ define([
filemenu.panels && filemenu.panels['info'] && filemenu.panels['info'].updateInfo(this.document);
this.getApplication().getController('Common.Controllers.ReviewChanges').loadDocument({doc:this.document});
Common.Gateway.metaChange(meta);
if (this.appOptions.wopi) {
var idx = meta.title.lastIndexOf('.');
Common.Gateway.requestRename(idx>0 ? meta.title.substring(0, idx) : meta.title);
}
},
onPrint: function() {

3
apps/presentationeditor/main/app/controller/LeftMenu.js
View file

@ -242,9 +242,10 @@ define([
documentCaption = me.api.asc_getDocumentName();
(new Common.Views.RenameDialog({
filename: documentCaption,
maxLength: this.mode.wopi ? this.mode.wopi.FileNameMaxLength : undefined,
handler: function(result, value) {
if (result == 'ok' && !_.isEmpty(value.trim()) && documentCaption !== value.trim()) {
Common.Gateway.requestRename(value);
me.mode.wopi ? me.api.asc_wopi_renameFile(value) : Common.Gateway.requestRename(value);
}
Common.NotificationCenter.trigger('edit:complete', me);
}

7
apps/presentationeditor/main/app/controller/Main.js
View file

@ -373,6 +373,8 @@ define([
value = parseInt(value);
Common.Utils.InternalSettings.set("pe-macros-mode", value);
this.appOptions.wopi = this.editorConfig.wopi;
Common.Controllers.Desktop.init(this.appOptions);
},
@ -1982,6 +1984,11 @@ define([
filemenu.panels && filemenu.panels['info'] && filemenu.panels['info'].updateInfo(this.document);
this.getApplication().getController('Common.Controllers.ReviewChanges').loadDocument({doc:this.document});
Common.Gateway.metaChange(meta);
if (this.appOptions.wopi) {
var idx = meta.title.lastIndexOf('.');
Common.Gateway.requestRename(idx>0 ? meta.title.substring(0, idx) : meta.title);
}
},
onPrint: function() {

3
apps/spreadsheeteditor/main/app/controller/LeftMenu.js
View file

@ -255,9 +255,10 @@ define([
documentCaption = me.api.asc_getDocumentName();
(new Common.Views.RenameDialog({
filename: documentCaption,
maxLength: this.mode.wopi ? this.mode.wopi.FileNameMaxLength : undefined,
handler: function(result, value) {
if (result == 'ok' && !_.isEmpty(value.trim()) && documentCaption !== value.trim()) {
Common.Gateway.requestRename(value);
me.mode.wopi ? me.api.asc_wopi_renameFile(value) : Common.Gateway.requestRename(value);
}
Common.NotificationCenter.trigger('edit:complete', me);
}

7
apps/spreadsheeteditor/main/app/controller/Main.js
View file

@ -438,6 +438,8 @@ define([
value = parseInt(value);
Common.Utils.InternalSettings.set("sse-macros-mode", value);
this.appOptions.wopi = this.editorConfig.wopi;
this.isFrameClosed = (this.appOptions.isEditDiagram || this.appOptions.isEditMailMerge);
Common.Controllers.Desktop.init(this.appOptions);
},
@ -2376,6 +2378,11 @@ define([
filemenu.panels && filemenu.panels['info'] && filemenu.panels['info'].updateInfo(this.appOptions.spreadsheet);
app.getController('Common.Controllers.ReviewChanges').loadDocument({doc:this.appOptions.spreadsheet});
Common.Gateway.metaChange(meta);
if (this.appOptions.wopi) {
var idx = meta.title.lastIndexOf('.');
Common.Gateway.requestRename(idx>0 ? meta.title.substring(0, idx) : meta.title);
}
},
onPrint: function() {