pengjunjie/document-server-integration
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/document-server-integration.git synced 2026-04-07 14:06:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/origin/develop' into feature/mobile-design

Browse Source
This commit is contained in:
Sergey Linnik
2024-06-14 13:31:31 +03:00
parent 259c121707 27c01046af
commit d564e78b2c
32 changed files with 127 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitmodules vendored
View File

@ -5,7 +5,7 @@
[submodule "web/documentserver-example/nodejs/public/assets/document-formats"] [submodule "web/documentserver-example/nodejs/public/assets/document-formats"]
path = web/documentserver-example/nodejs/public/assets/document-formats path = web/documentserver-example/nodejs/public/assets/document-formats
url = https://github.com/ONLYOFFICE/document-formats url = https://github.com/ONLYOFFICE/document-formats
branch = feature/v8.0 branch = feature/v8.1
[submodule "web/documentserver-example/csharp-mvc/assets/document-templates"] [submodule "web/documentserver-example/csharp-mvc/assets/document-templates"]
path = web/documentserver-example/csharp-mvc/assets/document-templates path = web/documentserver-example/csharp-mvc/assets/document-templates
url = https://github.com/ONLYOFFICE/document-templates url = https://github.com/ONLYOFFICE/document-templates

12
CHANGELOG.md
View File

@ -2,17 +2,23 @@
- forgotten files - forgotten files
- java-spring: using java docs-integration-sdk - java-spring: using java docs-integration-sdk
- en-GB skin language
- save as for pdf - save as for pdf
- fill permission in embedded mode
- delete all files - delete all files
- handling conversion -9 error - handling conversion -9 error
- nodejs: wopi formsubmit icon
- nodejs: tabs menu - nodejs: tabs menu
- change insert image - change insert image
- different goback for users - different goback for users
- nodejs: converting function on index page - nodejs: converting function on index page
## 1.9.0
- nodejs: filling by default
- nodejs: docxf, oform as pdf documentType
- nodejs: creating and editing pdf instead docxf
- nodejs: wopi formsubmit icon
- nodejs: close editor - nodejs: close editor
- en-GB, sr-Cyrl-RS skin languages
- switching from filling to editing
- fill permission in embedded mode
## 1.8.0 ## 1.8.0
- nodejs: pdf, djvu, xps, oxps as pdf documentType - nodejs: pdf, djvu, xps, oxps as pdf documentType

1
web/documentserver-example/csharp-mvc/App_Start/BundleConfig.cs
View File

@ -38,6 +38,7 @@ namespace OnlineEditorsExampleMVC
// create the main script bundle // create the main script bundle
bundles.Add(new ScriptBundle("~/bundles/scripts").Include( bundles.Add(new ScriptBundle("~/bundles/scripts").Include(
"~/Scripts/formats.js",
"~/Scripts/jscript.js" "~/Scripts/jscript.js"
)); ));

2
web/documentserver-example/csharp-mvc/Views/Home/Editor.aspx
View File

@ -68,7 +68,7 @@
// the user is trying to switch the document from the viewing into the editing mode // the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () { var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), ""); location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
}; };
// an error or some other specific event occurs // an error or some other specific event occurs

4
web/documentserver-example/csharp-mvc/web.appsettings.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<appSettings> <appSettings>
<clear /> <clear />
<add key="version" value="1.8.0"/> <add key="version" value="1.9.0"/>
<add key="filesize-max" value="52428800"/> <add key="filesize-max" value="52428800"/>
<add key="storage-path" value=""/> <add key="storage-path" value=""/>
@ -16,7 +16,7 @@
<add key="files.docservice.verify-peer-off" value="true"/> <add key="files.docservice.verify-peer-off" value="true"/>
<add key="files.docservice.languages" value="en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-RS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language"/> <add key="files.docservice.languages" value="en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language"/>
<add key="files.docservice.url.site" value="http://documentserver/"/> <add key="files.docservice.url.site" value="http://documentserver/"/>

2
web/documentserver-example/csharp/DocEditor.aspx
View File

