Skip to content

Commit d447358

Browse files
appleboyappleboy
committed
convert 4 space to 2 space.
Signed-off-by: Bo-Yi Wu <[email protected]>
1 parent 1743813 commit d447358

File tree

9 files changed

+149
-92
lines changed

9 files changed

+149
-92
lines changed

‎app/assets/coffeescript/app.coffee

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
# Filename: app.js
22
define [
3-
'jquery',
4-
'modernizr',
5-
'libs/console'], ($) ->
6-
initialize = ->
7-
# show welcome message.
8-
console.info 'Welcome to Html5 Template Engine.'
9-
# detect device support.
10-
if (Modernizr.canvas)
11-
console.info 'Your browser support canvas.'
12-
if (Modernizr.touch)
13-
console.info 'Your device support touch event.'
14-
if (!Modernizr.canvas)
15-
console.warn 'Your browser don\'t support canvas.'
16-
if (!Modernizr.touch)
17-
console.warn 'Your device don\'t support touch event.'
3+
'jquery',
4+
'modernizr',
5+
'libs/console'], ($) ->
6+
initialize = ->
7+
# show welcome message.
8+
console.info 'Welcome to Html5 Template Engine.'
9+
# detect device support.
10+
if (Modernizr.canvas)
11+
console.info 'Your browser support canvas.'
12+
if (Modernizr.touch)
13+
console.info 'Your device support touch event.'
14+
if (!Modernizr.canvas)
15+
console.warn 'Your browser don\'t support canvas.'
16+
if (!Modernizr.touch)
17+
console.warn 'Your device don\'t support touch event.'
1818

19-
initialize: initialize
19+
initialize: initialize

‎app/assets/coffeescript/libs/console.coffee

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
(->
2-
methods = [
3-
'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
4-
'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
5-
'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
6-
'timeStamp', 'trace', 'warn'
7-
]
2+
methods = [
3+
'assert', 'clear', 'count', 'debug', 'dir', 'dirxml', 'error',
4+
'exception', 'group', 'groupCollapsed', 'groupEnd', 'info', 'log',
5+
'markTimeline', 'profile', 'profileEnd', 'table', 'time', 'timeEnd',
6+
'timeStamp', 'trace', 'warn'
7+
]
88

9-
length = methods.length
10-
console = (window.console = window.console || {})
11-
noop = ->
9+
length = methods.length
10+
console = (window.console = window.console || {})
11+
noop = ->
1212

13-
while (length--)
14-
method = methods[length]
13+
while (length--)
14+
method = methods[length]
1515

16-
if (!console[method])
17-
console[method] = noop
16+
if (!console[method])
17+
console[method] = noop
1818
)()

‎app/assets/coffeescript/main.coffee

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# Filename: main.js
22
require.config
3-
paths:
4-
jquery: '../vendor/jquery/dist/jquery'
5-
modernizr: '../vendor/modernizr/modernizr'
6-
# for development
7-
urlArgs: (new Date()).getTime()
3+
paths:
4+
jquery: '../vendor/jquery/dist/jquery'
5+
modernizr: '../vendor/modernizr/modernizr'
6+
# for development
7+
urlArgs: (new Date()).getTime()
88

99
# initail app
1010
require ['app'], (App) ->
11-
App.initialize()
11+
App.initialize()

‎coffeelint.json

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
{
2+
"arrow_spacing": {
3+
"level" : "error"
4+
},
5+
"camel_case_classes" : {
6+
"level" : "error"
7+
},
8+
"coffeescript_error" : {
9+
"level" : "error"
10+
},
11+
"cyclomatic_complexity" : {
12+
"value" : 12,
13+
"level" : "warn"
14+
},
15+
"duplicate_key" : {
16+
"level" : "error"
17+
},
18+
"empty_constructor_needs_parens" : {
19+
"level" : "ignore"
20+
},
21+
"indentation" : {
22+
"value" : 2,
23+
"level" : "error"
24+
},
25+
"line_endings" : {
26+
"value" : "unix",
27+
"level" : "ignore"
28+
},
29+
"max_line_length" : {
30+
"value": 100,
31+
"level" : "error"
32+
},
33+
"newlines_after_classes" : {
34+
"level" : "ignore"
35+
},
36+
"no_backticks" : {
37+
"level" : "error"
38+
},
39+
"no_empty_param_list" : {
40+
"level" : "error"
41+
},
42+
"no_plusplus" : {
43+
"level" : "error"
44+
},
45+
"no_stand_alone_at" : {
46+
"level": "error"
47+
},
48+
"no_tabs" : {
49+
"level" : "error"
50+
},
51+
"no_throwing_strings" : {
52+
"level" : "error"
53+
},
54+
"no_trailing_semicolons" : {
55+
"level" : "error"
56+
},
57+
"no_trailing_whitespace" : {
58+
"level" : "error"
59+
},
60+
"non_empty_constructor_needs_parens" : {
61+
"level" : "ignore"
62+
},
63+
"space_operators" : {
64+
"level" : "error"
65+
}
66+
}

