Fix isDict when type is missing in dictionary.

brendandahl · brendandahl · commit a79f0055276a · 2013-01-10T16:32:26.000-08:00
diff --git a/src/util.js b/src/util.js
@@ -441,7 +441,14 @@ function isCmd(v, cmd) {
 }
 
 function isDict(v, type) {
-  return v instanceof Dict && (!type || v.get('Type').name == type);
+  if (!(v instanceof Dict)) {
+    return false;
+  }
+  if (!type) {
+    return true;
+  }
+  var dictType = v.get('Type');
+  return isName(dictType) && dictType.name == type;
 }
 
 function isArray(v) {
diff --git a/test/unit/util_spec.js b/test/unit/util_spec.js
@@ -63,5 +63,18 @@ describe('util', function() {
     });
   });
 
+  describe('isDict', function() {
+    it('handles empty dictionaries with type check', function() {
+      var dict = new Dict();
+      expect(isDict(dict, 'Page')).toEqual(false);
+    });
+
+    it('handles dictionaries with type check', function() {
+      var dict = new Dict();
+      dict.set('Type', new Name('Page'));
+      expect(isDict(dict, 'Page')).toEqual(true);
+    });
+  });
+
 });
 

Original file line number	Diff line number	Diff line change
`@@ -441,7 +441,14 @@ function isCmd(v, cmd) {`
`441`	`441`	`}`
`442`	`442`
`443`	`443`	`function isDict(v, type) {`
`444`		`- return v instanceof Dict && (!type \|\| v.get('Type').name == type);`
	`444`	`+ if (!(v instanceof Dict)) {`
	`445`	`+ return false;`
	`446`	`+ }`
	`447`	`+ if (!type) {`
	`448`	`+ return true;`
	`449`	`+ }`
	`450`	`+ var dictType = v.get('Type');`
	`451`	`+ return isName(dictType) && dictType.name == type;`
`445`	`452`	`}`
`446`	`453`
`447`	`454`	`function isArray(v) {`