Skip to content

Commit 1cc5fa5

Browse files
committed
"use strict" and other linty fixes
1 parent aaa6de7 commit 1cc5fa5

Some content is hidden

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

50 files changed

+463
-478
lines changed

.eslintignore

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
coverage
21
.vscode
3-
examples
4-
docs
5-
node_modules
6-
tests
7-
test-utils
8-
ospec
9-
mithril.js
10-
mithril.min.js
11-
archive
2+
/node_modules
3+
/examples
4+
/docs/lib
5+
/mithril.js
6+
/mithril.min.js

.eslintrc.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ module.exports = {
188188
"quotes": [
189189
"error",
190190
"double",
191-
"avoid-escape"
191+
{"avoidEscape": true}
192192
],
193193
"radix": [
194194
"error",
@@ -209,7 +209,7 @@ module.exports = {
209209
"space-infix-ops": "off",
210210
"space-unary-ops": "error",
211211
"spaced-comment": "off",
212-
"strict": "off",
212+
"strict": ["error", "global"],
213213
"template-curly-spacing": "error",
214214
"valid-jsdoc": "off",
215215
"vars-on-top": "off",
@@ -218,4 +218,4 @@ module.exports = {
218218
"yield-star-spacing": "error",
219219
"yoda": "off"
220220
}
221-
};
221+
};

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,4 @@ jsconfig.json
44
npm-debug.log
55
.vscode
66
.DS_Store
7+
.eslintcache

api/tests/test-mount.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ o.spec("mount", function() {
7171

7272
o("redraws on events", function(done) {
7373
var onupdate = o.spy()
74-
var oninit = o.spy()
75-
var onclick = o.spy()
74+
var oninit = o.spy()
75+
var onclick = o.spy()
7676
var e = $window.document.createEvent("MouseEvents")
7777

7878
e.initEvent("click", true, true)
@@ -107,13 +107,13 @@ o.spec("mount", function() {
107107

108108
o("redraws several mount points on events", function(done, timeout) {
109109
timeout(60)
110-
110+
111111
var onupdate0 = o.spy()
112-
var oninit0 = o.spy()
113-
var onclick0 = o.spy()
112+
var oninit0 = o.spy()
113+
var onclick0 = o.spy()
114114
var onupdate1 = o.spy()
115-
var oninit1 = o.spy()
116-
var onclick1 = o.spy()
115+
var oninit1 = o.spy()
116+
var onclick1 = o.spy()
117117

118118
var e = $window.document.createEvent("MouseEvents")
119119

@@ -228,7 +228,7 @@ o.spec("mount", function() {
228228
done()
229229
}, FRAME_BUDGET)
230230
})
231-
231+
232232
o("throttles", function(done, timeout) {
233233
timeout(200)
234234

@@ -252,4 +252,4 @@ o.spec("mount", function() {
252252
})
253253
})
254254
})
255-
})
255+
})

api/tests/test-router.js

Lines changed: 21 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ var browserMock = require("../../test-utils/browserMock")
66

77
var m = require("../../render/hyperscript")
88
var callAsync = require("../../test-utils/callAsync")
9-
var coreRenderer = require("../../render/render")
109
var apiRedraw = require("../../api/redraw")
1110
var apiRouter = require("../../api/router")
1211
var Promise = require("../../promise/promise")
@@ -31,7 +30,7 @@ o.spec("route", function() {
3130
o("throws on invalid `root` DOM node", function() {
3231
var threw = false
3332
try {
34-
route(null, '/', {'/':{view: function() {}}})
33+
route(null, "/", {"/":{view: function() {}}})
3534
} catch (e) {
3635
threw = true
3736
}
@@ -141,7 +140,7 @@ o.spec("route", function() {
141140
done()
142141
}
143142
})
144-
143+
145144
o("redraws when render function is executed", function() {
146145
var onupdate = o.spy()
147146
var oninit = o.spy()
@@ -206,7 +205,6 @@ o.spec("route", function() {
206205
o("event handlers can skip redraw", function(done) {
207206
var onupdate = o.spy()
208207
var oninit = o.spy()
209-
var onclick = o.spy()
210208
var e = $window.document.createEvent("MouseEvents")
211209

212210
e.initEvent("click", true, true)
@@ -354,11 +352,6 @@ o.spec("route", function() {
354352
o("accepts RouteResolver with onmatch that returns Promise<undefined>", function(done) {
355353
var matchCount = 0
356354
var renderCount = 0
357-
var Component = {
358-
view: function() {
359-
return m("span")
360-
}
361-
}
362355

363356
var resolver = {
364357
onmatch: function(args, requestedPath) {
@@ -395,11 +388,6 @@ o.spec("route", function() {
395388
o("accepts RouteResolver with onmatch that returns Promise<any>", function(done) {
396389
var matchCount = 0
397390
var renderCount = 0
398-
var Component = {
399-
view: function() {
400-
return m("span")
401-
}
402-
}
403391

404392
var resolver = {
405393
onmatch: function(args, requestedPath) {
@@ -437,14 +425,9 @@ o.spec("route", function() {
437425
var matchCount = 0
438426
var renderCount = 0
439427
var spy = o.spy()
440-
var Component = {
441-
view: function() {
442-
return m("span")
443-
}
444-
}
445428

446429
var resolver = {
447-
onmatch: function(args, requestedPath) {
430+
onmatch: function() {
448431
matchCount++
449432
return Promise.reject(new Error("error"))
450433
},
@@ -499,7 +482,7 @@ o.spec("route", function() {
499482
})
500483
})
501484

502-
o("changing `vnode.key` in `render` resets the component", function(done, timeout){
485+
o("changing `vnode.key` in `render` resets the component", function(done){
503486
var oninit = o.spy()
504487
var Component = {
505488
oninit: oninit,
@@ -548,22 +531,15 @@ o.spec("route", function() {
548531
})
549532

550533
o("RouteResolver `render` does not have component semantics", function(done) {
551-
var renderCount = 0
552-
var A = {
553-
view: function() {
554-
return m("div")
555-
}
556-
}
557-
558534
$window.location.href = prefix + "/a"
559535
route(root, "/a", {
560536
"/a" : {
561-
render: function(vnode) {
537+
render: function() {
562538
return m("div")
563539
},
564540
},
565541
"/b" : {
566-
render: function(vnode) {
542+
render: function() {
567543
return m("div")
568544
},
569545
},
@@ -632,7 +608,7 @@ o.spec("route", function() {
632608
onmatch: function() {
633609
matchCount++
634610
},
635-
render: function(vnode) {
611+
render: function() {
636612
renderCount++
637613
return {tag: Component}
638614
},
@@ -726,7 +702,7 @@ o.spec("route", function() {
726702
render: render
727703
},
728704
"/b" : {
729-
render: function(vnode){
705+
render: function(){
730706
redirected = true
731707
}
732708
}
@@ -838,7 +814,7 @@ o.spec("route", function() {
838814
})
839815

840816
callAsync(function() {
841-
route.set('/b')
817+
route.set("/b")
842818
callAsync(function() {
843819
callAsync(function() {
844820
callAsync(function() {
@@ -865,7 +841,7 @@ o.spec("route", function() {
865841
render: render
866842
},
867843
"/b" : {
868-
onmatch: function(vnode){
844+
onmatch: function(){
869845
redirected = true
870846
return {view: function() {}}
871847
}
@@ -895,7 +871,7 @@ o.spec("route", function() {
895871
render: render
896872
},
897873
"/b" : {
898-
render: function(vnode){
874+
render: function(){
899875
redirected = true
900876
}
901877
}
@@ -924,7 +900,7 @@ o.spec("route", function() {
924900
render: render
925901
},
926902
"/b" : {
927-
view: function(vnode){
903+
view: function(){
928904
redirected = true
929905
}
930906
}
@@ -1032,7 +1008,7 @@ o.spec("route", function() {
10321008
var render = o.spy(function() {return m("div")})
10331009

10341010
$window.location.href = prefix + "/"
1035-
route(root, '/', {
1011+
route(root, "/", {
10361012
"/": {
10371013
onmatch: onmatch,
10381014
render: render
@@ -1081,23 +1057,23 @@ o.spec("route", function() {
10811057

10821058
o("routing with RouteResolver works more than once", function(done) {
10831059
$window.location.href = prefix + "/a"
1084-
route(root, '/a', {
1085-
'/a': {
1060+
route(root, "/a", {
1061+
"/a": {
10861062
render: function() {
10871063
return m("a", "a")
10881064
}
10891065
},
1090-
'/b': {
1066+
"/b": {
10911067
render: function() {
10921068
return m("b", "b")
10931069
}
10941070
}
10951071
})
10961072

1097-
route.set('/b')
1073+
route.set("/b")
10981074

10991075
callAsync(function() {
1100-
route.set('/a')
1076+
route.set("/a")
11011077

11021078
callAsync(function() {
11031079
o(root.firstChild.nodeName).equals("A")
@@ -1122,7 +1098,7 @@ o.spec("route", function() {
11221098
})
11231099
})
11241100
},
1125-
render: function(vnode) {
1101+
render: function() {
11261102
rendered = true
11271103
resolved = "a"
11281104
}
@@ -1180,7 +1156,7 @@ o.spec("route", function() {
11801156
route.set("/b")
11811157
})
11821158
},
1183-
render: function(vnode) {
1159+
render: function() {
11841160
rendered = true
11851161
resolved = "a"
11861162
}
@@ -1210,7 +1186,7 @@ o.spec("route", function() {
12101186
var i = 0
12111187
$window.location.href = prefix + "/"
12121188
route(root, "/", {
1213-
"/": {view: function(v) {i++}}
1189+
"/": {view: function() {i++}}
12141190
})
12151191
var before = i
12161192

browser.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
"use strict"
2+
13
var m = require("./index")
24
if (typeof module !== "undefined") module["exports"] = m
35
else window.m = m

bundler/bin/bundle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
#!/usr/bin/env node
2+
"use strict"
23

34
require("../cli")

0 commit comments

Comments
 (0)