Fixed Emoji encode & decode bug.

andot · andot · commit fa4e9d62d7c1 · 2015-08-21T12:07:47.000+08:00
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "author": "Ma Bingyao <andot@hprose.com>",
     "name": "hprose-html5",
-    "version": "2.0.2",
+    "version": "2.0.3",
     "description": "Hprose is a High Performance Remote Object Service Engine. It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware.",
     "keywords": [
         "hprose",
diff --git a/dist/hprose-html5.js b/dist/hprose-html5.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "hprose-html5",
   "filename": "hprose-html5.js",
-  "version": "2.0.2",
+  "version": "2.0.3",
   "description": "Hprose is a High Performance Remote Object Service Engine. It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware. It is not only easy to use, but powerful. You just need a little time to learn, then you can use it to easily construct cross language cross platform distributed application system.",
   "homepage": "https://github.com/andot/hprose",
   "keywords": [
diff --git a/src/BytesIO.js b/src/BytesIO.js
@@ -13,7 +13,7 @@
  *                                                        *
  * hprose BytesIO for HTML5.                              *
  *                                                        *
- * LastModified: Aug 11, 2015                             *
+ * LastModified: Aug 21, 2015                             *
  * Author: Ma Bingyao <andot@hprose.com>                  *
  *                                                        *
 \**********************************************************/
@@ -64,8 +64,8 @@
                 if (i + 1 < n) {
                     var nextCodeUnit = str.charCodeAt(i + 1);
                     if (codeUnit < 0xDC00 && 0xDC00 <= nextCodeUnit && nextCodeUnit <= 0xDFFF) {
-                        var rune = (((codeUnit & 0xDC00) << 10) | (nextCodeUnit & 0x03FF)) + 0x010000;
-                        bytes[p++] = 0xF0 | ((rune >> 18) & 0x3F);
+                        var rune = (((codeUnit & 0x03FF) << 10) | (nextCodeUnit & 0x03FF)) + 0x010000;
+                        bytes[p++] = 0xF0 | (rune >> 18);
                         bytes[p++] = 0x80 | ((rune >> 12) & 0x3F);
                         bytes[p++] = 0x80 | ((rune >> 6) & 0x3F);
                         bytes[p++] = 0x80 | (rune & 0x3F);
@@ -117,10 +117,10 @@
                 break;
             case 15:
                 if (off + 2 < len) {
-                    var rune = ((unit & 0x07) << 18) |
+                    var rune = (((unit & 0x07) << 18) |
                                 ((bytes[off++] & 0x3F) << 12) |
                                 ((bytes[off++] & 0x3F) << 6) |
-                                (bytes[off++] & 0x3F) - 0x10000;
+                                (bytes[off++] & 0x3F)) - 0x10000;
                     if (0 <= rune && rune <= 0xFFFFF) {
                         charCodes[i++] = (((rune >> 10) & 0x03FF) | 0xD800);
                         charCodes[i] = ((rune & 0x03FF) | 0xDC00);
@@ -182,10 +182,10 @@
                 break;
             case 15:
                 if (off + 2 < len) {
-                    var rune = ((unit & 0x07) << 18) |
+                    var rune = (((unit & 0x07) << 18) |
                                 ((bytes[off++] & 0x3F) << 12) |
                                 ((bytes[off++] & 0x3F) << 6) |
-                                (bytes[off++] & 0x3F) - 0x10000;
+                                (bytes[off++] & 0x3F)) - 0x10000;
                     if (0 <= rune && rune <= 0xFFFFF) {
                         charCodes[i++] = (((rune >> 10) & 0x03FF) | 0xD800);
                         charCodes[i] = ((rune & 0x03FF) | 0xDC00);
@@ -257,10 +257,10 @@
                 break;
             case 15:
                 if (off + 2 < len) {
-                    var rune = ((unit & 0x07) << 18) |
+                    var rune = (((unit & 0x07) << 18) |
                                 ((bytes[off++] & 0x3F) << 12) |
                                 ((bytes[off++] & 0x3F) << 6) |
-                                (bytes[off++] & 0x3F) - 0x10000;
+                                (bytes[off++] & 0x3F)) - 0x10000;
                     if (0 <= rune && rune <= 0xFFFFF) {
                         i++;
                     }
diff --git a/src/CopyRight.js b/src/CopyRight.js
@@ -1,4 +1,4 @@
-// Hprose for HTML5 v2.0.1
+// Hprose for HTML5 v2.0.3
 // Copyright (c) 2008-2015 http://hprose.com
 // Hprose is freely distributable under the MIT license.
 // For all details and documentation:

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"author": "Ma Bingyao <andot@hprose.com>",`
`3`	`3`	`"name": "hprose-html5",`
`4`		`- "version": "2.0.2",`
	`4`	`+ "version": "2.0.3",`
`5`	`5`	`"description": "Hprose is a High Performance Remote Object Service Engine. It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware.",`
`6`	`6`	`"keywords": [`
`7`	`7`	`"hprose",`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "hprose-html5",`
`3`	`3`	`"filename": "hprose-html5.js",`
`4`		`- "version": "2.0.2",`
	`4`	`+ "version": "2.0.3",`
`5`	`5`	`"description": "Hprose is a High Performance Remote Object Service Engine. It is a modern, lightweight, cross-language, cross-platform, object-oriented, high performance, remote dynamic communication middleware. It is not only easy to use, but powerful. You just need a little time to learn, then you can use it to easily construct cross language cross platform distributed application system.",`
`6`	`6`	`"homepage": "https://github.com/andot/hprose",`
`7`	`7`	`"keywords": [`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// Hprose for HTML5 v2.0.1`
	`1`	`+// Hprose for HTML5 v2.0.3`
`2`	`2`	`// Copyright (c) 2008-2015 http://hprose.com`
`3`	`3`	`// Hprose is freely distributable under the MIT license.`
`4`	`4`	`// For all details and documentation:`