Permalink
Browse files

moved jquery.no-conflict and backbone-events from vendor/ to js/shims/.

  • Loading branch information...
1 parent 2718773 commit 4e164ebb328ee05380f895c4ca47e1aff2241087 @toolness toolness committed Jan 23, 2013
@@ -55,13 +55,11 @@ var require = {
packages: ['slowparse-errors'],
paths: {
// Vendor paths
- "jquery": "../vendor/jquery.no-conflict",
"jquery.min": "../vendor/jquery.min",
"jquery-tipsy": "../vendor/jquery.tipsy",
"jquery-slowparse": "../vendor/slowparse/spec/errors.jquery",
"underscore": "../vendor/underscore.min",
"backbone": "../vendor/backbone.min",
- "backbone-events": "../vendor/backbone-events",
"slowparse": "../vendor/slowparse",
"codemirror": "../vendor/codemirror2/lib/codemirror",
"codemirror/xml": "../vendor/codemirror2/mode/xml/xml",
@@ -72,6 +70,8 @@ var require = {
"i18n": "../vendor/require.i18n",
"lscache": "../vendor/lscache",
// Non-vendor paths
+ "jquery": "shims/jquery.no-conflict",
+ "backbone-events": "shims/backbone-events",
"template": "require.template",
"test": "../test",
"templates": "../templates"
File renamed without changes.
File renamed without changes.

0 comments on commit 4e164eb

Please sign in to comment.