Properly resolve extend references, fixes #103

protobufjs · Feb 11, 2014 · 7777b3c · 7777b3c
1 parent 36e5cc8
commit 7777b3c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/ProtoBuf.js b/ProtoBuf.js
@@ -38,7 +38,7 @@
          * @const
          * @expose
          */
-        ProtoBuf.VERSION = "2.0.4";
+        ProtoBuf.VERSION = "2.0.5";
 
         /**
          * Wire types.
@@ -3242,7 +3242,7 @@
                                 this.ptr.addChild(obj);
                                 obj = null;
                             } else if (Builder.isValidExtend(def)) {
-                                obj = this.lookup(def["ref"]);
+                                obj = this.ptr.resolve(def["ref"]);
                                 if (obj) {
                                     for (i=0; i<def["fields"].length; i++) { // i=Fields
                                         if (obj.hasChild(def['fields'][i]['id'])) {

diff --git a/ProtoBuf.min.js b/ProtoBuf.min.js
diff --git a/ProtoBuf.min.map b/ProtoBuf.min.map
diff --git a/ProtoBuf.noparse.js b/ProtoBuf.noparse.js
@@ -38,7 +38,7 @@
          * @const
          * @expose
          */
-        ProtoBuf.VERSION = "2.0.4";
+        ProtoBuf.VERSION = "2.0.5";
 
         /**
          * Wire types.
@@ -2342,7 +2342,7 @@
                                 this.ptr.addChild(obj);
                                 obj = null;
                             } else if (Builder.isValidExtend(def)) {
-                                obj = this.lookup(def["ref"]);
+                                obj = this.ptr.resolve(def["ref"]);
                                 if (obj) {
                                     for (i=0; i<def["fields"].length; i++) { // i=Fields
                                         if (obj.hasChild(def['fields'][i]['id'])) {

diff --git a/ProtoBuf.noparse.min.js b/ProtoBuf.noparse.min.js
diff --git a/ProtoBuf.noparse.min.map b/ProtoBuf.noparse.min.map
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "protobuf",
     "description": "Protocol Buffers for JavaScript. Finally.",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "main": "ProtoBuf.js",
     "license": "Apache-2.0",
     "homepage": "http://dcode.io/",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "protobufjs",
-    "version": "2.0.4",
+    "version": "2.0.5",
     "description": "A full-featured protobuf implementation in plain JavaScript.",
     "author": "Daniel Wirtz <dcode@dcode.io>",
     "contributors": [

diff --git a/src/ProtoBuf/Builder.js b/src/ProtoBuf/Builder.js
@@ -327,7 +327,7 @@ ProtoBuf.Builder = (function(ProtoBuf, Lang, Reflect) {
                         this.ptr.addChild(obj);
                         obj = null;
                     } else if (Builder.isValidExtend(def)) {
-                        obj = this.lookup(def["ref"]);
+                        obj = this.ptr.resolve(def["ref"]);
                         if (obj) {
                             for (i=0; i<def["fields"].length; i++) { // i=Fields
                                 if (obj.hasChild(def['fields'][i]['id'])) {