@ -86,7 +86,7 @@
// the user is trying to switch the document from the viewing into the editing mode // the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () { var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), ""); location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
}; };
// an error or some other specific event occurs // an error or some other specific event occurs

4
web/documentserver-example/csharp/settings.config
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8" ?> <?xml version="1.0" encoding="utf-8" ?>
<appSettings> <appSettings>
<clear /> <clear />
<add key="version" value="1.8.0"/> <add key="version" value="1.9.0"/>
<add key="filesize-max" value="52428800"/> <add key="filesize-max" value="52428800"/>
<add key="storage-path" value=""/> <add key="storage-path" value=""/>
@ -15,7 +15,7 @@
<add key="files.docservice.token.useforrequest" value="true" /> <add key="files.docservice.token.useforrequest" value="true" />
<add key="files.docservice.languages" value="en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-RS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/> <add key="files.docservice.languages" value="en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA: Test Language"/>
<add key="files.docservice.url.site" value="http://documentserver/"/> <add key="files.docservice.url.site" value="http://documentserver/"/>

4
web/documentserver-example/java-spring/src/main/resources/application.properties
View File

@ -1,4 +1,4 @@
server.version=1.8.0 server.version=1.9.0
server.address= server.address=
server.port=4000 server.port=4000
@ -15,7 +15,7 @@ files.docservice.history.postfix=-hist
files.docservice.url.example= files.docservice.url.example=
files.docservice.languages=en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-RS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language files.docservice.languages=en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
docservice.url=http://documentserver/ docservice.url=http://documentserver/
docservice.ignoreSSLCertificate=false docservice.ignoreSSLCertificate=false

2
web/documentserver-example/java-spring/src/main/resources/templates/editor.html
View File

@ -52,7 +52,7 @@
// the user is trying to switch the document from the viewing into the editing mode // the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () { var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("\&?action=view", "i"), ""); location.href = location.href.replace(RegExp("\&?action=\\w+", "i"), "") + "&action=edit";
}; };
// an error or some other specific event occurs // an error or some other specific event occurs

4
web/documentserver-example/java/src/main/resources/settings.properties
View File

@ -1,4 +1,4 @@
version=1.8.0 version=1.9.0
filesize-max=5242880 filesize-max=5242880
storage-folder=app_data storage-folder=app_data
@ -14,7 +14,7 @@ files.docservice.url.api=web-apps/apps/api/documents/api.js
files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html
files.docservice.url.example= files.docservice.url.example=
files.docservice.languages=en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Latn-RS:Serbian|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language files.docservice.languages=en:English|ar:Arabic|hy:Armenian|az:Azerbaijani|eu:Basque|be:Belarusian|bg:Bulgarian|ca:Catalan|zh:Chinese (Simplified)|zh-TW:Chinese (Traditional)|cs:Czech|da:Danish|nl:Dutch|en-GB:English (United Kingdom)|fi:Finnish|fr:French|gl:Galego|de:German|el:Greek|hu:Hungarian|id:Indonesian|it:Italian|ja:Japanese|ko:Korean|lo:Lao|lv:Latvian|ms:Malay (Malaysia)|no:Norwegian|pl:Polish|pt:Portuguese (Brazil)|pt-PT:Portuguese (Portugal)|ro:Romanian|ru:Russian|sr-Cyrl-RS:Serbian (Cyrillic)|sr-Latn-RS:Serbian (Latin)|si:Sinhala (Sri Lanka)|sk:Slovak|sl:Slovenian|es:Spanish|sv:Swedish|tr:Turkish|uk:Ukrainian|vi:Vietnamese|aa-AA:Test Language
files.docservice.secret= files.docservice.secret=
files.docservice.header=Authorization files.docservice.header=Authorization

2
web/documentserver-example/java/src/main/webapp/editor.jsp
View File

@ -58,7 +58,7 @@
// the user is trying to switch the document from the viewing into the editing mode // the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () { var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("mode=view\&?", "i"), ""); location.href = location.href.replace(RegExp("mode=\\w+\&?", "i"), "") + "&mode=edit";
}; };
// an error or some other specific event occurs // an error or some other specific event occurs

