diff --git a/apps/documenteditor/main/app/controller/Main.js b/apps/documenteditor/main/app/controller/Main.js index d98b24536..5f4075f1f 100644 --- a/apps/documenteditor/main/app/controller/Main.js +++ b/apps/documenteditor/main/app/controller/Main.js @@ -413,7 +413,8 @@ define([ Asc.c_oAscFileType.ODT, Asc.c_oAscFileType.DOCX, Asc.c_oAscFileType.HTML, - Asc.c_oAscFileType.PDF + Asc.c_oAscFileType.PDF, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) diff --git a/apps/documenteditor/main/app/controller/Toolbar.js b/apps/documenteditor/main/app/controller/Toolbar.js index 1f40167cf..f062fd10a 100644 --- a/apps/documenteditor/main/app/controller/Toolbar.js +++ b/apps/documenteditor/main/app/controller/Toolbar.js @@ -142,7 +142,8 @@ define([ Asc.c_oAscFileType.RTF, Asc.c_oAscFileType.ODT, Asc.c_oAscFileType.DOCX, - Asc.c_oAscFileType.HTML + Asc.c_oAscFileType.HTML, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) diff --git a/apps/documenteditor/main/app/view/FileMenuPanels.js b/apps/documenteditor/main/app/view/FileMenuPanels.js index 3819798c9..44dd732c1 100644 --- a/apps/documenteditor/main/app/view/FileMenuPanels.js +++ b/apps/documenteditor/main/app/view/FileMenuPanels.js @@ -54,6 +54,7 @@ define([ formats: [[ {name: 'DOCX', imgCls: 'docx', type: Asc.c_oAscFileType.DOCX}, {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, + {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}, {name: 'TXT', imgCls: 'txt', type: Asc.c_oAscFileType.TXT} ],[ // {name: 'DOC', imgCls: 'doc-format btn-doc', type: Asc.c_oAscFileType.DOC}, diff --git a/apps/documenteditor/main/index.html b/apps/documenteditor/main/index.html index ffaf58340..7aaa2df5d 100644 --- a/apps/documenteditor/main/index.html +++ b/apps/documenteditor/main/index.html @@ -264,6 +264,7 @@ + diff --git a/apps/documenteditor/main/index.html.deploy b/apps/documenteditor/main/index.html.deploy index c505b375c..32fdf0a44 100644 --- a/apps/documenteditor/main/index.html.deploy +++ b/apps/documenteditor/main/index.html.deploy @@ -285,6 +285,7 @@ + diff --git a/apps/presentationeditor/main/app/controller/Main.js b/apps/presentationeditor/main/app/controller/Main.js index 71e6c0351..2107e270f 100644 --- a/apps/presentationeditor/main/app/controller/Main.js +++ b/apps/presentationeditor/main/app/controller/Main.js @@ -385,7 +385,8 @@ define([ _supported = [ Asc.c_oAscFileType.PPTX, Asc.c_oAscFileType.ODP, - Asc.c_oAscFileType.PDF + Asc.c_oAscFileType.PDF, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) diff --git a/apps/presentationeditor/main/app/controller/Toolbar.js b/apps/presentationeditor/main/app/controller/Toolbar.js index 2676340e1..2d2e92eb4 100644 --- a/apps/presentationeditor/main/app/controller/Toolbar.js +++ b/apps/presentationeditor/main/app/controller/Toolbar.js @@ -149,7 +149,8 @@ define([ var _supported = [ Asc.c_oAscFileType.PPTX, - Asc.c_oAscFileType.ODP + Asc.c_oAscFileType.ODP, + Asc.c_oAscFileType.PDFA ]; if ( !_format || _supported.indexOf(_format) < 0 ) diff --git a/apps/presentationeditor/main/app/view/FileMenuPanels.js b/apps/presentationeditor/main/app/view/FileMenuPanels.js index e068aaaad..2e38b60dd 100644 --- a/apps/presentationeditor/main/app/view/FileMenuPanels.js +++ b/apps/presentationeditor/main/app/view/FileMenuPanels.js @@ -55,6 +55,7 @@ define([ formats: [[ {name: 'PPTX', imgCls: 'pptx', type: Asc.c_oAscFileType.PPTX}, {name: 'PDF', imgCls: 'pdf', type: Asc.c_oAscFileType.PDF}, + {name: 'PDFA', imgCls: 'pdfa', type: Asc.c_oAscFileType.PDFA}, {name: 'ODP', imgCls: 'odp', type: Asc.c_oAscFileType.ODP} ]], diff --git a/apps/presentationeditor/main/index.html b/apps/presentationeditor/main/index.html index a75f2173c..340badc67 100644 --- a/apps/presentationeditor/main/index.html +++ b/apps/presentationeditor/main/index.html @@ -263,6 +263,7 @@ +