Skip to content

Commit

Permalink
Merge pull request #102 from joelpurra/examples-underscore-replacement
Browse files Browse the repository at this point in the history
Map underscore to lodash in the connectivity example to fix #98
  • Loading branch information
ifandelse committed Jun 26, 2015
2 parents 05b2a6a + c3d062e commit 935f3ea
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion example/connectivity/js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ require.config( {
text: "../../../bower/requirejs-text/text",
backbone: '../../../bower/backbone/backbone',
lodash: '../../../bower/lodash/lodash',
underscore: '../../../bower/lodash/lodash.underscore',
mockjax: '../../../bower/jquery-mockjax/jquery.mockjax',
machina: '/lib/machina',
'machina.postal': '../../../bower/machina.postal/lib/machina.postal',
Expand All @@ -12,6 +11,11 @@ require.config( {
jquery: '../../../bower/jquery/jquery',
conduitjs: '../../../bower/conduitjs/lib/conduit'
},
map: {
"*": {
"underscore": "lodash"
}
},
shim: {
mockjax: [ 'jquery' ],
backbone: {
Expand Down

0 comments on commit 935f3ea

Please sign in to comment.