Merge pull request #190 from lanthaler/feature-callback-union-types

Add support for union types to callbacks
w3c · Apr 9, 2013 · 82f0635 · 82f0635
2 parents dbb47f7 + f65d78e
commit 82f0635
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/js/core/webidl-oldschool.js b/js/core/webidl-oldschool.js
@@ -388,7 +388,7 @@ define(
                 str = this.parseExtendedAttributes(str, obj);
 
                 // MEMBER
-                var match = /^\s*\b(.*?)\s+([A-Za-z][A-Za-z0-9]*)\s*$/.exec(str);
+                var match = /^\s*(.*?)\s+([A-Za-z][A-Za-z0-9]*)\s*$/.exec(str);
                 if (match) {
                     obj.type = "member";
                     var type = match[1];
@@ -848,7 +848,7 @@ define(
                             sn.text(">", span);
                         }
                         else {
-                            sn.element("a", {}, span, it.datatype);
+                            sn.element("a", {}, span, it.isUnionType ? "(" + it.datatype.join(" or ") + ")" : it.datatype);
                         }
                         if (it.nullable) sn.text(", nullable", dt);
                         if (it.defaultValue) {