diff options
author | Mihai Varga <mihai.mv13@gmail.com> | 2015-11-04 11:12:30 +0300 |
---|---|---|
committer | Mihai Varga <mihai.mv13@gmail.com> | 2015-11-04 11:12:30 +0300 |
commit | ddc34a60c3426d37a97ef84211a37a83fefd98df (patch) | |
tree | 81e6d546f127c43b3fe4024e88d2cc652600eaf2 | |
parent | 43bce2d00dfcaef67ad0fd59ed121d4c9578d170 (diff) |
bug #1261 - added microsoft document mime types
-rw-r--r-- | js/viewer/viewer.js | 21 | ||||
-rw-r--r-- | lib/storage.php | 26 |
2 files changed, 42 insertions, 5 deletions
diff --git a/js/viewer/viewer.js b/js/viewer/viewer.js index 254f47d1..639668d8 100644 --- a/js/viewer/viewer.js +++ b/js/viewer/viewer.js @@ -14,6 +14,27 @@ var odfViewer = { 'application/pdf', 'application/vnd.visio', 'application/vnd.wordperfect', + 'application/msonenote', + 'application/msword', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'application/vnd.ms-word.document.macroEnabled.12', + 'application/vnd.ms-word.template.macroEnabled.12', + 'application/vnd.ms-excel', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', + 'application/vnd.ms-excel.sheet.macroEnabled.12', + 'application/vnd.ms-excel.template.macroEnabled.12', + 'application/vnd.ms-excel.addin.macroEnabled.12', + 'application/vnd.ms-excel.sheet.binary.macroEnabled.12', + 'application/vnd.ms-powerpoint', + 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'application/vnd.openxmlformats-officedocument.presentationml.template', + 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', + 'application/vnd.ms-powerpoint.addin.macroEnabled.12', + 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', + 'application/vnd.ms-powerpoint.template.macroEnabled.12', + 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' ], register : function(response){ diff --git a/lib/storage.php b/lib/storage.php index d5d8b1a6..5d756091 100644 --- a/lib/storage.php +++ b/lib/storage.php @@ -30,16 +30,32 @@ class Storage { 'application/vnd.oasis.opendocument.presentation', 'application/vnd.oasis.opendocument.spreadsheet', 'application/vnd.oasis.opendocument.graphics', - 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', 'application/vnd.lotus-wordpro', 'image/svg+xml', - 'application/vnd.ms-powerpoint', - 'application/vnd.ms-excel', - 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'application/pdf', 'application/vnd.visio', 'application/vnd.wordperfect', - 'application/vnd.oasis.opendocument.graphics' + 'application/msonenote', + 'application/msword', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.document', + 'application/vnd.openxmlformats-officedocument.wordprocessingml.template', + 'application/vnd.ms-word.document.macroEnabled.12', + 'application/vnd.ms-word.template.macroEnabled.12', + 'application/vnd.ms-excel', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', + 'application/vnd.openxmlformats-officedocument.spreadsheetml.template', + 'application/vnd.ms-excel.sheet.macroEnabled.12', + 'application/vnd.ms-excel.template.macroEnabled.12', + 'application/vnd.ms-excel.addin.macroEnabled.12', + 'application/vnd.ms-excel.sheet.binary.macroEnabled.12', + 'application/vnd.ms-powerpoint', + 'application/vnd.openxmlformats-officedocument.presentationml.presentation', + 'application/vnd.openxmlformats-officedocument.presentationml.template', + 'application/vnd.openxmlformats-officedocument.presentationml.slideshow', + 'application/vnd.ms-powerpoint.addin.macroEnabled.12', + 'application/vnd.ms-powerpoint.presentation.macroEnabled.12', + 'application/vnd.ms-powerpoint.template.macroEnabled.12', + 'application/vnd.ms-powerpoint.slideshow.macroEnabled.12' ); public static function getDocuments() { |