Merge remote-tracking branch 'upstream/dev' into dev

finiking · May 19, 2016 · b21002b · b21002b
2 parents f79b3bc + 5977012
commit b21002b
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,11 @@
 English | [简体中文](./CHANGELOG_CN.md)
 
 
+#### v1.2.1 (2016-05-16)
+
+- [FIX] Fix data lost when sending a POST request
+
+
 #### v1.2.0 (2016-05-11)
 
 - [ADD] Add network panel

diff --git a/CHANGELOG_CN.md b/CHANGELOG_CN.md
@@ -1,6 +1,11 @@
 [English](./CHANGELOG.md) | 简体中文
 
 
+#### v1.2.1 (2016-05-16)
+
+- 【修复】修复发送 POST 请求时丢失数据的问题
+
+
 #### v1.2.0 (2016-05-11)
 
 - 【新增】新增网络面板，可展示 AJAX 请求

diff --git a/dist/vconsole.min.js b/dist/vconsole.min.js
diff --git a/example/demo1.html b/example/demo1.html
@@ -61,7 +61,7 @@ <h1 class="page_title">Demo 1</h1>
 });
 $('.js_btn_ajax').on('tap', function(e) {
   // 发起一个AJAX
-  $.get('ajax.php', function(resp) {
+  $.post('ajax.php',  { id: Math.random() }, function(resp) {
     console.log(resp);
   });
   showTips();

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vconsole",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "A virtual console panel for mobile page",
   "homepage": "https://github.com/WechatFE/vConsole",
   "main": "dist/vconsole.min.js",

diff --git a/src/vconsole.js b/src/vconsole.js
@@ -169,9 +169,10 @@ vConsole.prototype._mokeAjax = function() {
   };
   window.XMLHttpRequest.prototype.send = function() {
     var that = this;
+    var _arguments = arguments;
     that._startTime = +new Date();
     setTimeout(function() {
-      _send.apply(that, arguments);
+      _send.apply(that, _arguments);
     }, 1);
   };