‎gulpfile.coffee

+2-10
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,7 @@ gulp.task 'coffee', ->
4141
gulp.src paths.coffee + '/**/*.coffee'
4242
.pipe gulpif !production, changed paths.script,
4343
extension: '.js'
44-
.pipe coffeelint
45-
indentation:
46-
name: 'indentation'
47-
value: 4
48-
level: 'error'
44+
.pipe coffeelint()
4945
.pipe coffeelint.reporter()
5046
.pipe coffee bare: true
5147
.pipe gulp.dest paths.script
@@ -56,11 +52,7 @@ gulp.task 'test_coffee', ->
5652
gulp.src paths.test + '/**/*.coffee'
5753
.pipe gulpif !production, changed paths.test,
5854
extension: '.js'
59-
.pipe coffeelint
60-
indentation:
61-
name: 'indentation'
62-
value: 4
63-
level: 'error'
55+
.pipe coffeelint()
6456
.pipe coffeelint.reporter()
6557
.pipe coffee bare: true
6658
.pipe gulp.dest 'test/'

‎test/app_test.coffee

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
define (require) ->
2-
assert = require('chai').assert
2+
assert = require('chai').assert
33

4-
suite 'App', () ->
5-
test 'Should be present', () ->
6-
assert.ok window.html5App
4+
suite 'App', ->
5+
test 'Should be present', ->
6+
assert.ok window.html5App

‎test/setup.coffee

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
require.config
2-
paths:
3-
jquery: '../app/assets/vendor/jquery/dist/jquery'
4-
modernizr: '../app/assets/vendor/modernizr/modernizr'
5-
consolejs: '../app/assets/js/libs/console'
6-
chai: '../node_modules/chai/chai'
7-
mocha: '../node_modules/mocha/mocha'
8-
# for development
9-
urlArgs: (new Date()).getTime()
2+
paths:
3+
jquery: '../app/assets/vendor/jquery/dist/jquery'
4+
modernizr: '../app/assets/vendor/modernizr/modernizr'
5+
consolejs: '../app/assets/js/libs/console'
6+
chai: '../node_modules/chai/chai'
7+
mocha: '../node_modules/mocha/mocha'
8+
# for development
9+
urlArgs: (new Date()).getTime()
1010

1111
define ['jquery', 'require', 'mocha', 'modernizr', 'consolejs'], ($, require) ->
12-
mocha.setup
13-
ui: 'tdd',
14-
globals: ['html5App']
12+
mocha.setup
13+
ui: 'tdd',
14+
globals: ['html5App']
1515

16-
window.html5App = {}
17-
require ['app_test'], (require) ->
18-
if (window.mochaPhantomJS)
19-
mochaPhantomJS.run()
20-
else
21-
mocha.run()
16+
window.html5App = {}
17+
require ['app_test'], (require) ->
18+
if (window.mochaPhantomJS)
19+
mochaPhantomJS.run()
20+
else
21+
mocha.run()

‎test/setup.js

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
// Generated by CoffeeScript 1.7.1
21
require.config({
32
paths: {
43
jquery: '../app/assets/vendor/jquery/dist/jquery',

‎test/test.coffee

+25-25
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
assert = require("assert")
22
fs = require('fs')
33

4-
describe 'html5 template generator test', () ->
5-
it 'creates expected files', () ->
6-
expected = [
7-
'dist/favicon.ico',
8-
'dist/.htaccess',
9-
'dist/index.html',
10-
'dist/404.html',
11-
'dist/robots.txt',
12-
'dist/assets/js/require.js',
13-
'dist/assets/css/print.css',
14-
'dist/assets/css/screen.css',
15-
'dist/assets/css/ie.css',
16-
'dist/assets/images/chrome.png'
17-
]
18-
for item in expected
19-
assert.equal(true, fs.existsSync(item))
4+
describe 'html5 template generator test', ->
5+
it 'creates expected files', ->
6+
expected = [
7+
'dist/favicon.ico',
8+
'dist/.htaccess',
9+
'dist/index.html',
10+
'dist/404.html',
11+
'dist/robots.txt',
12+
'dist/assets/js/require.js',
13+
'dist/assets/css/print.css',
14+
'dist/assets/css/screen.css',
15+
'dist/assets/css/ie.css',
16+
'dist/assets/images/chrome.png'
17+
]
18+
for item in expected
19+
assert.equal(true, fs.existsSync(item))
2020

21-
it 'delete expected files', () ->
22-
not_expected = [
23-
'dist/assets/vendor/',
24-
'dist/assets/coffeescript/',
25-
'dist/assets/sass/'
26-
]
27-
for item in not_expected
28-
assert.equal(false, fs.existsSync(item))
29-
null
21+
it 'delete expected files', ->
22+
not_expected = [
23+
'dist/assets/vendor/',
24+
'dist/assets/coffeescript/',
25+
'dist/assets/sass/'
26+
]
27+
for item in not_expected
28+
assert.equal(false, fs.existsSync(item))
29+
null

0 commit comments

Comments
 (0)