Merge pull request #140 from Ognian/fix-charset-in-content-type

Fix charset in content type

Author: geraintluff

jsonary/request.js

@@ -396,6 +396,7 @@ Request.prototype = {
 var remainder = headers["content-type"].substring(contentType.length + 1);
 while (remainder.length > 0) {
 remainder = remainder.replace(/^,\s*/, '');
+remainder = remainder.replace(/^;\s*/, '');
 var partName = remainder.split("=", 1)[0];
 remainder = remainder.substring(partName.length + 1).trim();
 partName = partName.trim();
@@ -412,7 +413,7 @@ Request.prototype = {
 contentTypeParameters[partName] = partValue;
 }
 } else {
-partValue = /^[^,]*/.exec(remainder)[0];
+partValue = /^[^,;]*/.exec(remainder)[0];
 remainder = remainder.substring(partValue.length).trim();
 contentTypeParameters[partName] = partValue;
 }

renderers/contributed/adaptive-table.js

@@ -27,7 +27,7 @@ Jsonary.render.register(Jsonary.plugins.Generator({
 if (!columnsObj[column]) {
 columnsObj[column] = true;
 renderer.addColumn(column, schemas.title() || column, function (data, context) {
-if (data.basicType() == "object" && depthRemaining <= 0) {
+if (data.basicType() == "object" && depthRemaining < 0) {
 return '<td class="jsonary-recursion-limit-reached">...</td>';
  } else {
 return this.defaultCellRenderHtml(data, context, column);