#60 #64 #66

nuysoft · Dec 14, 2015 · d08e487 · d08e487
1 parent f38933f
commit d08e487
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/dist/mock-min.js b/dist/mock-min.js
diff --git a/dist/mock.js b/dist/mock.js
@@ -1,4 +1,4 @@
-/*! mockjs 02-06-2015 22:03:43 */
+/*! mockjs 14-12-2015 16:19:19 */
 /*! src/mock-prefix.js */
 /*!
     Mock - 模拟请求 & 模拟数据
@@ -7,7 +7,7 @@
 */
 (function(undefined) {
     var Mock = {
-        version: "0.1.9",
+        version: "0.1.11",
         _mocked: {}
     };
     /*! src/util.js */
@@ -1016,7 +1016,7 @@
             Zepto.ajax = function(options) {
                 var item = find(options);
                 if (item) {
-                    var data = Mock.mock(item.template);
+                    var data = convert(item, options);
                     if (options.success) options.success(data, xhr, options);
                     if (options.complete) options.complete(xhr.status, xhr, options);
                     return xhr;

diff --git a/mock-min.map b/mock-min.map
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "mockjs",
   "title": "Mock.js",
   "description": "模拟请求 & 模拟数据",
-  "version": "0.1.10",
+  "version": "0.1.11",
   "homepage": "http://mockjs.com/",
   "keywords": [
     "mock",

diff --git a/src/mock-prefix.js b/src/mock-prefix.js
@@ -5,6 +5,6 @@
 */
 (function(undefined) {
 	var Mock = {
-		version: '0.1.9',
+		version: '0.1.11',
 		_mocked: {}
 	}