10
web/documentserver-example/nodejs/app.js
View File

@ -1019,7 +1019,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
const fName = req.DocManager.createDemo(!!req.query.sample, fileExt, userid, name, false); const fName = req.DocManager.createDemo(!!req.query.sample, fileExt, userid, name, false);
// get the redirect path // get the redirect path
const redirectPath = `${req.DocManager.getServerUrl()}/editor?fileName=` const redirectPath = `${req.DocManager.getServerUrl()}/editor?mode=edit&fileName=`
+ `${encodeURIComponent(fName)}${req.DocManager.getCustomParams()}`; + `${encodeURIComponent(fName)}${req.DocManager.getCustomParams()}`;
res.redirect(redirectPath); res.redirect(redirectPath);
return; return;
@ -1095,11 +1095,13 @@ app.get('/editor', (req, res) => { // define a handler for editing document
const key = req.DocManager.getKey(fileName); const key = req.DocManager.getKey(fileName);
const url = req.DocManager.getDownloadUrl(fileName, true); const url = req.DocManager.getDownloadUrl(fileName, true);
const directUrl = req.DocManager.getDownloadUrl(fileName); const directUrl = req.DocManager.getDownloadUrl(fileName);
let mode = req.query.mode || 'edit'; // mode: view/edit/review/comment/fillForms/embedded
let canFill = fileUtility.getFillExtensions().indexOf(fileExt.slice(1)) !== -1 // check if this file can be filled
let mode = req.query.mode || (canFill ? 'fillForms' : 'edit'); // mode: view/edit/review/comment/fillForms/embedded
let canEdit = fileUtility.getEditExtensions().indexOf(fileExt.slice(1)) !== -1; // check if this file can be edited let canEdit = fileUtility.getEditExtensions().indexOf(fileExt.slice(1)) !== -1; // check if this file can be edited
if (((!canEdit && mode === 'edit') || mode === 'fillForms') if (((!canEdit && mode === 'edit') || mode === 'fillForms')
&& fileUtility.getFillExtensions().indexOf(fileExt.slice(1)) !== -1) { && canFill) {
mode = 'fillForms'; mode = 'fillForms';
canEdit = true; canEdit = true;
} }
@ -1108,7 +1110,7 @@ app.get('/editor', (req, res) => { // define a handler for editing document
} }
let submitForm = false; let submitForm = false;
if (mode === 'fillForms') { if (mode === 'fillForms' || mode === "embedded") {
submitForm = userid === 'uid-1'; submitForm = userid === 'uid-1';
} }

5
web/documentserver-example/nodejs/config/default.json
View File

@ -1,5 +1,5 @@
{ {
"version": "1.8.0", "version": "1.9.0",
"log": { "log": {
"appenders": [ "appenders": [
{ {
@ -72,7 +72,8 @@
"pt-PT": "Portuguese (Portugal)", "pt-PT": "Portuguese (Portugal)",
"ro": "Romanian", "ro": "Romanian",
"ru": "Russian", "ru": "Russian",
"sr-Latn-RS": "Serbian", "sr-Cyrl-RS": "Serbian (Cyrillic)",
"sr-Latn-RS": "Serbian (Latin)",
"si": "Sinhala (Sri Lanka)", "si": "Sinhala (Sri Lanka)",
"sk": "Slovak", "sk": "Slovak",
"sl": "Slovenian", "sl": "Slovenian",

2
web/documentserver-example/nodejs/helpers/wopi/utils.js
View File

@ -163,7 +163,7 @@ const getEditNewText = function getEditNewText(ext) {
return 'Spreadsheet'; return 'Spreadsheet';
case 'pptx': case 'pptx':
return 'Presentation'; return 'Presentation';
case 'docxf': case 'pdf':
return 'PDF form'; return 'PDF form';
default: default:
return ext.toUpperCase(); return ext.toUpperCase();

2
web/documentserver-example/nodejs/public/assets/document-formats

Submodule web/documentserver-example/nodejs/public/assets/document-formats updated: 7b7c406cc6...62e62067a0

2
web/documentserver-example/nodejs/public/assets/document-templates

Submodule web/documentserver-example/nodejs/public/assets/document-templates updated: 1fc823afa9...c9fc1ee6be

1
web/documentserver-example/nodejs/public/images/file_docxf.svg
View File

@ -1 +0,0 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg"><path d="M0 3c0-1.65685 1.34315-3 3-3h20l7 7v30c0 1.6569-1.3431 3-3 3H3c-1.65685 0-3-1.3431-3-3V3z" fill="#27ABA3"/><path d="M23 0l7 7h-4c-1.6569 0-3-1.34315-3-3V0z" fill="#008078"/><path fill-rule="evenodd" clip-rule="evenodd" d="M24 14H6v7h18v-7zm-.8182 5.9978H6.81818V15H23.1818v4.9978zM24 23H6v7h18v-7zm-.8182 5.9978H6.81818V24H23.1818v4.9978z" fill="#fff"/></svg>
Side by Side

Before

Width:  |  Height:  |  Size: 463 B

5
web/documentserver-example/nodejs/public/images/file_pdf.svg Normal file
View File

@ -0,0 +1,5 @@
<svg width="30" height="40" viewBox="0 0 30 40" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M0 3C0 1.34315 1.34315 0 3 0H23L30 7V37C30 38.6569 28.6569 40 27 40H3C1.34315 40 0 38.6569 0 37V3Z" fill="#9E1919"/>
<path fill-rule="evenodd" clip-rule="evenodd" d="M17.0062 15V16.0065H24V15H17.0062ZM17.0062 19V20.0163H24V19H17.0062ZM24 23H17.0062V24.0261H24V23ZM6 28V27.0293H24V28H6ZM7 16H14V23H7V16ZM6 15H7H14H15V16V23V24H14H7H6V23V16V15Z" fill="white"/>
<path d="M23 0L30 7H26C24.3431 7 23 5.65685 23 4V0Z" fill="black" fill-opacity="0.25"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 558 B

BIN
web/documentserver-example/nodejs/public/images/pdf.ico
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 9.1 KiB

After

Width:  |  Height:  |  Size: 5.3 KiB

4
web/documentserver-example/nodejs/public/stylesheets/stylesheet.css
View File

@ -172,9 +172,9 @@ label .checkbox {
background-image: url("../images/file_pptx.svg"); background-image: url("../images/file_pptx.svg");
} }
.try-editor.docxf, .try-editor.pdf,
.try-editor.form { .try-editor.form {
background-image: url("../images/file_docxf.svg"); background-image: url("../images/file_pdf.svg");
} }
.side-option { .side-option {

2
web/documentserver-example/nodejs/views/editor.ejs
View File

@ -74,7 +74,7 @@
}; };
var onRequestEditRights = function () { // the user is trying to switch the document from the viewing into the editing mode var onRequestEditRights = function () { // the user is trying to switch the document from the viewing into the editing mode
location.href = location.href.replace(RegExp("mode=view\&?", "i"), ""); location.href = location.href.replace(RegExp("mode=\\w+\&?", "i"), "") + "&mode=edit";
}; };
var onRequestHistory = function (event) { // the user is trying to show the document version history var onRequestHistory = function (event) { // the user is trying to show the document version history

8
web/documentserver-example/nodejs/views/index.ejs
View File

@ -70,7 +70,7 @@
<a class="try-editor slide reload-page action-link" target="_blank" href="editor?fileExt=pptx" title="Create new presentation">Presentation</a> <a class="try-editor slide reload-page action-link" target="_blank" href="editor?fileExt=pptx" title="Create new presentation">Presentation</a>
</li> </li>
<li> <li>
<a class="try-editor form reload-page action-link" target="_blank" href="editor?fileExt=docxf" title="Create new PDF form">PDF form</a> <a class="try-editor form reload-page action-link" target="_blank" href="editor?fileExt=pdf" title="Create new PDF form">PDF form</a>
</li> </li>
</ul> </ul>
<label class="side-option"> <label class="side-option">
@ -193,13 +193,17 @@
</td> </td>
<% if (storedFiles[i].canEdit) { %> <% if (storedFiles[i].canEdit) { %>
<td class="contentCells contentCells-icon"> <td class="contentCells contentCells-icon">
<a class="action-link" href="editor?type=desktop&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank"> <a class="action-link" href="editor?type=desktop&mode=edit&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank">
<img src="images/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens" /></a> <img src="images/desktop.svg" alt="Open in editor for full size screens" title="Open in editor for full size screens" /></a>
</td> </td>
<% if (storedFiles[i].documentType !== "pdf") { %>
<td class="contentCells contentCells-icon"> <td class="contentCells contentCells-icon">
<a class="action-link" href="editor?type=desktop&mode=comment&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank"> <a class="action-link" href="editor?type=desktop&mode=comment&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank">
<img src="images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment" /></a> <img src="images/comment.svg" alt="Open in editor for comment" title="Open in editor for comment" /></a>
</td> </td>
<% } else { %>
<td class="contentCells contentCells-icon"></td>
<% } %>
<% if (storedFiles[i].documentType == "word") { %> <% if (storedFiles[i].documentType == "word") { %>
<td class="contentCells contentCells-icon"> <td class="contentCells contentCells-icon">
<a class="action-link" href="editor?type=desktop&mode=review&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank"> <a class="action-link" href="editor?type=desktop&mode=review&fileName=<%= encodeURIComponent(storedFiles[i].name) %>" target="_blank">

2
web/documentserver-example/php/src/ajax.php
View File

@ -347,7 +347,7 @@ function files()
try { try {
@header("Content-Type", "application/json"); @header("Content-Type", "application/json");
$fileId = $_GET["fileId"]; $fileId = isset($_GET["fileId"]) && !empty($_GET["fileId"]) ? $_GET["fileId"] : null;
$result = getFileInfo($fileId); $result = getFileInfo($fileId);
return $result; return $result;

5
web/documentserver-example/php/src/configuration/ConfigurationManager.php
View File

@ -22,7 +22,7 @@ use Example\Common\URL;
class ConfigurationManager class ConfigurationManager
{ {
public string $version = '1.8.0'; public string $version = '1.9.0';
public function getVersion(): string public function getVersion(): string
{ {
@ -202,7 +202,8 @@ class ConfigurationManager
'pt-PT' => 'Portuguese (Portugal)', 'pt-PT' => 'Portuguese (Portugal)',
'ro' => 'Romanian', 'ro' => 'Romanian',
'ru' => 'Russian', 'ru' => 'Russian',
'sr-Latn-RS' => 'Serbian', 'sr-Cyrl-RS' => 'Serbian (Cyrillic)',
'sr-Latn-RS' => 'Serbian (Latin)',
'si' => 'Sinhala (Sri Lanka)', 'si' => 'Sinhala (Sri Lanka)',
'sk' => 'Slovak', 'sk' => 'Slovak',
'sl' => 'Slovenian', 'sl' => 'Slovenian',

2
web/documentserver-example/php/templates/docEditor.tpl
View File

@ -67,7 +67,7 @@
// the user is trying to switch the document from the viewing into the editing mode // the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () { var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("action=view\&?", "i"), ""); location.href = location.href.replace(RegExp("action=\\w+\&?", "i"), "") + "&action=edit";
}; };
// an error or some other specific event occurs // an error or some other specific event occurs

5
web/documentserver-example/python/src/configuration/configuration.py
View File

@ -22,7 +22,7 @@ from src.common import string
class ConfigurationManager: class ConfigurationManager:
version = '1.8.0' version = '1.9.0'
def getVersion(self) -> str: def getVersion(self) -> str:
return self.version return self.version
@ -159,7 +159,8 @@ class ConfigurationManager:
'pt-PT': 'Portuguese (Portugal)', 'pt-PT': 'Portuguese (Portugal)',
'ro': 'Romanian', 'ro': 'Romanian',
'ru': 'Russian', 'ru': 'Russian',
'sr-Latn-RS': 'Serbian', 'sr-Cyrl-RS': 'Serbian (Cyrillic)',
'sr-Latn-RS': 'Serbian (Latin)',
'si': 'Sinhala (Sri Lanka)', 'si': 'Sinhala (Sri Lanka)',
'sk': 'Slovak', 'sk': 'Slovak',
'sl': 'Slovenian', 'sl': 'Slovenian',

2
web/documentserver-example/python/templates/editor.html
View File

@ -64,7 +64,7 @@
// the user is trying to switch the document from the viewing into the editing mode // the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () { var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("mode=view\&?", "i"), ""); location.href = location.href.replace(RegExp("mode=\\w+\&?", "i"), "") + "&mode=edit";
}; };
// an error or some other specific event occurs // an error or some other specific event occurs

128
web/documentserver-example/ruby/Gemfile.lock
View File

@ -8,67 +8,67 @@ GIT
GEM GEM
remote: https://rubygems.org/ remote: https://rubygems.org/
specs: specs:
actioncable (7.0.8.1) actioncable (7.0.8.4)
actionpack (= 7.0.8.1) actionpack (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
nio4r (~> 2.0) nio4r (~> 2.0)
websocket-driver (>= 0.6.1) websocket-driver (>= 0.6.1)
actionmailbox (7.0.8.1) actionmailbox (7.0.8.4)
actionpack (= 7.0.8.1) actionpack (= 7.0.8.4)
activejob (= 7.0.8.1) activejob (= 7.0.8.4)
activerecord (= 7.0.8.1) activerecord (= 7.0.8.4)
activestorage (= 7.0.8.1) activestorage (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
mail (>= 2.7.1) mail (>= 2.7.1)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
actionmailer (7.0.8.1) actionmailer (7.0.8.4)
actionpack (= 7.0.8.1) actionpack (= 7.0.8.4)
actionview (= 7.0.8.1) actionview (= 7.0.8.4)
activejob (= 7.0.8.1) activejob (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
mail (~> 2.5, >= 2.5.4) mail (~> 2.5, >= 2.5.4)
net-imap net-imap
net-pop net-pop
net-smtp net-smtp
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
actionpack (7.0.8.1) actionpack (7.0.8.4)
actionview (= 7.0.8.1) actionview (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
rack (~> 2.0, >= 2.2.4) rack (~> 2.0, >= 2.2.4)
rack-test (>= 0.6.3) rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.2.0) rails-html-sanitizer (~> 1.0, >= 1.2.0)
actiontext (7.0.8.1) actiontext (7.0.8.4)
actionpack (= 7.0.8.1) actionpack (= 7.0.8.4)
activerecord (= 7.0.8.1) activerecord (= 7.0.8.4)
activestorage (= 7.0.8.1) activestorage (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
globalid (>= 0.6.0) globalid (>= 0.6.0)
nokogiri (>= 1.8.5) nokogiri (>= 1.8.5)
actionview (7.0.8.1) actionview (7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
builder (~> 3.1) builder (~> 3.1)
erubi (~> 1.4) erubi (~> 1.4)
rails-dom-testing (~> 2.0) rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.1, >= 1.2.0) rails-html-sanitizer (~> 1.1, >= 1.2.0)
activejob (7.0.8.1) activejob (7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
globalid (>= 0.3.6) globalid (>= 0.3.6)
activemodel (7.0.8.1) activemodel (7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
activerecord (7.0.8.1) activerecord (7.0.8.4)
activemodel (= 7.0.8.1) activemodel (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
activestorage (7.0.8.1) activestorage (7.0.8.4)
actionpack (= 7.0.8.1) actionpack (= 7.0.8.4)
activejob (= 7.0.8.1) activejob (= 7.0.8.4)
activerecord (= 7.0.8.1) activerecord (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
marcel (~> 1.0) marcel (~> 1.0)
mini_mime (>= 1.1.0) mini_mime (>= 1.1.0)
activesupport (7.0.8.1) activesupport (7.0.8.4)
concurrent-ruby (~> 1.0, >= 1.0.2) concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2) i18n (>= 1.6, < 2)
minitest (>= 5.1) minitest (>= 5.1)
@ -85,17 +85,16 @@ GEM
coffee-script-source coffee-script-source
execjs execjs
coffee-script-source (1.12.2) coffee-script-source (1.12.2)
concurrent-ruby (1.2.3) concurrent-ruby (1.3.1)
crass (1.0.6) crass (1.0.6)
dalli (3.2.8) dalli (3.2.8)
date (3.3.4) date (3.3.4)
erubi (1.12.0) erubi (1.12.0)
execjs (2.9.1) execjs (2.9.1)
ffi (1.16.3) ffi (1.16.3)
ffi (1.16.3-x64-mingw-ucrt)
globalid (1.2.1) globalid (1.2.1)
activesupport (>= 6.1) activesupport (>= 6.1)
i18n (1.14.1) i18n (1.14.5)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
jbuilder (2.11.5) jbuilder (2.11.5)
actionview (>= 5.0.0) actionview (>= 5.0.0)
@ -121,7 +120,7 @@ GEM
marcel (1.0.2) marcel (1.0.2)
method_source (1.0.0) method_source (1.0.0)
mini_mime (1.1.5) mini_mime (1.1.5)
minitest (5.22.2) minitest (5.23.1)
net-imap (0.4.10) net-imap (0.4.10)
date date
net-protocol net-protocol
@ -133,11 +132,9 @@ GEM
net-protocol net-protocol
netrc (0.11.0) netrc (0.11.0)
nio4r (2.7.0) nio4r (2.7.0)
nokogiri (1.16.2-arm64-darwin) nokogiri (1.16.5-arm64-darwin)
racc (~> 1.4) racc (~> 1.4)
nokogiri (1.16.2-x64-mingw-ucrt) nokogiri (1.16.5-x86_64-linux)
racc (~> 1.4)
nokogiri (1.16.2-x86_64-linux)
racc (~> 1.4) racc (~> 1.4)
parallel (1.24.0) parallel (1.24.0)
parser (3.3.0.5) parser (3.3.0.5)
@ -148,26 +145,26 @@ GEM
prism (0.24.0) prism (0.24.0)
psych (5.1.2) psych (5.1.2)
stringio stringio
racc (1.7.3) racc (1.8.0)
rack (2.2.8.1) rack (2.2.9)
rack-cors (2.0.2) rack-cors (2.0.2)
rack (>= 2.0.0) rack (>= 2.0.0)
rack-test (2.1.0) rack-test (2.1.0)
rack (>= 1.3) rack (>= 1.3)
rails (7.0.8.1) rails (7.0.8.4)
actioncable (= 7.0.8.1) actioncable (= 7.0.8.4)
actionmailbox (= 7.0.8.1) actionmailbox (= 7.0.8.4)
actionmailer (= 7.0.8.1) actionmailer (= 7.0.8.4)
actionpack (= 7.0.8.1) actionpack (= 7.0.8.4)
actiontext (= 7.0.8.1) actiontext (= 7.0.8.4)
actionview (= 7.0.8.1) actionview (= 7.0.8.4)
activejob (= 7.0.8.1) activejob (= 7.0.8.4)
activemodel (= 7.0.8.1) activemodel (= 7.0.8.4)
activerecord (= 7.0.8.1) activerecord (= 7.0.8.4)
activestorage (= 7.0.8.1) activestorage (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
bundler (>= 1.15.0) bundler (>= 1.15.0)
railties (= 7.0.8.1) railties (= 7.0.8.4)
rails-dom-testing (2.2.0) rails-dom-testing (2.2.0)
activesupport (>= 5.0.0) activesupport (>= 5.0.0)
minitest minitest
@ -175,9 +172,9 @@ GEM
rails-html-sanitizer (1.6.0) rails-html-sanitizer (1.6.0)
loofah (~> 2.21) loofah (~> 2.21)
nokogiri (~> 1.14) nokogiri (~> 1.14)
railties (7.0.8.1) railties (7.0.8.4)
actionpack (= 7.0.8.1) actionpack (= 7.0.8.4)
activesupport (= 7.0.8.1) activesupport (= 7.0.8.4)
method_source method_source
rake (>= 12.2) rake (>= 12.2)
thor (~> 1.0) thor (~> 1.0)
@ -190,7 +187,8 @@ GEM
rdoc (6.6.3.1) rdoc (6.6.3.1)
psych (>= 4.0.0) psych (>= 4.0.0)
regexp_parser (2.9.0) regexp_parser (2.9.0)
rexml (3.2.6) rexml (3.2.8)
strscan (>= 3.0.9)
rubocop (1.60.2) rubocop (1.60.2)
json (~> 2.3) json (~> 2.3)
language_server-protocol (>= 3.17.0) language_server-protocol (>= 3.17.0)
@ -243,6 +241,7 @@ GEM
activesupport (>= 5.2) activesupport (>= 5.2)
sprockets (>= 3.0.0) sprockets (>= 3.0.0)
stringio (3.1.0) stringio (3.1.0)
strscan (3.1.0)
syntax_tree (6.2.0) syntax_tree (6.2.0)
prettier_print (>= 1.2.0) prettier_print (>= 1.2.0)
systemu (2.6.5) systemu (2.6.5)
@ -289,7 +288,6 @@ GEM
PLATFORMS PLATFORMS
arm64-darwin-22 arm64-darwin-22
x64-mingw-ucrt
x86_64-linux x86_64-linux
DEPENDENCIES DEPENDENCIES

5
web/documentserver-example/ruby/app/configuration/configuration.rb
View File

@ -31,7 +31,7 @@ class ConfigurationManager
sig { void } sig { void }
def initialize def initialize
@version = '1.8.0' @version = '1.9.0'
end end
sig { returns(T.nilable(URI::Generic)) } sig { returns(T.nilable(URI::Generic)) }
@ -182,7 +182,8 @@ class ConfigurationManager
'pt-PT': 'Portuguese (Portugal)', 'pt-PT': 'Portuguese (Portugal)',
ro: 'Romanian', ro: 'Romanian',
ru: 'Russian', ru: 'Russian',
'sr-Latn-RS': 'Serbian', 'sr-Cyrl-RS': 'Serbian (Cyrillic)',
'sr-Latn-RS': 'Serbian (Latin)',
si: 'Sinhala (Sri Lanka)', si: 'Sinhala (Sri Lanka)',
sk: 'Slovak', sk: 'Slovak',
sl: 'Slovenian', sl: 'Slovenian',

2
web/documentserver-example/ruby/app/configuration/configuration_tests.rb
View File

@ -24,7 +24,7 @@ require_relative 'configuration'
module Enviroment module Enviroment
def initialize(name) def initialize(name)
@env = ENV.to_hash @env = ENV.to_hash
super(name) super
end end
def setup def setup

2
web/documentserver-example/ruby/app/format/format.rb
View File

@ -32,7 +32,7 @@ class Format < T::Struct
sig { params(hash: T.untyped, strict: T.untyped).returns(Format) } sig { params(hash: T.untyped, strict: T.untyped).returns(Format) }
def self.from_hash(hash, strict = nil) def self.from_hash(hash, strict = nil)
super(hash, strict) super
end end
sig { returns(String) } sig { returns(String) }

2
web/documentserver-example/ruby/app/views/home/editor.html.erb
View File

@ -49,7 +49,7 @@
// the user is trying to switch the document from the viewing into the editing mode // the user is trying to switch the document from the viewing into the editing mode
var onRequestEditRights = function () { var onRequestEditRights = function () {
location.href = location.href.replace(RegExp("editorsMode=view\&?", "i"), ""); location.href = location.href.replace(RegExp("editorsMode=\\w+\&?", "i"), "") + "&editorsMode=edit";
}; };
// an error or some other specific event occurs // an error or some other specific event occurs