Merge remote-tracking branch 'origin/master'

Conflicts: src/ByteArrayBase.ts
01alchemist · Jan 16, 2015 · 4443d25 · 4443d25
2 parents 6c47554 + 292ff96
commit 4443d25
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/gulpfile.js b/gulpfile.js
@@ -1,5 +1,4 @@
 var gulp = require('gulp');
-var foreach = require('gulp-foreach');
 var shell = require('gulp-shell');
 var cc = require('gulp-closure-compiler');
 var sourcemaps = require('gulp-sourcemaps');

diff --git a/package.json b/package.json
@@ -29,6 +29,7 @@
   },
   "homepage": "https://github.com/nidin/TS-ByteArray",
   "devDependencies": {
+    "typescript":"latest",
     "gulp":"3.8.10",
     "gulp-shell":"*",
     "gulp-closure-compiler":"*",

diff --git a/src/ByteArrayBase.ts b/src/ByteArrayBase.ts
@@ -396,10 +396,10 @@ module nid.utils
             var str:string = "";
             var num:number=0;
             while(this.bytesAvailable > 0) {
-                var byte:number = this.data.getUint8(this.position++);
+                var _byte:number = this.data.getUint8(this.position++);
                 num++;
-                if(byte != 0){
-                    str += String.fromCharCode(byte);
+                if(_byte != 0){
+                    str += String.fromCharCode(_byte);
                 }else{
                     if(keepEvenByte && num % 2 != 0){
                         this.position++;