Merge pull request #1 from dreamershl/string-support

add string support to fix the protobufjs#508
dreamershl · Dec 1, 2016 · e052d79 · e052d79
2 parents b233c43 + 5260ba9
commit e052d79
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/util/longbits.js b/src/util/longbits.js
@@ -71,9 +71,14 @@ LongBits.fromNumber = function fromNumber(value) {
  * @returns {util.LongBits} Instance
  */
 LongBits.from = function from(value) {
-    return typeof value === 'number'
-        ? LongBits.fromNumber(value)
-        : new LongBits(value.low >>> 0, value.high >>> 0);
+    var type = typeof value, result=zero;
+    if(type === 'number')
+        result = LongBits.fromNumber(value);
+   else if(type === 'string' && util.Long)
+       result = util.Long.fromString(value);
+   else
+       result = new LongBits(value.low >>> 0, value.high >>> 0);    
+    return result;
 };
 
 /**