CLI: Static code no longer uses IE8 support utility

protobufjs · Jan 2, 2017 · 407223b · 407223b
1 parent a017bf8
commit 407223b
Show file tree

Hide file tree

Showing 20 changed files with 171 additions and 319 deletions.
diff --git a/cli/targets/static.js b/cli/targets/static.js
@@ -300,9 +300,9 @@ function buildType(ref, type) {
             "@name " + fullName + "#" + name(oneof.name),
             "@type {string|undefined}"
         ]);
-        push("$protobuf.util.prop($prototype, " + JSON.stringify(oneof.name) +", {");
+        push("Object.defineProperty($prototype, " + JSON.stringify(oneof.name) +", {");
         ++indent;
-            push("get: function getVirtual() {");
+            push("get: function() {");
             ++indent;
             oneof.oneof.forEach(function(name) {
                 push("if (this[" + JSON.stringify(name) + "] !== undefined)");
@@ -313,7 +313,7 @@ function buildType(ref, type) {
             push("return undefined;");
             --indent;
             push("},");
-            push("set: function setVirtual(value) {");
+            push("set: function(value) {");
             ++indent;
             oneof.oneof.forEach(function(name) {
                 push("if (value !== " + JSON.stringify(name) + ")");
@@ -601,11 +601,16 @@ function buildService(ref, service) {
 }
 
 function buildEnum(ref, enm) {
+    var parentFullName = enm.parent.fullName.substring(1);
     push("");
-    var comment = [
+    var comment = parentFullName.length ? [
         enm.name + " enum.",
         "@name " + name(enm.name),
-        "@memberof " + enm.parent.fullName.substring(1),
+        "@memberof " + parentFullName,
+        "@enum {number}"
+    ] : [
+        enm.name + " enum.",
+        "@exports " + name(enm.name),
         "@enum {number}"
     ];
     Object.keys(enm.values).forEach(function(key) {