Allow collapsing of types into another aggregate type in filesreader

yozlet · Jun 13, 2011 · 1517643 · 1517643
1 parent e291e5e
commit 1517643
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/Node/shell/meta.js b/Node/shell/meta.js
@@ -478,6 +478,7 @@ exports.default = function (type) {
  */
 exports.composable = function () {
   return {
+    'application/json': 'text/plain',
     'application/javascript': true,
     'application/x-perl': true,
     'application/x-php': true,

diff --git a/Node/shell/reader.js b/Node/shell/reader.js
@@ -418,7 +418,13 @@ exports.filesReader.prototype = {
     else {
       // Only return a unified type for content types which can be composed safely.
       var composable = meta.composable();
-      return composable[prefix] && prefix || 'application/octet-stream';
+      if (composable[prefix]) {
+        if (typeof composable[prefix] == 'string') {
+          return composable[prefix];
+        }
+        return prefix;
+      }
+      return 'application/octet-stream';
     }
   },