Skip to content

Commit ab96e44

Browse files
committed
Merge pull request #499 from alexindigo/amd_cleanup
Cleaned up unused leftovers. Made it more server friendly.
2 parents 642e5e6 + e88f3f6 commit ab96e44

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

client/router.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
* we need to pretend that this code is pure commonjs
44
* means no AMD-style require calls
55
*/
6-
var requireAMD = require;
7-
86
var _ = require('underscore'),
97
Backbone = require('backbone'),
108
BaseRouter = require('../shared/base/router'),
119
BaseView = require('../shared/base/view'),
12-
$ = (typeof window !== 'undefined' && window.$) || require('jquery'),
10+
isServer = (typeof window === 'undefined'),
1311
extractParamNamesRe = /:(\w+)/g,
1412
plusRe = /\+/g,
1513
firstRender = true,
1614
defaultRootPath = '';
1715

18-
Backbone.$ = $;
16+
if (!isServer) {
17+
Backbone.$ = window.$ || require('jquery');
18+
}
1919

2020
module.exports = ClientRouter;
2121

0 commit comments

Comments
 (0)