diff --git a/.gitmodules b/.gitmodules index 73469fd1..43b3007a 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,7 +5,7 @@ [submodule "web/documentserver-example/nodejs/public/assets/document-formats"] path = web/documentserver-example/nodejs/public/assets/document-formats url = https://github.com/ONLYOFFICE/document-formats - branch = master + branch = feature/v8.0 [submodule "web/documentserver-example/csharp-mvc/assets/document-templates"] path = web/documentserver-example/csharp-mvc/assets/document-templates url = https://github.com/ONLYOFFICE/document-templates diff --git a/CHANGELOG.md b/CHANGELOG.md index 6efde99b..d05f7b43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +- nodejs: pdf, djvu, xps, oxps as pdf documentType - nodejs: filling pdf - version number to page meta - ar skin languages diff --git a/web/documentserver-example/nodejs/helpers/fileUtility.js b/web/documentserver-example/nodejs/helpers/fileUtility.js index 5203545b..b058f812 100644 --- a/web/documentserver-example/nodejs/helpers/fileUtility.js +++ b/web/documentserver-example/nodejs/helpers/fileUtility.js @@ -64,6 +64,7 @@ fileUtility.fileType = { word: 'word', cell: 'cell', slide: 'slide', + pdf: 'pdf', }; fileUtility.getSuppotredExtensions = function getSuppotredExtensions() { diff --git a/web/documentserver-example/nodejs/public/assets/document-formats b/web/documentserver-example/nodejs/public/assets/document-formats index 05bf7a6e..d81437e6 160000 --- a/web/documentserver-example/nodejs/public/assets/document-formats +++ b/web/documentserver-example/nodejs/public/assets/document-formats @@ -1 +1 @@ -Subproject commit 05bf7a6e6d0a483a117a9853dc51bb517679677a +Subproject commit d81437e6d35d8d8fda23cee3e30312302046da33 diff --git a/web/documentserver-example/nodejs/public/images/icon_pdf.svg b/web/documentserver-example/nodejs/public/images/icon_pdf.svg new file mode 100644 index 00000000..1867081a --- /dev/null +++ b/web/documentserver-example/nodejs/public/images/icon_pdf.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/web/documentserver-example/nodejs/public/images/pdf.ico b/web/documentserver-example/nodejs/public/images/pdf.ico new file mode 100644 index 00000000..2cabc728 Binary files /dev/null and b/web/documentserver-example/nodejs/public/images/pdf.ico differ diff --git a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css index 30d16c52..20f6c82f 100644 --- a/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css +++ b/web/documentserver-example/nodejs/public/stylesheets/stylesheet.css @@ -470,6 +470,11 @@ footer table tr td:first-child { background-image: url("../images/icon_pptx.svg"); } +.stored-edit.pdf, +.uploadFileName.pdf { + background-image: url("../images/icon_pdf.svg"); +} + .stored-edit span { font-size: 12px; line-height: 12px;