Merge branch 'mediatag' of https://github.com/Regzox/cryptpad into tag

www/common/boot2.js

@@ -7,7 +7,9 @@ define([], function () {
             // jquery declares itself as literally "jquery" so it cannot be pulled by path :(
             "jquery": "/bower_components/jquery/dist/jquery.min",
             // json.sortify same
-            "json.sortify": "/bower_components/json.sortify/dist/JSON.sortify"
+            "json.sortify": "/bower_components/json.sortify/dist/JSON.sortify",
+            "pdfjs-dist/build/pdf": "/bower_components/pdfjs-dist/build/pdf",
+            "pdfjs-dist/build/pdf.worker": "/bower_components/pdfjs-dist/build/pdf.worker"
         }
     });
 

www/media/main.js

@@ -6,6 +6,8 @@ define([
     '/common/cryptpad-common.js',
     //'/common/visible.js',
     //'/common/notify.js',
+    'pdfjs-dist/build/pdf',
+    'pdfjs-dist/build/pdf.worker',
     '/bower_components/tweetnacl/nacl-fast.min.js',
     '/bower_components/file-saver/FileSaver.min.js',
 ], function ($, Crypto, realtimeInput, Toolbar, Cryptpad /*, Visible, Notify*/) {
@@ -28,7 +30,7 @@ define([
         var cryptKey = secret.keys && secret.keys.fileKeyStr;
         var fileId = secret.channel;
         var hexFileName = Cryptpad.base64ToHex(fileId);
-        var type = "image/png";
+        // var type = "image/png";
 
         var parsed = Cryptpad.parsePadUrl(window.location.href);
         var defaultName = Cryptpad.getDefaultName(parsed);
@@ -57,7 +59,7 @@ define([
         var $mt = $iframe.find('#encryptedFile');
         $mt.attr('src', '/blob/' + hexFileName.slice(0,2) + '/' + hexFileName);
         $mt.attr('data-crypto-key', 'cryptpad:'+cryptKey);
-        $mt.attr('data-type', type);
+        // $mt.attr('data-type', type);
 
         $(window.document).on('decryption', function (e) {
             var decrypted = e.originalEvent;
@@ -98,6 +100,30 @@ define([
 
             updateTitle(Cryptpad.initialName || getTitle() || defaultName);
 
+            /**
+             * Allowed mime types that have to be set for a rendering after a decryption.
+             *
+             * @type       {Array}
+             */
+            var allowedMediaTypes = [
+                'image/png',
+                'image/jpeg',
+                'image/jpg',
+                'image/gif',
+                'audio/mp3',
+                'audio/ogg',
+                'audio/wav',
+                'audio/webm',
+                'video/mp4',
+                'video/ogg',
+                'video/webm',
+                'application/pdf',
+                'application/dash+xml',
+                'download'
+            ];
+
+            MediaTag.CryptoFilter.setAllowedMediaTypes(allowedMediaTypes);
+
             MediaTag($mt[0]);
 
             Cryptpad.removeLoadingScreen();