Postmerge

Author: dcodeIO

.gitignore

@@ -1,2 +1,3 @@
 node_modules/
 npm-debug.log
+.idea/

ProtoBuf.js

@@ -38,7 +38,7 @@
          * @const
          * @expose
          */
-        ProtoBuf.VERSION = "2.0.3";
+        ProtoBuf.VERSION = "2.0.4";
 
         /**
          * Wire types.
@@ -3718,4 +3718,4 @@
         global["dcodeIO"]["ProtoBuf"] = loadProtoBuf(global["dcodeIO"]["ByteBuffer"]);
     }
 
-})(this);
+})(this);

ProtoBuf.min.js

@@ -38,7 +38,7 @@
          * @const
          * @expose
          */
-        ProtoBuf.VERSION = "2.0.3";
+        ProtoBuf.VERSION = "2.0.4";
 
         /**
          * Wire types.

ProtoBuf.min.map

@@ -1,7 +1,7 @@
 {
     "name": "protobuf",
     "description": "Protocol Buffers for JavaScript. Finally.",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "main": "ProtoBuf.js",
     "license": "Apache-2.0",
     "homepage": "http://dcode.io/",

ProtoBuf.noparse.js

@@ -1,6 +1,6 @@
 {
     "name": "protobufjs",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "description": "A full-featured protobuf implementation in plain JavaScript.",
     "author": "Daniel Wirtz <[email protected]>",
     "contributors": [

ProtoBuf.noparse.min.js

@@ -215,7 +215,10 @@ ProtoBuf.DotProto.Parser = (function(ProtoBuf, Lang, Tokenizer) {
             token = this.tn.next();
         }
         if (!Lang.NAME.test(token)) {
-            throw(new Error("Illegal option name in message "+parent.name+" at line "+this.tn.line+": "+token));
+            // we can allow options of the form google.protobuf.* since they will just get ignored anyways
+            if (!/google\.protobuf\./.test(token)) {
+                throw(new Error("Illegal option name in message "+parent.name+" at line "+this.tn.line+": "+token));
+            }
         }
         var name = token;
         token = this.tn.next();