Skip to content

Commit 3d69fbf

Browse files
committed
amd, gulp, mocha
1 parent 7c1e3a6 commit 3d69fbf

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

76 files changed

+9497
-9416
lines changed

.editorconfig

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
# editorconfig.org
2+
root = true
3+
4+
[*]
5+
indent_style = space
6+
indent_size = 4
7+
end_of_line = lf
8+
charset = utf-8
9+
trim_trailing_whitespace = true
10+
insert_final_newline = true
11+
12+
[package.json]
13+
indent_style = space
14+
indent_size = 2
15+
16+
[*.md]
17+
trim_trailing_whitespace = false

.gitattributes

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.jshintrc

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"expr": true,
3-
"node": true,
43
"asi": true,
5-
"unused": "vars",
6-
"supernew": true,
7-
"strict": false
4+
"strict": false,
5+
"undef": true,
6+
"unused": "strict",
7+
"multistr": true
88
}

.travis.yml

+10-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
language: node_js
22
node_js:
3-
- "0.10"
4-
before_script:
5-
  - npm install -g grunt-cli
3+
- '0.10'
4+
before_install:
5+
  - npm install -g gulp
66
- npm install -g bower
7-
- bower install
7+
before_script:
8+
- bower install
9+
- cd test
10+
- bower install
11+
- cd ..
12+
after_script:
13+
- npm run coveralls

Gruntfile.js

-242
This file was deleted.

README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ The official site: <http://mockjs.com>
1919
## Features
2020

2121
* Generate simulated data according to the data template
22-
* Provide request/response mocking for ajax requests with jQuery and KISSY
23-
* Generate simulated data according to HTML-based templates
22+
* Provide request/response mocking for ajax requests
23+
* ~~Generate simulated data according to HTML-based templates~~
2424

2525
<!-- **TODO** This library is loosely inspired by Elijah Manor's [post](http://www.elijahmanor.com/2013/04/angry-birds-of-javascript-green-bird.html), [mennovanslooten/mockJSON](https://github.com/mennovanslooten/mockJSON), [appendto/jquery-mockjax](https://github.com/appendto/jquery-mockjax) and [victorquinn/chancejs](https://github.com/victorquinn/chancejs/). -->
2626

bin/random

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
https://github.com/visionmedia/commander.js/tree/master/examples
99
1010
sudo npm install ./ -g
11-
1211
*/
1312

1413
var path = require('path')

bower.json

+12-15
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "Mock.js",
3-
"version": "0.0.0",
4-
"homepage": "https://github.com/nuysoft/MockService",
3+
"version": "0.2.0-alpha1",
4+
"homepage": "https://github.com/nuysoft/Mock",
55
"authors": [
66
"nuysoft <[email protected]>"
77
],
@@ -10,18 +10,15 @@
1010
"**/.*",
1111
"node_modules",
1212
"bower_components",
13+
"src",
1314
"test",
14-
"tests"
15+
"doc",
16+
"editor",
17+
"package.json",
18+
"gulpfile.js",
19+
"AUTHORS.txt",
20+
"CONTRIBUTING.md",
21+
"HISTORY.md"
1522
],
16-
"devDependencies": {
17-
"jquery": "*",
18-
"bootstrap": "~3.1.1",
19-
"codemirror": "~4.3.0",
20-
"highlightjs": "~8.0.0",
21-
"kissy": "~1.4.4",
22-
"seajs": "*",
23-
"js-beautify": "~1.5.1",
24-
"qunit": "~1.14.0",
25-
"underscore": "~1.6.0"
26-
}
27-
}
23+
"devDependencies": {}
24+
}

dist/mock-0.2.0-alpha1-min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/mock-0.2.0-alpha1.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*! mockjs 0.2.0-alpha1 04-11-2014 11:25:24 *//*! src/fix/prefix-1.js */
1+
/*! mockjs 0.2.0-alpha1 22-12-2014 15:10:31 *//*! src/fix/prefix-1.js */
22
(function(factory) {
33
/*! src/fix/prefix-2.js */
44
try {

dist/mock-min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/mock-min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)