Properly exclude browserify's annoying _process, again, fixes #502

protobufjs · Nov 29, 2016 · 51fe456 · 51fe456
1 parent 3c16e46
commit 51fe456
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 17 deletions.
diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/src/root.js b/src/root.js
@@ -104,7 +104,7 @@ RootPrototype.load = function load(filename, callback) {
     // Fetches a single file
     function fetch(filename, weak) {
 
-        // Check if this file references a bundled definition
+        // Strip path if this file references a bundled definition
         var idx = filename.indexOf("google/protobuf/");
         if (idx > -1) {
             var altname = filename.substring(idx);

diff --git a/src/util.js b/src/util.js
@@ -15,7 +15,7 @@ util.codegen  = require("./util/codegen");
  * @memberof util
  * @type {boolean}
  */
-var isNode = util.isNode = Boolean(typeof process !== 'undefined' && process.versions && process.versions.node);
+var isNode = util.isNode = Boolean(global.process && global.process.versions && global.process.versions.node);
 
 /**
  * Optional buffer class to use.

diff --git a/src/writer.js b/src/writer.js
@@ -356,14 +356,14 @@ WriterPrototype.bytes = function write_bytes(value) {
 };
 
 function writeString(buf, pos, val) {
-    for (var i = 0, len = val.length, c1, c2; i < len; ++i) {
-        c1 = val.charCodeAt(i);
+    for (var i = 0; i < val.length; ++i) {
+        var c1 = val.charCodeAt(i), c2;
         if (c1 < 128) {
             buf[pos++] = c1;
         } else if (c1 < 2048) {
             buf[pos++] = c1 >> 6 | 192;
             buf[pos++] = c1 & 63 | 128;
-        } else if ((c1 & 0xFC00) === 0xD800 && i + 1 < len && ((c2 = val.charCodeAt(i + 1)) & 0xFC00) === 0xDC00) {
+        } else if ((c1 & 0xFC00) === 0xD800 && i + 1 < val.length && ((c2 = val.charCodeAt(i + 1)) & 0xFC00) === 0xDC00) {
             c1 = 0x10000 + ((c1 & 0x03FF) << 10) + (c2 & 0x03FF);
             ++i;
             buf[pos++] = c1 >> 18      | 240;

diff --git a/tests/browser.html b/tests/browser.html
@@ -0,0 +1,5 @@
+<html>
+<head>
+<script src="../dist/protobuf.js"></script>
+</head>
+</html>